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.358 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.448 by root, Tue Dec 25 07:39:18 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFPlus; 8use CFPlus;
11use CFPlus::Pod; 9use CFPlus::Pod;
12use CFPlus::Texture; 10use CFPlus::Texture;
13 11
… …
18our $TOOLTIP; 16our $TOOLTIP;
19our $BUTTON_STATE; 17our $BUTTON_STATE;
20 18
21our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
22 20
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
22 $_[0]->stop;
23
24 if (!$GRAB) { 24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 29 $TOOLTIP->hide;
29 30
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 33
32 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
33 35
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 37 $TOOLTIP->show;
40 } 38 }
41 39
42 return; 40 return;
43 } 41 }
44 } 42 }
45 } 43 }
46 44
47 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
49}); 48};
50 49
51sub get_layout { 50sub get_layout {
52 my $layout; 51 my $layout;
53 52
54 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
89 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
90 89
91 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
93 92
94 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
95 } 94 }
96} 95}
97 96
98sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
99 my ($ev) = @_; 98 my ($ev) = @_;
… …
105 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
106 105
107 $GRAB = $widget; 106 $GRAB = $widget;
108 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
109 108
110 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
111 } 110 }
112 111
113 if ($GRAB) { 112 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 114 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
118 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
119 } else { 122 } else {
120 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
121 } 124 }
122 } 125 }
… …
136 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
137 $grab->update if $grab; 140 $grab->update if $grab;
138 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
139 142
140 check_hover $widget; 143 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
142 } 145 }
143} 146}
144 147
145sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
146 my ($ev) = @_; 149 my ($ev) = @_;
… …
235 h => undef, 238 h => undef,
236 can_events => 1, 239 can_events => 1,
237 @_ 240 @_
238 }, $class; 241 }, $class;
239 242
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 244
242 for (keys %$self) { 245 for (keys %$self) {
243 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
245 } 248 }
… …
262 265
263sub destroy { 266sub destroy {
264 my ($self) = @_; 267 my ($self) = @_;
265 268
266 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
267 %$self = (); 271 %$self = ();
272}
273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
268} 276}
269 277
270sub show { 278sub show {
271 my ($self) = @_; 279 my ($self) = @_;
272 280
… …
301 delete $self->{root}; 309 delete $self->{root};
302 310
303 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
304 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
305 313
306 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
307 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
308 316
309 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
310 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
311} 319}
… …
313sub set_visibility { 321sub set_visibility {
314 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
315 323
316 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
317 325
318 $visible ? $self->hide 326 $visible ? $self->show
319 : $self->show; 327 : $self->hide;
320} 328}
321 329
322sub toggle_visibility { 330sub toggle_visibility {
323 my ($self) = @_; 331 my ($self) = @_;
324 332
… …
351 359
352 $self->{force_w} = $w; 360 $self->{force_w} = $w;
353 $self->{force_h} = $h; 361 $self->{force_h} = $h;
354 362
355 $self->realloc; 363 $self->realloc;
364}
365
366# traverse the widget chain up to find the maximum "physical" size constraints
367sub get_max_wh {
368 my ($self) = @_;
369
370 return $self->{parent}->get_max_wh
371 if $self->{parent};
372
373 ($::WIDTH, $::HEIGHT)
356} 374}
357 375
358sub size_request { 376sub size_request {
359 require Carp; 377 require Carp;
360 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
… …
422 440
423 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
424 442
425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
426 delete $CFPlus::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
427 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
428 } 446 }
429} 447}
430 448
431# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
432sub coord2local { 450sub coord2local {
433 my ($self, $x, $y) = @_; 451 my ($self, $x, $y) = @_;
434 452
435 Carp::confess unless $self->{parent};#d# 453 return (undef, undef) unless $self->{parent};
436 454
437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 455 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
438} 456}
439 457
440# translate local coordinates to global coordinate system 458# translate local coordinates to global coordinate system
441sub coord2global { 459sub coord2global {
442 my ($self, $x, $y) = @_; 460 my ($self, $x, $y) = @_;
443 461
444 Carp::confess unless $self->{parent};#d# 462 return (undef, undef) unless $self->{parent};
445 463
446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 464 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
447} 465}
448 466
449sub invoke_focus_in { 467sub invoke_focus_in {
… …
502 520
503 defined wantarray and CFPlus::guard { 521 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 522 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 523 @{ $self->{signal_cb}{$signal} };
506 } 524 }
525}
526
527sub disconnect_all {
528 my ($self, $signal) = @_;
529
530 delete $self->{signal_cb}{$signal};
507} 531}
508 532
509my %has_coords = ( 533my %has_coords = (
510 button_down => 1, 534 button_down => 1,
511 button_up => 1, 535 button_up => 1,
… …
523 ? $args[0]->xy ($self) 547 ? $args[0]->xy ($self)
524 : (); 548 : ();
525 549
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 550 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 551
528 #d##TODO# stop propagating at first true, do not use sum 552 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 553 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 554 ($self->can ("invoke_$signal") || sub { 1 }), # closure
555 ) {
556 return $cb->($self, @args, @append) || next;
557 }
558
559 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 560 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 561}
533 562
534sub find_widget { 563#sub find_widget {
535 my ($self, $x, $y) = @_; 564# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 565
546sub set_parent { 566sub set_parent {
547 my ($self, $parent) = @_; 567 my ($self, $parent) = @_;
548 568
549 Scalar::Util::weaken ($self->{parent} = $parent); 569 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 570 $self->set_visible if $parent->{visible};
551} 571}
552 572
553sub realloc { 573sub realloc {
554 my ($self) = @_; 574 my ($self) = @_;
… …
580 600
581# using global variables seems a bit hacky, but passing through all drawing 601# using global variables seems a bit hacky, but passing through all drawing
582# functions seems pointless. 602# functions seems pointless.
583our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 603our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584 604
585sub draw { 605#sub draw {
586 my ($self) = @_; 606#CFPlus.xs
587
588 return unless $self->{h} && $self->{w};
589
590 # update screen rectangle
591 local $draw_x = $draw_x + $self->{x};
592 local $draw_y = $draw_y + $self->{y};
593
594 # skip widgets that are entirely outside the drawing area
595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598 glPushMatrix;
599 glTranslate $self->{x}, $self->{y}, 0;
600
601 if ($self == $HOVER && $self->{can_hover}) {
602 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603 glEnable GL_BLEND;
604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glBegin GL_QUADS;
606 glVertex 0 , 0;
607 glVertex $self->{w}, 0;
608 glVertex $self->{w}, $self->{h};
609 glVertex 0 , $self->{h};
610 glEnd;
611 glDisable GL_BLEND;
612 }
613
614 if ($ENV{CFPLUS_DEBUG} & 1) {
615 glPushMatrix;
616 glColor 1, 1, 0, 1;
617 glTranslate 0.375, 0.375;
618 glBegin GL_LINE_LOOP;
619 glVertex 0 , 0;
620 glVertex $self->{w} - 1, 0;
621 glVertex $self->{w} - 1, $self->{h} - 1;
622 glVertex 0 , $self->{h} - 1;
623 glEnd;
624 glPopMatrix;
625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626 }
627
628 $self->_draw;
629 glPopMatrix;
630}
631 607
632sub _draw { 608sub _draw {
633 my ($self) = @_; 609 my ($self) = @_;
634 610
635 warn "no draw defined for $self\n"; 611 warn "no draw defined for $self\n";
… …
638sub DESTROY { 614sub DESTROY {
639 my ($self) = @_; 615 my ($self) = @_;
640 616
641 return if CFPlus::in_destruct; 617 return if CFPlus::in_destruct;
642 618
643 delete $WIDGET{$self+0}; 619 local $@;
644
645 eval { $self->destroy }; 620 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
622
623 delete $WIDGET{$self+0};
647} 624}
648 625
649############################################################################# 626#############################################################################
650 627
651package CFPlus::UI::DrawBG; 628package CFPlus::UI::DrawBG;
… …
655use strict; 632use strict;
656use CFPlus::OpenGL; 633use CFPlus::OpenGL;
657 634
658sub new { 635sub new {
659 my $class = shift; 636 my $class = shift;
660
661 # range [value, low, high, page]
662 637
663 $class->SUPER::new ( 638 $class->SUPER::new (
664 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
665 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
666 @_ 641 @_
… …
678 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
679 654
680 glEnable GL_BLEND; 655 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 657 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 659 glDisable GL_BLEND;
692 } 660 }
693} 661}
694 662
695############################################################################# 663#############################################################################
… …
727 can_events => 0, 695 can_events => 0,
728 %arg, 696 %arg,
729 ); 697 );
730 698
731 $self->add (@$children) 699 $self->add (@$children)
732 if $children; 700 if $children && @$children;
733 701
734 $self 702 $self
735} 703}
736 704
737sub realloc { 705sub realloc {
… …
746 my ($self, @widgets) = @_; 714 my ($self, @widgets) = @_;
747 715
748 $_->set_parent ($self) 716 $_->set_parent ($self)
749 for @widgets; 717 for @widgets;
750 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 720 use sort 'stable';
752 721
753 $self->{children} = [ 722 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
756 ]; 725 ];
757 726
758 $self->realloc; 727 $self->realloc;
728
729 $self->emit (c_add => \@widgets);
730
731 map $_+0, @widgets
759} 732}
760 733
761sub children { 734sub children {
762 @{ $_[0]{children} } 735 @{ $_[0]{children} }
763} 736}
764 737
765sub remove { 738sub remove {
766 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
767 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
768 delete $child->{parent}; 744 delete $child->{parent};
769 $child->hide; 745 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
772 748
773 $self->realloc; 749 $self->realloc;
774} 750}
775 751
776sub clear { 752sub clear {
777 my ($self) = @_; 753 my ($self) = @_;
778 754
779 my $children = delete $self->{children}; 755 my $children = $self->{children};
780 $self->{children} = []; 756 $self->{children} = [];
781 757
782 for (@$children) { 758 for (@$children) {
783 delete $_->{parent}; 759 delete $_->{parent};
784 $_->hide; 760 $_->hide;
… …
804} 780}
805 781
806sub _draw { 782sub _draw {
807 my ($self) = @_; 783 my ($self) = @_;
808 784
809 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
810} 786}
811 787
812############################################################################# 788#############################################################################
813 789
814package CFPlus::UI::Bin; 790package CFPlus::UI::Bin;
… …
824} 800}
825 801
826sub add { 802sub add {
827 my ($self, $child) = @_; 803 my ($self, $child) = @_;
828 804
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 805 $self->clear;
830 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
831} 807}
832 808
833sub remove { 809sub remove {
834 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
… …
852 828
853 1 829 1
854} 830}
855 831
856############################################################################# 832#############################################################################
857
858# back-buffered drawing area 833# back-buffered drawing area
859 834
860package CFPlus::UI::Window; 835package CFPlus::UI::Window;
861 836
862our @ISA = CFPlus::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
… …
924} 899}
925 900
926############################################################################# 901#############################################################################
927 902
928package CFPlus::UI::ViewPort; 903package CFPlus::UI::ViewPort;
904
905use List::Util qw(min max);
929 906
930our @ISA = CFPlus::UI::Window::; 907our @ISA = CFPlus::UI::Window::;
931 908
932sub new { 909sub new {
933 my $class = shift; 910 my $class = shift;
… …
942sub size_request { 919sub size_request {
943 my ($self) = @_; 920 my ($self) = @_;
944 921
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 923
947 $w = 10 if $self->{scroll_x}; 924 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 925 $h = 1 if $self->{scroll_y};
949 926
950 ($w, $h) 927 ($w, $h)
951} 928}
952 929
953sub invoke_size_allocate { 930sub invoke_size_allocate {
… …
965} 942}
966 943
967sub set_offset { 944sub set_offset {
968 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
969 946
947 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
948 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
949
950 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 951 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 952 $self->{view_y} = $y;
972 953
954 $self->emit (changed => $x, $y);
973 $self->update; 955 $self->update;
956 }
957}
958
959sub set_center {
960 my ($self, $x, $y) = @_;
961
962 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
963}
964
965sub make_visible {
966 my ($self, $x, $y, $border) = @_;
967
968 if ( $x < $self->{view_x} + $self->{w} * $border
969 || $x > $self->{view_x} + $self->{w} * (1 - $border)
970 || $y < $self->{view_y} + $self->{h} * $border
971 || $y > $self->{view_y} + $self->{h} * (1 - $border)
972 ) {
973 $self->set_center ($x, $y);
974 }
974} 975}
975 976
976# hmm, this does not work for topleft of $self... but we should not ask for that 977# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 978sub coord2local {
978 my ($self, $x, $y) = @_; 979 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 994 my ($self, $x, $y) = @_;
994 995
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 998 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1000 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1002 }
1002} 1003}
1003 1004
… …
1014 1015
1015############################################################################# 1016#############################################################################
1016 1017
1017package CFPlus::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
1018 1019
1019our @ISA = CFPlus::UI::HBox::; 1020our @ISA = CFPlus::UI::Table::;
1020 1021
1021sub new { 1022sub new {
1022 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
1023 1024
1024 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
1025 1026
1026 my $self; 1027 my $self;
1027 1028
1028 my $slider = new CFPlus::UI::Slider 1029 my $hslider = new CFPlus::UI::Slider
1030 c_col => 0,
1031 c_row => 1,
1032 vertical => 0,
1033 range => [0, 0, 1, 0.01], # HACK fix
1034 on_changed => sub {
1035 $self->{hpos} = $_[1];
1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1037 },
1038 ;
1039
1040 my $vslider = new CFPlus::UI::Slider
1041 c_col => 1,
1042 c_row => 0,
1029 vertical => 1, 1043 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1045 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1046 $self->{vpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1048 },
1034 ; 1049 ;
1035 1050
1036 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1052 scroll_x => 0,
1053 scroll_y => 1,
1038 can_events => 1, 1054 can_events => 1,
1039 slider => $slider, 1055 hslider => $hslider,
1056 vslider => $vslider,
1057 col_expand => [1, 0],
1058 row_expand => [1, 0],
1040 %arg, 1059 %arg,
1041 ); 1060 );
1042 1061
1062 $self->{vp} = new CFPlus::UI::ViewPort
1063 c_col => 0,
1064 c_row => 0,
1065 expand => 1,
1066 scroll_x => $self->{scroll_x},
1067 scroll_y => $self->{scroll_y},
1068 on_changed => sub {
1069 my ($vp, $x, $y) = @_;
1070
1071 $vp->{parent}{hslider}->set_value ($x);
1072 $vp->{parent}{vslider}->set_value ($y);
1073
1074 0
1075 },
1076 on_size_allocate => sub {
1077 my ($vp, $w, $h) = @_;
1078 $vp->{parent}->update_slider;
1079 0
1080 },
1081 ;
1082
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add ($self->{vp});
1084
1044 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
1045 1086
1046 $self 1087 $self
1047} 1088}
1048
1049#TODO# update range on size_allocate depending on child
1050 1089
1051sub add { 1090sub add {
1052 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
1053 1092
1054 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
1055} 1094}
1056 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
1100sub update_slider {
1101 my ($self) = @_;
1102
1103 my $child = ($self->{vp} or return)->child;
1104
1105 if ($self->{scroll_x}) {
1106 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1107 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1108
1109 my $visible = $w1 > $w2;
1110 if ($visible != $self->{hslider_visible}) {
1111 $self->{hslider_visible} = $visible;
1112 $visible ? $self->SUPER::add ($self->{hslider})
1113 : $self->SUPER::remove ($self->{hslider});
1114 }
1115 }
1116
1117 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider_visible}) {
1123 $self->{vslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{vslider})
1125 : $self->SUPER::remove ($self->{vslider});
1126 }
1127 }
1128}
1129
1130sub start_dragging {
1131 my ($self, $ev) = @_;
1132
1133 $self->grab_focus;
1134
1135 my $ox = $self->{vp}{view_x};
1136 my $oy = $self->{vp}{view_y};
1137
1138 $self->{motion} = sub {
1139 my ($ev, $x, $y) = @_;
1140
1141 $ox -= $ev->{xrel};
1142 $oy -= $ev->{yrel};
1143
1144 $self->{vp}->set_offset ($ox, $oy);
1145 };
1146}
1147
1057sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1059 1150
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1151 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1152 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1153
1064 1 1154 1
1065} 1155}
1066 1156
1067sub update_slider { 1157sub invoke_button_down {
1068 my ($self) = @_; 1158 my ($self, $ev, $x, $y) = @_;
1069 1159
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1160 if ($ev->{button} == 2) {
1071} 1161 $self->start_dragging ($ev);
1162 return 1;
1163 }
1072 1164
1073sub update { 1165 0
1074 my ($self) = @_; 1166}
1075 1167
1076 $self->SUPER::update; 1168sub invoke_button_up {
1169 my ($self, $ev, $x, $y) = @_;
1077 1170
1078 $self->update_slider; 1171 if (delete $self->{motion}) {
1172 return 1;
1173 }
1174
1175 0
1176}
1177
1178sub invoke_mouse_motion {
1179 my ($self, $ev, $x, $y) = @_;
1180
1181 if ($self->{motion}) {
1182 $self->{motion}->($ev, $x, $y);
1183 return 1;
1184 }
1185
1186 0
1079} 1187}
1080 1188
1081sub invoke_size_allocate { 1189sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1083 1191
1084 $self->update_slider; 1192 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1193 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1194}
1088 1195
1089############################################################################# 1196#############################################################################
1090 1197
… …
1110 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1111 1218
1112 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1124 } 1224 }
1125 1225
1126 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1127} 1227}
… …
1240 1340
1241my @border = 1341my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1344
1345my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png);
1348
1245sub new { 1349sub new {
1246 my ($class, %arg) = @_; 1350 my ($class, %arg) = @_;
1247 1351
1248 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1353 bg => [1, 1, 1, 1],
… …
1284 1388
1285sub border { 1389sub border {
1286 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1287} 1391}
1288 1392
1393sub get_max_wh {
1394 my ($self) = @_;
1395
1396 return ($self->{w}, $self->{h})
1397 if $self->{visible} && $self->{w};
1398
1399 $self->SUPER::get_max_wh
1400}
1401
1289sub size_request { 1402sub size_request {
1290 my ($self) = @_; 1403 my ($self) = @_;
1291 1404
1292 $self->{title_widget}->size_request 1405 $self->{title_widget}->size_request
1293 if $self->{title_widget}; 1406 if $self->{title_widget};
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1531
1419 my $border = $self->border; 1532 my $border = $self->border;
1420 1533
1421 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1553
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1429 1556
1430 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1451 1578
1452############################################################################# 1579#############################################################################
1453 1580
1454package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1455 1582
1456our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1457 1584
1458use List::Util qw(max sum); 1585use List::Util qw(max sum);
1459 1586
1460use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1461 1588
1462sub new { 1589sub new {
1463 my $class = shift; 1590 my $class = shift;
1464 1591
1465 $class->SUPER::new ( 1592 $class->SUPER::new (
1466 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1467 @_, 1595 @_,
1468 ) 1596 )
1469} 1597}
1470 1598
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1476 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1477 1614
1478 while (@_) { 1615 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1617
1484 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1485 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1486 $self->realloc;
1487}
1488 1620
1489sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1490 my ($self, $child) = @_; 1628 my ($self) = @_;
1491 1629
1492 # TODO: not yet implemented 1630 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1631
1499 my @children = $self->children; 1632 my @children = $self->children;
1500 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1501 1643 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1644
1507 $self->realloc; 1645 # second pass, rows
1508} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1509
1510sub get_wh {
1511 my ($self) = @_;
1512
1513 my (@w, @h);
1514
1515 for my $y (0 .. $#{$self->{children}}) {
1516 my $row = $self->{children}[$y]
1517 or next;
1518
1519 for my $x (0 .. $#$row) {
1520 my $widget = $row->[$x]
1521 or next;
1522 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1523 1648
1524 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1653 }
1527 } 1654 }
1528 1655
1529 (\@w, \@h) 1656 (\@w, \@h)
1530} 1657}
… …
1546 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1547 1674
1548 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1550 1677
1551 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1555 1682
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1684
1560 CFPlus::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1561 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1562 1694
1563 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1697
1565 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1567 or next;
1568 1700
1569 my $x = 0; 1701 $widget->configure (
1570 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1704 );
1572 for my $c (0 .. $#$row) { 1705 }
1573 my $col_w = $ws->[$c];
1574 1706
1575 if (my $widget = $row->[$c]) { 1707 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1577 }
1578 1709
1579 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580 } 1737 }
1738 }
1581 1739
1582 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583 } 1771 }
1584 1772
1585 1 1773 1
1586} 1774}
1587 1775
1588sub find_widget {
1589 my ($self, $x, $y) = @_;
1590
1591 $x -= $self->{x};
1592 $y -= $self->{y};
1593
1594 my $res;
1595
1596 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597 $res = $_->find_widget ($x, $y)
1598 and return $res;
1599 }
1600
1601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602}
1603
1604sub _draw {
1605 my ($self) = @_;
1606
1607 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_;
1609 }
1610}
1611
1612############################################################################# 1776#############################################################################
1613 1777
1614package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1615 1779
1616our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1617 1781
1618sub size_request { 1782sub size_request {
1619 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1620 1786
1621 $self->{vertical} 1787 $self->{vertical}
1622 ? ( 1788 ? (
1623 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1624 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1625 ) 1791 )
1626 : ( 1792 : (
1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1628 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1629 ) 1795 )
1630} 1796}
1631 1797
1632sub invoke_size_allocate { 1798sub invoke_size_allocate {
1633 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1757 1923
1758 delete $self->{ox}; 1924 delete $self->{ox};
1759 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1760} 1926}
1761 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1762sub set_text { 1934sub set_text {
1763 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1764 1936
1765 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1766 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
1789 1961
1790sub size_request { 1962sub size_request {
1791 my ($self) = @_; 1963 my ($self) = @_;
1792 1964
1793 $self->{size_req} ||= do { 1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1794 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1795 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1796 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1799 1973
1800 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
… …
1872 : ($self->{w} - $size->[0]) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1873 2047
1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876 : ($self->{h} - $size->[1]) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1877 }; 2053 };
1878 2054
1879 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2055# unless ($self->{list}) {
1880 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
1881 2057# CFPlus::OpenGL::glNewList $self->{list};
1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2058# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2059# CFPlus::OpenGL::glEndList;
2060# }
2061#
2062# CFPlus::OpenGL::glCallList $self->{list};
2063
2064 $self->{layout}->draw;
1883} 2065}
2066
2067#sub destroy {
2068# my ($self) = @_;
2069#
2070# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2071#
2072# $self->SUPER::destroy;
2073#}
1884 2074
1885############################################################################# 2075#############################################################################
1886 2076
1887package CFPlus::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1888 2078
… …
1894 my $class = shift; 2084 my $class = shift;
1895 2085
1896 $class->SUPER::new ( 2086 $class->SUPER::new (
1897 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1898 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1899 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1900 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1901 can_hover => 1, 2093 can_hover => 1,
1902 can_focus => 1, 2094 can_focus => 1,
1903 valign => 0, 2095 valign => 0,
1904 can_events => 1, 2096 can_events => 1,
1905 ellipsise => 0, 2097 ellipsise => 0,
… …
1955 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1956 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1957 2149
1958 my $text = $self->get_text; 2150 my $text = $self->get_text;
1959 2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2153
1960 if ($uni == 8) { 2154 if ($uni == 8) {
1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1962 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1963 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1964 } elsif ($sym == CFPlus::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1965 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1966 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1967 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1968 } elsif ($sym == CFPlus::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
1969 $self->{cursor} = 0; 2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
1970 } elsif ($sym == CFPlus::SDLK_END) { 2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1971 $self->{cursor} = length $text; 2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
1972 } elsif ($uni == 21) { # ctrl-u 2174 } elsif ($uni == 21) { # ctrl-u
1973 $text = ""; 2175 $text = "";
1974 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1975 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1976 $self->emit ('escape'); 2178 $self->emit ('escape');
2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
1977 } elsif ($uni >= 0x20) { 2181 } elsif ($uni >= 0x20) {
1978 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1979 } else { 2183 } else {
1980 return 0; 2184 return 0;
1981 } 2185 }
… …
2033 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
2034 } 2238 }
2035 2239
2036 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2037 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2038 glBegin GL_QUADS;
2039 glVertex 0 , 0;
2040 glVertex 0 , $self->{h};
2041 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
2042 glVertex $self->{w}, 0;
2043 glEnd;
2044 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
2045 2244
2046 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
2047 2246
2048 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
… …
2050 2249
2051 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
2052 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
2053 utf8::encode $text; 2252 utf8::encode $text;
2054 2253
2055 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2056 } 2255 }
2057 2256
2257 glColor_premultiply @{$self->{active_fg}};
2058 glBegin GL_LINES; 2258 glBegin GL_LINES;
2059 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2060 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2261 glEnd;
2262
2263 glLineWidth 3;
2264 glColor @{$self->{active_outline}};
2265 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glBegin GL_LINE_STRIP;
2271 glVertex .5, $self->{h} * .5;
2272 glVertex .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - .5, $self->{h} * .5;
2061 glEnd; 2275 glEnd;
2062 } 2276 }
2063} 2277}
2064 2278
2065############################################################################# 2279#############################################################################
… …
2073sub invoke_key_down { 2287sub invoke_key_down {
2074 my ($self, $ev) = @_; 2288 my ($self, $ev) = @_;
2075 2289
2076 my $sym = $ev->{sym}; 2290 my $sym = $ev->{sym};
2077 2291
2078 if ($sym == 13) { 2292 if ($ev->{uni} == 0x0d || $sym == 13) {
2079 unshift @{$self->{history}}, 2293 unshift @{$self->{history}},
2080 my $txt = $self->get_text; 2294 my $txt = $self->get_text;
2081 2295
2082 $self->{history_pointer} = -1; 2296 $self->{history_pointer} = -1;
2083 $self->{history_saveback} = ''; 2297 $self->{history_saveback} = '';
… …
2124sub move_cursor_ver { 2338sub move_cursor_ver {
2125 my ($self, $dy) = @_; 2339 my ($self, $dy) = @_;
2126 2340
2127 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2341 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2128 2342
2129 do { 2343 $y += $dy;
2344
2130 if (defined (my $index = $self->{layout}->line_x_to_index ($y + $dy, $x))) { 2345 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2131 $self->{cursor} = $index; 2346 $self->{cursor} = $index;
2132 delete $self->{cur_h}; 2347 delete $self->{cur_h};
2133 $self->update; 2348 $self->update;
2134 return; 2349 return;
2135 } 2350 }
2136 } while --$x >= 0;
2137} 2351}
2138 2352
2139sub invoke_key_down { 2353sub invoke_key_down {
2140 my ($self, $ev) = @_; 2354 my ($self, $ev) = @_;
2141 2355
… …
2152 1 2366 1
2153} 2367}
2154 2368
2155############################################################################# 2369#############################################################################
2156 2370
2157package CFPlus::UI::Button; 2371package CFPlus::UI::ButtonBin;
2158 2372
2159our @ISA = CFPlus::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
2160 2374
2161use CFPlus::OpenGL; 2375use CFPlus::OpenGL;
2162 2376
2163my @tex = 2377my @tex =
2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
2166 2380
2167sub new { 2381sub new {
2168 my $class = shift; 2382 my $class = shift;
2169 2383
2170 $class->SUPER::new ( 2384 $class->SUPER::new (
2171 padding_x => 4,
2172 padding_y => 4,
2173 fg => [1, 1, 1],
2174 active_fg => [0, 0, 1],
2175 can_hover => 1, 2385 can_hover => 1,
2176 align => 0, 2386 align => 0,
2177 valign => 0, 2387 valign => 0,
2178 can_events => 1, 2388 can_events => 1,
2179 @_ 2389 @_
… …
2191} 2401}
2192 2402
2193sub _draw { 2403sub _draw {
2194 my ($self) = @_; 2404 my ($self) = @_;
2195 2405
2196 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2197
2198 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2200 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
2201 2409
2410 my $tex = $tex[$GRAB == $self];
2202 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2412
2413 glDisable GL_TEXTURE_2D;
2414
2415 $self->SUPER::_draw;
2416}
2417
2418#############################################################################
2419
2420package CFPlus::UI::Button;
2421
2422our @ISA = CFPlus::UI::Label::;
2423
2424use CFPlus::OpenGL;
2425
2426my @tex =
2427 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png);
2429
2430sub new {
2431 my $class = shift;
2432
2433 $class->SUPER::new (
2434 padding_x => 4,
2435 padding_y => 4,
2436 fg => [1.0, 1.0, 1.0],
2437 active_fg => [0.8, 0.8, 0.8],
2438 can_hover => 1,
2439 align => 0,
2440 valign => 0,
2441 can_events => 1,
2442 @_
2443 )
2444}
2445
2446sub invoke_button_up {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 $self->emit ("activate")
2450 if $x >= 0 && $x < $self->{w}
2451 && $y >= 0 && $y < $self->{h};
2452
2453 1
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2460
2461 glEnable GL_TEXTURE_2D;
2462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2463 glColor 0, 0, 0, 1;
2464
2465 my $tex = $tex[$GRAB == $self];
2466 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2203 2467
2204 glDisable GL_TEXTURE_2D; 2468 glDisable GL_TEXTURE_2D;
2205 2469
2206 $self->SUPER::_draw; 2470 $self->SUPER::_draw;
2207} 2471}
… …
2264sub _draw { 2528sub _draw {
2265 my ($self) = @_; 2529 my ($self) = @_;
2266 2530
2267 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
2268 2532
2269 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2270 2534
2271 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
2272 2536
2273 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2537 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2274 2538
… …
2294sub new { 2558sub new {
2295 my $class = shift; 2559 my $class = shift;
2296 2560
2297 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2298 can_events => 0, 2562 can_events => 0,
2563 scale => 1,
2299 @_, 2564 @_,
2300 ); 2565 );
2301 2566
2302 $self->{path} || $self->{tex} 2567 $self->{path} || $self->{tex}
2303 or Carp::croak "'path' or 'tex' attributes required"; 2568 or Carp::croak "'path' or 'tex' attributes required";
2304 2569
2305 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2570 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2306 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2571 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2307 2572
2308 Scalar::Util::weaken $texture_cache{$self->{path}}; 2573 CFPlus::weaken $texture_cache{$self->{path}};
2309 2574
2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2575 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311 2576
2312 $self 2577 $self
2313} 2578}
… …
2328} 2593}
2329 2594
2330sub size_request { 2595sub size_request {
2331 my ($self) = @_; 2596 my ($self) = @_;
2332 2597
2333 ($self->{tex}{w}, $self->{tex}{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2334} 2599}
2335 2600
2336sub _draw { 2601sub _draw {
2337 my ($self) = @_; 2602 my ($self) = @_;
2338 2603
… …
2348 } 2613 }
2349 2614
2350 glEnable GL_TEXTURE_2D; 2615 glEnable GL_TEXTURE_2D;
2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2352 2617
2353 $tex->draw_quad (0, 0, $w, $h); 2618 $tex->draw_quad_alpha (0, 0, $w, $h);
2354 2619
2355 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2356} 2621}
2357 2622
2358############################################################################# 2623#############################################################################
… …
2377 align => 0, 2642 align => 0,
2378 valign => 0, 2643 valign => 0,
2379 can_events => 1, 2644 can_events => 1,
2380 @_ 2645 @_
2381 ); 2646 );
2647}
2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2382} 2653}
2383 2654
2384sub invoke_button_up { 2655sub invoke_button_up {
2385 my ($self, $ev, $x, $y) = @_; 2656 my ($self, $ev, $x, $y) = @_;
2386 2657
… …
2526 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2527} 2798}
2528 2799
2529############################################################################# 2800#############################################################################
2530 2801
2802package CFPlus::UI::Progress;
2803
2804our @ISA = CFPlus::UI::Label::;
2805
2806use CFPlus::OpenGL;
2807
2808sub new {
2809 my ($class, %arg) = @_;
2810
2811 my $self = $class->SUPER::new (
2812 fg => [1, 1, 1],
2813 bg => [0, 0, 1, 0.2],
2814 bar => [0.7, 0.5, 0.1, 0.8],
2815 outline => [0.4, 0.3, 0],
2816 fontsize => 0.9,
2817 valign => 0,
2818 align => 0,
2819 can_events => 1,
2820 ellipsise => 1,
2821 label => "%d%%",
2822 %arg,
2823 );
2824
2825 $self->set_value ($arg{value} || -1);
2826
2827 $self
2828}
2829
2830sub set_label {
2831 my ($self, $label) = @_;
2832
2833 return if $self->{label} eq $label;
2834 $self->{label} = $label;
2835
2836 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2837}
2838
2839sub set_value {
2840 my ($self, $value) = @_;
2841
2842 if ($self->{value} ne $value) {
2843 $self->{value} = $value;
2844
2845 if ($value < 0) {
2846 $self->set_text ("-");
2847 } else {
2848 $self->set_text (sprintf $self->{label}, $value * 100);
2849 }
2850
2851 $self->update;
2852 }
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 glEnable GL_BLEND;
2859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2860
2861 if ($self->{value} >= 0) {
2862 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2863
2864 glColor_premultiply @{$self->{bar}};
2865 glRect 2, 2, $s, $self->{h} - 2;
2866 glColor_premultiply @{$self->{bg}};
2867 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2868 }
2869
2870 glColor_premultiply @{$self->{outline}};
2871 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2872
2873 glDisable GL_BLEND;
2874
2875 {
2876 local $self->{bg}; # do not draw background
2877 $self->SUPER::_draw;
2878 }
2879}
2880
2881#############################################################################
2882
2883package CFPlus::UI::ExperienceProgress;
2884
2885our @ISA = CFPlus::UI::Progress::;
2886
2887sub new {
2888 my ($class, %arg) = @_;
2889
2890 my $self = $class->SUPER::new (
2891 tooltip => sub {
2892 my ($self) = @_;
2893
2894 sprintf "level %d\n%s points\n%s next level\n%s to go",
2895 $self->{lvl},
2896 ::formsep ($self->{exp}),
2897 ::formsep ($self->{nxt}),
2898 ::formsep ($self->{nxt} - $self->{exp}),
2899 },
2900 %arg
2901 );
2902
2903 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2904 if $::CONN;
2905
2906 $self
2907}
2908
2909sub DESTROY {
2910 my ($self) = @_;
2911
2912 delete $::CONN->{on_exp_update}{$self+0}
2913 if $::CONN;
2914
2915 $self->SUPER::DESTROY;
2916}
2917
2918sub set_value {
2919 my ($self, $lvl, $exp) = @_;
2920
2921 $self->{lvl} = $lvl;
2922 $self->{exp} = $exp;
2923
2924 my $v = -1;
2925
2926 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2927 my $l0 = $table->[$lvl - 1];
2928 my $l1 = $table->[$lvl];
2929
2930 $self->{nxt} = $l1;
2931
2932 $v = ($exp - $l0) / ($l1 - $l0);
2933 }
2934
2935 $self->SUPER::set_value ($v);
2936}
2937
2938#############################################################################
2939
2531package CFPlus::UI::Gauge; 2940package CFPlus::UI::Gauge;
2532 2941
2533our @ISA = CFPlus::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2534 2943
2535sub new { 2944sub new {
… …
2660 3069
2661 $self->SUPER::invoke_button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2662 3071
2663 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2664 3073
2665 $self->invoke_mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
3075
3076 1
2666} 3077}
2667 3078
2668sub invoke_mouse_motion { 3079sub invoke_mouse_motion {
2669 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2670 3081
… …
2686sub invoke_mouse_wheel { 3097sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_; 3098 my ($self, $ev) = @_;
2688 3099
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3100 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690 3101
3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3103
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2692 3105
2693 ! ! $delta 3106 1
2694} 3107}
2695 3108
2696sub update { 3109sub update {
2697 my ($self) = @_; 3110 my ($self) = @_;
2698 3111
… …
2806 #font => default_font 3219 #font => default_font
2807 @_, 3220 @_,
2808 3221
2809 layout => (new CFPlus::Layout), 3222 layout => (new CFPlus::Layout),
2810 par => [], 3223 par => [],
3224 max_par => 0,
2811 height => 0, 3225 height => 0,
2812 children => [ 3226 children => [
2813 (new CFPlus::UI::Empty expand => 1), 3227 (new CFPlus::UI::Empty expand => 1),
2814 (new CFPlus::UI::Slider vertical => 1), 3228 (new CFPlus::UI::Slider vertical => 1),
2815 ], 3229 ],
… …
2828} 3242}
2829 3243
2830sub size_request { 3244sub size_request {
2831 my ($self) = @_; 3245 my ($self) = @_;
2832 3246
2833 my ($empty, $slider) = @{ $self->{children} }; 3247 my ($empty, $slider) = $self->visible_children;
2834 3248
2835 local $self->{children} = [$empty, $slider]; 3249 local $self->{children} = [$empty, $slider];
2836 $self->SUPER::size_request 3250 $self->SUPER::size_request
2837} 3251}
2838 3252
… …
2940 3354
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3355 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 push @{$self->{par}}, $para; 3356 push @{$self->{par}}, $para;
2943 } 3357 }
2944 3358
3359 if (my $max = $self->{max_par}) {
3360 shift @{$self->{par}} while @{$self->{par}} > $max;
3361 }
3362
2945 $self->{need_reflow}++; 3363 $self->{need_reflow}++;
2946 $self->update; 3364 $self->update;
2947} 3365}
2948 3366
2949sub scroll_to_bottom { 3367sub scroll_to_bottom {
… …
3023 3441
3024 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
3025 my $layout = $self->get_layout ($para); 3443 my $layout = $self->get_layout ($para);
3026 3444
3027 $layout->render ($para->{indent}, $y - $y0); 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
3028 3447
3029 if (my @w = @{ $para->{widget} }) { 3448 if (my @w = @{ $para->{widget} }) {
3030 my @s = $layout->get_shapes; 3449 my @s = $layout->get_shapes;
3031 3450
3032 for (@w) { 3451 for (@w) {
… …
3154} 3573}
3155 3574
3156sub set_tooltip_from { 3575sub set_tooltip_from {
3157 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
3158 3577
3159 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3160 if $widget->{tooltip} =~ /^#(.*)$/;
3161
3162 my $tooltip = $widget->{tooltip}; 3578 my $tip = $widget->{tooltip};
3579 $tip = $tip->($widget) if "CODE" eq ref $tip;
3580
3581 $tip = CFPlus::Pod::section_label tooltip => $1
3582 if $tip =~ /^#(.*)$/;
3163 3583
3164 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
3165 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
3166 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3167 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
3168 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
3169 } 3589 }
3170 3590
3171 $tooltip =~ s/^\n+//; 3591 $tip =~ s/^\n+//;
3172 $tooltip =~ s/\n+$//; 3592 $tip =~ s/\n+$//;
3173 3593
3174 $self->add (new CFPlus::UI::Label 3594 $self->add (new CFPlus::UI::Label
3175 markup => $tooltip, 3595 markup => $tip,
3176 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3177 fontsize => 0.8, 3597 fontsize => 0.8,
3178 style => 1, # FLAG_INVERSE 3598 style => 1, # FLAG_INVERSE
3179 ellipsise => 0, 3599 ellipsise => 0,
3180 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3218} 3638}
3219 3639
3220sub _draw { 3640sub _draw {
3221 my ($self) = @_; 3641 my ($self) = @_;
3222 3642
3223 glTranslate 0.375, 0.375;
3224
3225 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
3226 3644
3227 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
3228 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
3229 glVertex 0 , 0;
3230 glVertex 0 , $h;
3231 glVertex $w, $h;
3232 glVertex $w, 0;
3233 glEnd;
3234 3647
3235 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
3236 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
3237 glVertex 0 , 0;
3238 glVertex 0 , $h;
3239 glVertex $w, $h;
3240 glVertex $w, 0;
3241 glEnd;
3242 3650
3243 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
3244 3652
3245 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
3246} 3654}
3247 3655
3248############################################################################# 3656#############################################################################
… …
3255 3663
3256sub new { 3664sub new {
3257 my $class = shift; 3665 my $class = shift;
3258 3666
3259 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
3260 aspect => 1, 3670 aspect => 1,
3261 can_events => 0, 3671 can_events => 0,
3262 @_, 3672 @_,
3263 ); 3673 );
3264 3674
3265 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3266 Scalar::Util::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3267 3677
3268 $self->{timer} = Event->timer ( 3678 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3269 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3270 hard => 1, 3680 return unless $::CONN;
3271 interval => $self->{animspeed}, 3681
3272 cb => sub { 3682 my $w = $widget
3683 or return;
3684
3273 ++$widget->{frame}; 3685 ++$w->{frame};
3686 $w->update_face;
3687
3688 # somehow, $widget can go away
3274 $widget->update; 3689 $w->update;
3275 }, 3690 $w->update_timer;
3276 ); 3691 };
3692
3693 $self->update_face;
3694 $self->update_timer;
3277 } 3695 }
3278 3696
3279 $self 3697 $self
3280} 3698}
3281 3699
3700sub update_timer {
3701 my ($self) = @_;
3702
3703 return unless $self->{timer};
3704
3705 if ($self->{visible}) {
3706 $self->{timer}->start;
3707 } else {
3708 $self->{timer}->stop;
3709 }
3710}
3711
3712sub update_face {
3713 my ($self) = @_;
3714
3715 if ($::CONN) {
3716 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3717 if ($anim && @$anim) {
3718 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3719 delete $self->{face_change_cb};
3720
3721 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3722 unless ($tex->{name} || $tex->{loading}) {
3723 $tex->upload (sub { $self->reconfigure });
3724 }
3725 }
3726 }
3727 }
3728 }
3729}
3730
3282sub size_request { 3731sub size_request {
3283 (32, 8) 3732 my ($self) = @_;
3733
3734 if ($::CONN) {
3735 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3736 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3737 if ($tex->{name}) {
3738 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3739 } elsif (!$tex->{loading}) {
3740 $tex->upload (sub { $self->reconfigure });
3741 }
3742 }
3743
3744 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3745 }
3746 }
3747
3748 ($self->{size_w} || 8, $self->{size_h} || 8)
3284} 3749}
3285 3750
3286sub update { 3751sub update {
3287 my ($self) = @_; 3752 my ($self) = @_;
3288 3753
3289 return unless $self->{visible}; 3754 return unless $self->{visible};
3290 3755
3291 $self->SUPER::update; 3756 $self->SUPER::update;
3292} 3757}
3293 3758
3759sub invoke_visibility_change {
3760 my ($self) = @_;
3761
3762 $self->update_timer;
3763
3764 0
3765}
3766
3294sub _draw { 3767sub _draw {
3295 my ($self) = @_; 3768 my ($self) = @_;
3296 3769
3297 return unless $::CONN;
3298
3299 $self->SUPER::_draw; 3770 $self->SUPER::_draw;
3300 3771
3301 my $face; 3772 if (my $tex = $self->{tex}) {
3302
3303 if ($self->{frame}) {
3304 my $anim = $::CONN->{anim}[$self->{anim}];
3305
3306 $face = $anim->[ $self->{frame} % @$anim ]
3307 if $anim && @$anim;
3308 }
3309
3310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3311
3312 if ($tex) {
3313 glEnable GL_TEXTURE_2D; 3773 glEnable GL_TEXTURE_2D;
3314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3315 glColor 0, 0, 0, 1; 3775 glColor 0, 0, 0, 1;
3316 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3776 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3317 glDisable GL_TEXTURE_2D; 3777 glDisable GL_TEXTURE_2D;
… …
3319} 3779}
3320 3780
3321sub destroy { 3781sub destroy {
3322 my ($self) = @_; 3782 my ($self) = @_;
3323 3783
3324 $self->{timer}->cancel 3784 (delete $self->{timer})->cancel
3325 if $self->{timer}; 3785 if $self->{timer};
3326 3786
3327 $self->SUPER::destroy; 3787 $self->SUPER::destroy;
3328} 3788}
3329 3789
… …
3369 children => [ 3829 children => [
3370 (new CFPlus::UI::Label markup => $left, expand => 1), 3830 (new CFPlus::UI::Label markup => $left, expand => 1),
3371 (new CFPlus::UI::Label markup => $right, align => +1), 3831 (new CFPlus::UI::Label markup => $right, align => +1),
3372 ], 3832 ],
3373 ; 3833 ;
3374 3834
3375 } else { 3835 } else {
3376 $widget = new CFPlus::UI::Label 3836 $widget = new CFPlus::UI::Label
3377 can_hover => 1, 3837 can_hover => 1,
3378 can_events => 1, 3838 can_events => 1,
3379 markup => $widget, 3839 markup => $widget,
… …
3504 3964
3505############################################################################# 3965#############################################################################
3506 3966
3507package CFPlus::UI::Notebook; 3967package CFPlus::UI::Notebook;
3508 3968
3969use CFPlus::OpenGL;
3970
3509our @ISA = CFPlus::UI::VBox::; 3971our @ISA = CFPlus::UI::VBox::;
3510 3972
3511sub new { 3973sub new {
3512 my $class = shift; 3974 my $class = shift;
3513 3975
3514 my $self = $class->SUPER::new ( 3976 my $self = $class->SUPER::new (
3515 buttonbar => (new CFPlus::UI::Buttonbar), 3977 buttonbar => (new CFPlus::UI::Buttonbar),
3516 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3978 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3979 active_outline => [.7, .7, 0.2],
3517 # filter => # will be put between multiplexer and $self 3980 # filter => # will be put between multiplexer and $self
3518 @_, 3981 @_,
3519 ); 3982 );
3520 3983
3521 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3984 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3522 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3985 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3523 3986
3987 {
3988 Scalar::Util::weaken (my $wself = $self);
3989
3990 $self->{multiplexer}->connect (c_add => sub {
3991 my ($mplex, $widgets) = @_;
3992
3993 for my $child (@$widgets) {
3994 Scalar::Util::weaken $child;
3995 $child->{c_tab_} ||= do {
3996 my $tab =
3997 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3998 ? $child->{c_tab}
3999 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4000
4001 $tab->connect (activate => sub {
4002 $wself->set_current_page ($child);
4003 });
4004
4005 $tab
4006 };
4007
4008 $self->{buttonbar}->add ($child->{c_tab_});
4009 }
4010 });
4011
4012 $self->{multiplexer}->connect (c_remove => sub {
4013 my ($mplex, $widgets) = @_;
4014
4015 for my $child (@$widgets) {
4016 $wself->{buttonbar}->remove ($child->{c_tab_});
4017 }
4018 });
4019 }
4020
3524 $self 4021 $self
3525} 4022}
3526 4023
3527sub add { 4024sub add {
4025 my ($self, @widgets) = @_;
4026
4027 $self->{multiplexer}->add (@widgets)
4028}
4029
4030sub remove {
4031 my ($self, @widgets) = @_;
4032
4033 $self->{multiplexer}->remove (@widgets)
4034}
4035
4036sub pages {
4037 my ($self) = @_;
4038 $self->{multiplexer}->children
4039}
4040
4041sub add_tab {
3528 my ($self, $title, $widget, $tooltip) = @_; 4042 my ($self, $title, $widget, $tooltip) = @_;
3529 4043
3530 Scalar::Util::weaken $self; 4044 $title = [$title, $tooltip] unless ref $title;
4045 $widget->{c_tab} = $title;
3531 4046
3532 $self->{buttonbar}->add (new CFPlus::UI::Button
3533 markup => $title,
3534 tooltip => $tooltip,
3535 on_activate => sub { $self->set_current_page ($widget) },
3536 );
3537
3538 $self->{multiplexer}->add ($widget); 4047 $self->add ($widget);
3539} 4048}
3540 4049
3541sub get_current_page { 4050sub get_current_page {
3542 my ($self) = @_; 4051 my ($self) = @_;
3543 4052
… …
3547sub set_current_page { 4056sub set_current_page {
3548 my ($self, $page) = @_; 4057 my ($self, $page) = @_;
3549 4058
3550 $self->{multiplexer}->set_current_page ($page); 4059 $self->{multiplexer}->set_current_page ($page);
3551 $self->emit (page_changed => $self->{multiplexer}{current}); 4060 $self->emit (page_changed => $self->{multiplexer}{current});
4061}
4062
4063sub _draw {
4064 my ($self) = @_;
4065
4066 $self->SUPER::_draw ();
4067
4068 if (my $cur = $self->{multiplexer}{current}) {
4069 if ($cur = $cur->{c_tab_}) {
4070 glTranslate $self->{buttonbar}{x} + $cur->{x},
4071 $self->{buttonbar}{y} + $cur->{y};
4072 glLineWidth 3;
4073 #glEnable GL_BLEND;
4074 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4075 glColor @{$self->{active_outline}};
4076 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4077 glLineWidth 1;
4078 #glDisable GL_BLEND;
4079 }
4080 }
3552} 4081}
3553 4082
3554############################################################################# 4083#############################################################################
3555 4084
3556package CFPlus::UI::Selector; 4085package CFPlus::UI::Selector;
… …
3588} 4117}
3589 4118
3590sub _set_value { 4119sub _set_value {
3591 my ($self, $value) = @_; 4120 my ($self, $value) = @_;
3592 4121
3593 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4122 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4123 $item ||= $self->{options}[0]
3594 or return; 4124 or return;
3595 4125
3596 $self->{value} = $item->[0]; 4126 $self->{value} = $item->[0];
3597 $self->set_markup ("$item->[1] ⇓"); 4127 $self->set_markup ("$item->[1] ⇓");
3598 $self->set_tooltip ($item->[2]); 4128# $self->set_tooltip ($item->[2]);
3599} 4129}
3600 4130
3601sub set_value { 4131sub set_value {
3602 my ($self, $value) = @_; 4132 my ($self, $value) = @_;
3603 4133
3604 return unless $self->{value} ne $value; 4134 return unless $self->{value} ne $value;
3605 4135
3606 $self->_set_value ($value); 4136 $self->_set_value ($value);
3607 $self->emit (changed => $value); 4137 $self->emit (changed => $value);
4138}
4139
4140sub set_options {
4141 my ($self, $options) = @_;
4142
4143 $self->{options} = $options;
4144 $self->_set_value ($self->{value});
3608} 4145}
3609 4146
3610############################################################################# 4147#############################################################################
3611 4148
3612package CFPlus::UI::Statusbox; 4149package CFPlus::UI::Statusbox;
… …
3619 my $self = $class->SUPER::new ( 4156 my $self = $class->SUPER::new (
3620 fontsize => 0.8, 4157 fontsize => 0.8,
3621 @_, 4158 @_,
3622 ); 4159 );
3623 4160
3624 Scalar::Util::weaken (my $this = $self); 4161 CFPlus::weaken (my $this = $self);
3625 4162
3626 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4163 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3627 4164
3628 $self 4165 $self
3629} 4166}
3630 4167
3631sub reorder { 4168sub reorder {
… …
3645 4182
3646 my @items = sort { 4183 my @items = sort {
3647 $a->{pri} <=> $b->{pri} 4184 $a->{pri} <=> $b->{pri}
3648 or $b->{id} <=> $a->{id} 4185 or $b->{id} <=> $a->{id}
3649 } values %{ $self->{item} }; 4186 } values %{ $self->{item} };
3650
3651 $self->{timer}->interval (1);
3652 4187
3653 my $count = 10 + 1; 4188 my $count = 10 + 1;
3654 for my $item (@items) { 4189 for my $item (@items) {
3655 last unless --$count; 4190 last unless --$count;
3656 4191
… …
3680 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4215 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3681 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4216 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3682 $label->update; 4217 $label->update;
3683 $label->set_max_size (undef, $label->{req_h} * $diff) 4218 $label->set_max_size (undef, $label->{req_h} * $diff)
3684 if $diff < 1; 4219 if $diff < 1;
3685 $self->{timer}->interval (1/30); 4220 $self->{timer}->set (1/30, 1/30);
3686 } else { 4221 } else {
3687 $label->{fg}[3] = $item->{fg}[3] || 1; 4222 $label->{fg}[3] = $item->{fg}[3] || 1;
3688 } 4223 }
3689 4224
3690 push @widgets, $label; 4225 push @widgets, $label;
… …
3752 $self->SUPER::destroy; 4287 $self->SUPER::destroy;
3753} 4288}
3754 4289
3755############################################################################# 4290#############################################################################
3756 4291
3757package CFPlus::UI::Inventory;
3758
3759our @ISA = CFPlus::UI::Table::;
3760
3761sub new {
3762 my $class = shift;
3763
3764 my $self = $class->SUPER::new (
3765 col_expand => [0, 1, 0],
3766 items => [],
3767 @_,
3768 );
3769
3770 $self->set_sort_order (undef);
3771
3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3808}
3809
3810sub set_items {
3811 my ($self, $items) = @_;
3812
3813 $self->{items} = [$items ? values %$items : ()];
3814 $self->update_items;
3815}
3816
3817#############################################################################
3818
3819package CFPlus::UI::SpellList;
3820
3821our @ISA = CFPlus::UI::Table::;
3822
3823sub new {
3824 my $class = shift;
3825
3826 my $self = $class->SUPER::new (
3827 binding => [],
3828 commands => [],
3829 @_,
3830 )
3831}
3832
3833my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3839my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3840 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3841my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3842 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3843my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3845
3846sub rebuild_spell_list {
3847 my ($self) = @_;
3848
3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3850 $self->clear;
3851
3852 return unless $::CONN;
3853
3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3859
3860 my $row = 0;
3861
3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3863 my $spell = $self->{spell}{$_};
3864
3865 $row++;
3866
3867 my $spell_cb = sub {
3868 my ($widget, $ev) = @_;
3869
3870 if ($ev->{button} == 1) {
3871 $::CONN->user_send ("cast $spell->{name}");
3872 } elsif ($ev->{button} == 2) {
3873 $::CONN->user_send ("invoke $spell->{name}");
3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3876 (new CFPlus::UI::Menu
3877 items => [
3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880 ],
3881 )->popup ($ev);
3882 } else {
3883 return 0;
3884 }
3885
3886 1
3887 };
3888
3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891 #TODO: add path info to tooltip
3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3894 $self->add (0, $row, new CFPlus::UI::Face
3895 face => $spell->{face},
3896 can_hover => 1,
3897 can_events => 1,
3898 tooltip => $tooltip,
3899 on_button_down => $spell_cb,
3900 );
3901
3902 $self->add (1, $row, new CFPlus::UI::Label
3903 expand => 1,
3904 text => $spell->{name},
3905 can_hover => 1,
3906 can_events => 1,
3907 tooltip => $tooltip,
3908 on_button_down => $spell_cb,
3909 );
3910
3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3915 }
3916 });
3917}
3918
3919sub add_spell {
3920 my ($self, $spell) = @_;
3921
3922 $self->{spell}->{$spell->{name}} = $spell;
3923 $self->rebuild_spell_list;
3924}
3925
3926sub remove_spell {
3927 my ($self, $spell) = @_;
3928
3929 delete $self->{spell}->{$spell->{name}};
3930 $self->rebuild_spell_list;
3931}
3932
3933sub clear_spells {
3934 my ($self) = @_;
3935
3936 $self->{spell} = {};
3937 $self->rebuild_spell_list;
3938}
3939
3940#############################################################################
3941
3942package CFPlus::UI::Root; 4292package CFPlus::UI::Root;
3943 4293
3944our @ISA = CFPlus::UI::Container::; 4294our @ISA = CFPlus::UI::Container::;
3945 4295
3946use List::Util qw(min max); 4296use List::Util qw(min max);
… …
3953 my $self = $class->SUPER::new ( 4303 my $self = $class->SUPER::new (
3954 visible => 1, 4304 visible => 1,
3955 @_, 4305 @_,
3956 ); 4306 );
3957 4307
3958 Scalar::Util::weaken ($self->{root} = $self); 4308 CFPlus::weaken ($self->{root} = $self);
3959 4309
3960 $self 4310 $self
3961} 4311}
3962 4312
3963sub size_request { 4313sub size_request {
… …
4011} 4361}
4012 4362
4013sub update { 4363sub update {
4014 my ($self) = @_; 4364 my ($self) = @_;
4015 4365
4016 $::WANT_REFRESH++; 4366 $::WANT_REFRESH->start;
4017} 4367}
4018 4368
4019sub add { 4369sub add {
4020 my ($self, @children) = @_; 4370 my ($self, @children) = @_;
4021 4371
… …
4058 while ($self->{refresh_hook}) { 4408 while ($self->{refresh_hook}) {
4059 $_->() 4409 $_->()
4060 for values %{delete $self->{refresh_hook}}; 4410 for values %{delete $self->{refresh_hook}};
4061 } 4411 }
4062 4412
4063 if ($self->{realloc}) { 4413 while ($self->{realloc}) {
4064 my %queue; 4414 my %queue;
4065 my @queue; 4415 my @queue;
4066 my $widget; 4416 my $widget;
4067 4417
4068 outer: 4418 outer:
… …
4115 } 4465 }
4116 } 4466 }
4117 4467
4118 delete $self->{realloc}{$widget+0}; 4468 delete $self->{realloc}{$widget+0};
4119 } 4469 }
4120 }
4121 4470
4122 while (my $size_alloc = delete $self->{size_alloc}) { 4471 while (my $size_alloc = delete $self->{size_alloc}) {
4123 my @queue = sort { $b->{visible} <=> $a->{visible} } 4472 my @queue = sort { $a->{visible} <=> $b->{visible} }
4124 values %$size_alloc; 4473 values %$size_alloc;
4125 4474
4126 while () { 4475 while () {
4127 my $widget = pop @queue || last; 4476 my $widget = pop @queue || last;
4128 4477
4129 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4478 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4130 4479
4131 $w = 0 if $w < 0;
4132 $h = 0 if $h < 0;
4133
4134 $w = max $widget->{min_w}, $w; 4480 $w = max $widget->{min_w}, $w;
4135 $h = max $widget->{min_h}, $h; 4481 $h = max $widget->{min_h}, $h;
4136 4482
4137# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4483# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4138# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4484# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4139 4485
4140 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4486 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4141 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4487 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4142 4488
4143 $w = int $w + 0.5; 4489 $w = int $w + 0.5;
4144 $h = int $h + 0.5; 4490 $h = int $h + 0.5;
4145 4491
4146 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4492 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4147 $widget->{old_w} = $widget->{w}; 4493 $widget->{old_w} = $widget->{w};
4148 $widget->{old_h} = $widget->{h}; 4494 $widget->{old_h} = $widget->{h};
4149 4495
4150 $widget->{w} = $w; 4496 $widget->{w} = $w;
4151 $widget->{h} = $h; 4497 $widget->{h} = $h;
4152 4498
4153 $widget->emit (size_allocate => $w, $h); 4499 $widget->emit (size_allocate => $w, $h);
4500 }
4154 } 4501 }
4155 } 4502 }
4156 } 4503 }
4157 4504
4158 while ($self->{post_alloc_hook}) { 4505 while ($self->{post_alloc_hook}) {
4159 $_->() 4506 $_->()
4160 for values %{delete $self->{post_alloc_hook}}; 4507 for values %{delete $self->{post_alloc_hook}};
4161 } 4508 }
4162
4163 4509
4164 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4510 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4165 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4511 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4166 glClear GL_COLOR_BUFFER_BIT; 4512 glClear GL_COLOR_BUFFER_BIT;
4167 4513

Diff Legend

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