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.338 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.420 by root, Wed Jul 25 15:50:17 2007 UTC

1package CFClient::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; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
96 99
97sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
98 my ($ev) = @_; 101 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
100 103
101 unless ($BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
103 108
104 $GRAB = $widget; 109 $GRAB = $widget;
105 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
106 111
107 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
108 } 113 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
207 reconfigure_widgets; 214 reconfigure_widgets;
208} 215}
209 216
210############################################################################# 217#############################################################################
211 218
212package CFClient::UI::Event; 219package CFPlus::UI::Event;
213 220
214sub xy { 221sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 223}
217 224
218############################################################################# 225#############################################################################
219 226
220package CFClient::UI::Base; 227package CFPlus::UI::Base;
221 228
222use strict; 229use strict;
223 230
224use CFClient::OpenGL; 231use CFPlus::OpenGL;
225 232
226sub new { 233sub new {
227 my $class = shift; 234 my $class = shift;
228 235
229 my $self = bless { 236 my $self = bless {
… …
234 h => undef, 241 h => undef,
235 can_events => 1, 242 can_events => 1,
236 @_ 243 @_
237 }, $class; 244 }, $class;
238 245
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 247
241 for (keys %$self) { 248 for (keys %$self) {
242 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
244 } 251 }
245 } 252 }
246 253
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 259
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 262
256 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
261 268
262sub destroy { 269sub destroy {
263 my ($self) = @_; 270 my ($self) = @_;
264 271
265 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
266 %$self = (); 274 %$self = ();
267} 275}
268 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
269sub show { 281sub show {
270 my ($self) = @_; 282 my ($self) = @_;
271 283
272 return if $self->{parent}; 284 return if $self->{parent};
273 285
274 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
275} 287}
276 288
277sub set_visible { 289sub set_visible {
278 my ($self) = @_; 290 my ($self) = @_;
279 291
… …
300 delete $self->{root}; 312 delete $self->{root};
301 313
302 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
304 316
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
307 319
308 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
310} 322}
… …
312sub set_visibility { 324sub set_visibility {
313 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
314 326
315 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
316 328
317 $visible ? $self->hide 329 $visible ? $self->show
318 : $self->show; 330 : $self->hide;
319} 331}
320 332
321sub toggle_visibility { 333sub toggle_visibility {
322 my ($self) = @_; 334 my ($self) = @_;
323 335
… …
367 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
368 380
369 if ($self->{aspect}) { 381 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
371 383
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 386
375 # use alignment to adjust x, y 387 # use alignment to adjust x, y
376 388
377 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
419 431
420 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
421 433
422 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
423 435
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 439 }
428} 440}
429 441
430# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
431sub coord2local { 443sub coord2local {
… …
497sub connect { 509sub connect {
498 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
499 511
500 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
501 513
502 defined wantarray and CFClient::guard { 514 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
505 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
506} 524}
507 525
508my %has_coords = ( 526my %has_coords = (
509 button_down => 1, 527 button_down => 1,
510 button_up => 1, 528 button_up => 1,
… …
513); 531);
514 532
515sub emit { 533sub emit {
516 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
517 535
518 # I do not really like this solution, but I dislike duplication 536 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 537 # and needlessly verbose code, either.
520 my @append 538 my @append
521 = $has_coords{$signal} 539 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
523 : (); 541 : ();
524 542
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 544
527 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 554}
532 555
533sub find_widget { 556#sub find_widget {
534 my ($self, $x, $y) = @_; 557# in .xs
535
536 return () unless $self->{can_events};
537
538 return $self
539 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542 ()
543}
544 558
545sub set_parent { 559sub set_parent {
546 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
547 561
548 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
550} 564}
551 565
552sub realloc { 566sub realloc {
553 my ($self) = @_; 567 my ($self) = @_;
… …
579 593
580# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless. 595# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583 597
584sub draw { 598#sub draw {
585 my ($self) = @_; 599#CFPlus.xs
586
587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597 glPushMatrix;
598 glTranslate $self->{x}, $self->{y}, 0;
599
600 if ($self == $HOVER && $self->{can_hover}) {
601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602 glEnable GL_BLEND;
603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glBegin GL_QUADS;
605 glVertex 0 , 0;
606 glVertex $self->{w}, 0;
607 glVertex $self->{w}, $self->{h};
608 glVertex 0 , $self->{h};
609 glEnd;
610 glDisable GL_BLEND;
611 }
612
613 if ($ENV{CFPLUS_DEBUG} & 1) {
614 glPushMatrix;
615 glColor 1, 1, 0, 1;
616 glTranslate 0.375, 0.375;
617 glBegin GL_LINE_LOOP;
618 glVertex 0 , 0;
619 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1;
622 glEnd;
623 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 }
626
627 $self->_draw;
628 glPopMatrix;
629}
630 600
631sub _draw { 601sub _draw {
632 my ($self) = @_; 602 my ($self) = @_;
633 603
634 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
635} 605}
636 606
637sub DESTROY { 607sub DESTROY {
638 my ($self) = @_; 608 my ($self) = @_;
639 609
640 return if CFClient::in_destruct; 610 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 611
644 eval { $self->destroy }; 612 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
646} 616}
647 617
648############################################################################# 618#############################################################################
649 619
650package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
651 621
652our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
653 623
654use strict; 624use strict;
655use CFClient::OpenGL; 625use CFPlus::OpenGL;
656 626
657sub new { 627sub new {
658 my $class = shift; 628 my $class = shift;
659 629
660 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
691 } 661 }
692} 662}
693 663
694############################################################################# 664#############################################################################
695 665
696package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
697 667
698our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
699 669
700sub new { 670sub new {
701 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
703} 673}
… …
710 680
711sub draw { } 681sub draw { }
712 682
713############################################################################# 683#############################################################################
714 684
715package CFClient::UI::Container; 685package CFPlus::UI::Container;
716 686
717our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
718 688
719sub new { 689sub new {
720 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
721 691
722 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
726 can_events => 0, 696 can_events => 0,
727 %arg, 697 %arg,
728 ); 698 );
729 699
730 $self->add (@$children) 700 $self->add (@$children)
731 if $children; 701 if $children && @$children;
732 702
733 $self 703 $self
734} 704}
735 705
736sub realloc { 706sub realloc {
… …
745 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
746 716
747 $_->set_parent ($self) 717 $_->set_parent ($self)
748 for @widgets; 718 for @widgets;
749 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 721 use sort 'stable';
751 722
752 $self->{children} = [ 723 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
755 ]; 726 ];
756 727
757 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
758} 733}
759 734
760sub children { 735sub children {
761 @{ $_[0]{children} } 736 @{ $_[0]{children} }
762} 737}
763 738
764sub remove { 739sub remove {
765 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
766 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
767 delete $child->{parent}; 745 delete $child->{parent};
768 $child->hide; 746 $child->hide;
769
770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
771 749
772 $self->realloc; 750 $self->realloc;
773} 751}
774 752
775sub clear { 753sub clear {
776 my ($self) = @_; 754 my ($self) = @_;
777 755
778 my $children = delete $self->{children}; 756 my $children = $self->{children};
779 $self->{children} = []; 757 $self->{children} = [];
780 758
781 for (@$children) { 759 for (@$children) {
782 delete $_->{parent}; 760 delete $_->{parent};
783 $_->hide; 761 $_->hide;
… …
803} 781}
804 782
805sub _draw { 783sub _draw {
806 my ($self) = @_; 784 my ($self) = @_;
807 785
808 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
809} 787}
810 788
811############################################################################# 789#############################################################################
812 790
813package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
814 792
815our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
816 794
817sub new { 795sub new {
818 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
819 797
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 799
822 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
823} 801}
824 802
825sub add { 803sub add {
826 my ($self, $child) = @_; 804 my ($self, $child) = @_;
827 805
828 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
829 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
830} 808}
831 809
832sub remove { 810sub remove {
833 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
834 812
835 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
836 814
837 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 816 unless @{$self->{children}};
839} 817}
840 818
841sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
842 820
… …
854 832
855############################################################################# 833#############################################################################
856 834
857# back-buffered drawing area 835# back-buffered drawing area
858 836
859package CFClient::UI::Window; 837package CFPlus::UI::Window;
860 838
861our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
862 840
863use CFClient::OpenGL; 841use CFPlus::OpenGL;
864 842
865sub new { 843sub new {
866 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
867 845
868 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
890} 868}
891 869
892sub render_child { 870sub render_child {
893 my ($self) = @_; 871 my ($self) = @_;
894 872
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
898 876
899 { 877 {
900 package CFClient::UI::Base; 878 package CFPlus::UI::Base;
901 879
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
904 } 884 }
905
906 $self->_render;
907 }; 885 };
908} 886}
909 887
910sub _draw { 888sub _draw {
911 my ($self) = @_; 889 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 890
915 my $tex = $self->{texture} 891 my $tex = $self->{texture}
916 or return; 892 or return;
917 893
918 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
921 897
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
923 899
924 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
925} 901}
926 902
927############################################################################# 903#############################################################################
928 904
929package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
930 906
907use List::Util qw(min max);
908
931our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
932 910
933sub new { 911sub new {
934 my $class = shift; 912 my $class = shift;
935 913
936 $class->SUPER::new ( 914 $class->SUPER::new (
… …
943sub size_request { 921sub size_request {
944 my ($self) = @_; 922 my ($self) = @_;
945 923
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 925
948 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
950 928
951 ($w, $h) 929 ($w, $h)
952} 930}
953 931
954sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
966} 944}
967 945
968sub set_offset { 946sub set_offset {
969 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
970 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
973 955
956 $self->emit (changed => $x, $y);
974 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
975} 977}
976 978
977# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 980sub coord2local {
979 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
995 997
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1000 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1002 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1004 }
1003} 1005}
1004 1006
1005sub _render { 1007sub _render {
1006 my ($self) = @_; 1008 my ($self) = @_;
1007 1009
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1012
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1014
1013 $self->SUPER::_render; 1015 $self->SUPER::_render;
1014} 1016}
1015 1017
1016############################################################################# 1018#############################################################################
1017 1019
1018package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
1019 1021
1020our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
1021 1023
1022sub new { 1024sub new {
1023 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
1024 1026
1025 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1026 1028
1027 my $self; 1029 my $self;
1028 1030
1029 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0,
1033 row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1,
1044 row => 0,
1030 vertical => 1, 1045 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1047 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1050 },
1035 ; 1051 ;
1036 1052
1037 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1039 can_events => 1, 1056 can_events => 1,
1040 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1041 %arg, 1061 %arg,
1042 ); 1062 );
1043 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0,
1066 row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
1045 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1046 1088
1047 $self 1089 $self
1048} 1090}
1049
1050#TODO# update range on size_allocate depending on child
1051 1091
1052sub add { 1092sub add {
1053 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1054 1094
1055 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1056} 1096}
1057 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1058sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1060 1152
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1155
1065 1 1156 1
1066} 1157}
1067 1158
1068sub update_slider { 1159sub invoke_button_down {
1069 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1070 1161
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1162 if ($ev->{button} == 2) {
1072} 1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1073 1166
1074sub update { 1167 0
1075 my ($self) = @_; 1168}
1076 1169
1077 $self->SUPER::update; 1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1078 1172
1079 $self->update_slider; 1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1080} 1189}
1081 1190
1082sub invoke_size_allocate { 1191sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1084 1193
1085 $self->update_slider; 1194 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1196}
1089 1197
1090############################################################################# 1198#############################################################################
1091 1199
1092package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1093 1201
1094our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1095 1203
1096use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1097 1205
1098sub new { 1206sub new {
1099 my $class = shift; 1207 my $class = shift;
1100 1208
1101 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1128} 1236}
1129 1237
1130############################################################################# 1238#############################################################################
1131 1239
1132package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1133 1241
1134our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1135 1243
1136use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1137 1345
1138my $bg = 1346my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1141 1349
1142my @border = 1350my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1145 1357
1146sub new { 1358sub new {
1147 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1148 1360
1149 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1366 min_w => 64,
1155 min_h => 32, 1367 min_h => 32,
1156 %arg, 1368 %arg,
1157 ); 1369 );
1158 1370
1159 $self->{title_widget} = new CFClient::UI::Label 1371 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1372 align => 0,
1161 valign => 1, 1373 valign => 1,
1162 text => $self->{title}, 1374 text => $self->{title},
1163 fontsize => $self->{border}, 1375 fontsize => $self->{border},
1164 if exists $self->{title}; 1376 if exists $self->{title};
1165 1377
1166 if ($self->{has_close_button}) { 1378 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1379 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1380 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1381 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1382 on_activate => sub { $self->emit ("delete") };
1171 1383
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1385 }
1174 1386
1175 $self 1387 $self
1176} 1388}
1177 1389
1178sub add { 1390sub add {
1179 my ($self, @widgets) = @_; 1391 my ($self, @widgets) = @_;
1180 1392
1181 $self->SUPER::add (@widgets); 1393 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1396}
1185 1397
1186sub border { 1398sub border {
1187 int $_[0]{border} * $::FONTSIZE 1399 int $_[0]{border} * $::FONTSIZE
1188} 1400}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1509
1298 ! ! $self->{motion} 1510 ! ! $self->{motion}
1299} 1511}
1300 1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
1519}
1520
1301sub _draw { 1521sub _draw {
1302 my ($self) = @_; 1522 my ($self) = @_;
1303 1523
1304 my $child = $self->{children}[0]; 1524 my $child = $self->{children}[0];
1305 1525
… …
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1531
1312 my $border = $self->border; 1532 my $border = $self->border;
1313 1533
1314 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $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);
1319 1553
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1322 1556
1323 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1576 if $self->{close_button};
1343} 1577}
1344 1578
1345############################################################################# 1579#############################################################################
1346 1580
1347package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1348 1582
1349our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1350 1584
1351use List::Util qw(max sum); 1585use List::Util qw(max sum);
1352 1586
1353use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1354 1588
1355sub new { 1589sub new {
1356 my $class = shift; 1590 my $class = shift;
1357 1591
1358 $class->SUPER::new ( 1592 $class->SUPER::new (
1359 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1360 @_, 1595 @_,
1361 ) 1596 )
1362} 1597}
1363 1598
1364sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366}
1367
1368sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1369 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1370 1614
1371 while (@_) { 1615 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child;
1375 }
1376 1617
1377 $self->{force_realloc} = 1; 1618 $child->{row} = $row;
1378 $self->{force_size_alloc} = 1; 1619 $child->{col} = $col;
1379 $self->realloc;
1380}
1381 1620
1382sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1383 my ($self, $child) = @_; 1628 my ($self) = @_;
1384 1629
1385 # TODO: not yet implemented 1630 my (@w, @h);
1386}
1387
1388# TODO: move to container class maybe? send children a signal on removal?
1389sub clear {
1390 my ($self) = @_;
1391 1631
1392 my @children = $self->children; 1632 my @children = $self->children;
1393 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w 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 }
1394 1643 }
1395 for (@children) {
1396 delete $_->{parent};
1397 $_->hide;
1398 }
1399 1644
1400 $self->realloc; 1645 # second pass, rows
1401} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1402
1403sub get_wh {
1404 my ($self) = @_;
1405
1406 my (@w, @h);
1407
1408 for my $y (0 .. $#{$self->{children}}) {
1409 my $row = $self->{children}[$y]
1410 or next;
1411
1412 for my $x (0 .. $#$row) {
1413 my $widget = $row->[$x]
1414 or next;
1415 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1416 1648
1417 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1418 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419 } 1653 }
1420 } 1654 }
1421 1655
1422 (\@w, \@h) 1656 (\@w, \@h)
1423} 1657}
… …
1439 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1440 1674
1441 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1443 1677
1444 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1445 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1448 1682
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1684
1453 CFClient::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
1454 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1455 1694
1456 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457 1697
1458 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1459 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1460 or next;
1461 1700
1462 my $x = 0; 1701 $widget->configure (
1463 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464 1704 );
1465 for my $c (0 .. $#$row) { 1705 }
1466 my $col_w = $ws->[$c];
1467 1706
1468 if (my $widget = $row->[$c]) { 1707 1
1469 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1470 }
1471 1709
1472 $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};
1473 } 1737 }
1738 }
1474 1739
1475 $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});
1476 } 1771 }
1477 1772
1478 1 1773 1
1479} 1774}
1480 1775
1481sub find_widget {
1482 my ($self, $x, $y) = @_;
1483
1484 $x -= $self->{x};
1485 $y -= $self->{y};
1486
1487 my $res;
1488
1489 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490 $res = $_->find_widget ($x, $y)
1491 and return $res;
1492 }
1493
1494 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495}
1496
1497sub _draw {
1498 my ($self) = @_;
1499
1500 for (grep $_, @{$self->{children}}) {
1501 $_->draw for grep $_, @$_;
1502 }
1503}
1504
1505############################################################################# 1776#############################################################################
1506 1777
1507package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1508 1779
1509our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1510 1781
1511sub size_request { 1782sub size_request {
1512 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1513 1786
1514 $self->{vertical} 1787 $self->{vertical}
1515 ? ( 1788 ? (
1516 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1517 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1518 ) 1791 )
1519 : ( 1792 : (
1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1521 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1522 ) 1795 )
1523} 1796}
1524 1797
1525sub invoke_size_allocate { 1798sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1547 $req[$_] += $space * $children[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1821 for 0 .. $#children;
1549 } 1822 }
1550 } 1823 }
1551 1824
1552 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1553 1826
1554 my $pos = 0; 1827 my $pos = 0;
1555 for (0 .. $#children) { 1828 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1835 1
1563} 1836}
1564 1837
1565############################################################################# 1838#############################################################################
1566 1839
1567package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1568 1841
1569our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1570 1843
1571sub new { 1844sub new {
1572 my $class = shift; 1845 my $class = shift;
1573 1846
1574 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1577 ) 1850 )
1578} 1851}
1579 1852
1580############################################################################# 1853#############################################################################
1581 1854
1582package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1583 1856
1584our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1585 1858
1586sub new { 1859sub new {
1587 my $class = shift; 1860 my $class = shift;
1588 1861
1589 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1592 ) 1865 )
1593} 1866}
1594 1867
1595############################################################################# 1868#############################################################################
1596 1869
1597package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1598 1871
1599our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1600 1873
1601use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1602 1875
1603sub new { 1876sub new {
1604 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1605 1878
1606 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1882 #active_bg => none
1610 #font => default_font 1883 #font => default_font
1611 #text => initial text 1884 #text => initial text
1612 #markup => initial narkup 1885 #markup => initial narkup
1613 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1614 ellipsise => 3, # end 1888 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1890 fontsize => 1,
1617 align => -1, 1891 align => -1,
1618 valign => -1, 1892 valign => -1,
1619 padding_x => 2, 1893 padding_x => 2,
1620 padding_y => 2, 1894 padding_y => 2,
1621 can_events => 0, 1895 can_events => 0,
1622 %arg 1896 %arg
1623 ); 1897 );
1624 1898
1625 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1902 $self->{template} = $layout;
1629 } 1903 }
1630 1904
1631 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1768 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1769 }; 2043 };
1770 2044
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1773 2053
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1776 2064
1777############################################################################# 2065#############################################################################
1778 2066
1779package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1780 2068
1781our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1782 2070
1783use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1784 2072
1785sub new { 2073sub new {
1786 my $class = shift; 2074 my $class = shift;
1787 2075
1788 $class->SUPER::new ( 2076 $class->SUPER::new (
1789 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1790 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1],
1791 active_bg => [1, 1, 1, 0.5], 2080 active_bg => [0, 0, 1, .2],
1792 active_fg => [0, 0, 0], 2081 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0],
1793 can_hover => 1, 2083 can_hover => 1,
1794 can_focus => 1, 2084 can_focus => 1,
1795 valign => 0, 2085 valign => 0,
1796 can_events => 1, 2086 can_events => 1,
2087 ellipsise => 0,
1797 #text => ... 2088 #text => ...
1798 #hidden => "*", 2089 #hidden => "*",
1799 @_ 2090 @_
1800 ) 2091 )
1801} 2092}
… …
1846 my $sym = $ev->{sym}; 2137 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2138 my $uni = $ev->{unicode};
1848 2139
1849 my $text = $self->get_text; 2140 my $text = $self->get_text;
1850 2141
2142 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2143
1851 if ($uni == 8) { 2144 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2146 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2147 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2148 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2149 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2150 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2152 } elsif ($sym == CFPlus::SDLK_HOME) {
2153 # what a hack
2154 $self->{cursor} =
2155 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2156 ? length $1
2157 : 0;
2158 } elsif ($sym == CFPlus::SDLK_END) {
2159 # uh, again
2160 $self->{cursor} =
2161 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2162 ? $self->{cursor} + length $1
2163 : length $self->{text};
2164 } elsif ($uni == 21) { # ctrl-u
2165 $text = "";
1860 $self->{cursor} = 0; 2166 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2167 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2168 $self->emit ('escape');
1865 } elsif ($uni) { 2169 } elsif ($uni == 0x0d) {
2170 substr $text, $self->{cursor}++, 0, "\012";
2171 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2172 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2173 } else {
1868 return 0; 2174 return 0;
1869 } 2175 }
1870 2176
1871 $self->_set_text ($text); 2177 $self->_set_text ($text);
1872 2178
1873 $self->realloc; 2179 $self->realloc;
2180 $self->update;
1874 2181
1875 1 2182 1
1876} 2183}
1877 2184
1878sub invoke_focus_in { 2185sub invoke_focus_in {
… …
1937 2244
1938 unless (exists $self->{cur_h}) { 2245 unless (exists $self->{cur_h}) {
1939 my $text = substr $self->{text}, 0, $self->{cursor}; 2246 my $text = substr $self->{text}, 0, $self->{cursor};
1940 utf8::encode $text; 2247 utf8::encode $text;
1941 2248
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1943 } 2250 }
1944 2251
1945 glColor @{$self->{fg}}; 2252 glColor_premultiply @{$self->{active_fg}};
1946 glBegin GL_LINES; 2253 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2256 glEnd;
1950 }
1951}
1952 2257
2258 glLineWidth 3;
2259 glColor @{$self->{active_outline}};
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h} - 1;
2265 glEnd;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2276 glEnd;
2277 }
2278}
2279
2280#############################################################################
2281
1953package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1954 2283
1955our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1956 2285
1957use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1958 2287
1959sub invoke_key_down { 2288sub invoke_key_down {
1960 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1961 2290
1962 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1963 2292
1964 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
1967 2296
1968 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2299 $self->emit (activate => $txt);
1971 $self->update; 2300 $self->update;
1972 2301
1973 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1976 } 2305 }
1977 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2310 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2312 }
1984 2313
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2317
1989 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2328 1
2000} 2329}
2001 2330
2002############################################################################# 2331#############################################################################
2003 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
2004package CFClient::UI::Button; 2372package CFPlus::UI::ButtonBin;
2005 2373
2006our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Bin::;
2007 2375
2008use CFClient::OpenGL; 2376use CFPlus::OpenGL;
2009 2377
2010my @tex = 2378my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2380 qw(b1_button_inactive.png b1_button_active.png);
2013 2381
2014sub new { 2382sub new {
2015 my $class = shift; 2383 my $class = shift;
2016 2384
2017 $class->SUPER::new ( 2385 $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1, 2386 can_hover => 1,
2023 align => 0, 2387 align => 0,
2024 valign => 0, 2388 valign => 0,
2025 can_events => 1, 2389 can_events => 1,
2026 @_ 2390 @_
… …
2038} 2402}
2039 2403
2040sub _draw { 2404sub _draw {
2041 my ($self) = @_; 2405 my ($self) = @_;
2042 2406
2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2044
2045 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2048 2410
2411 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2413
2051 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2052 2415
2053 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2054} 2417}
2055 2418
2056############################################################################# 2419#############################################################################
2057 2420
2058package CFClient::UI::CheckBox; 2421package CFPlus::UI::Button;
2059 2422
2060our @ISA = CFClient::UI::DrawBG::; 2423our @ISA = CFPlus::UI::Label::;
2424
2425use CFPlus::OpenGL;
2061 2426
2062my @tex = 2427my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2429 qw(b1_button_inactive.png b1_button_active.png);
2430
2431sub new {
2432 my $class = shift;
2433
2434 $class->SUPER::new (
2435 padding_x => 4,
2436 padding_y => 4,
2437 fg => [1.0, 1.0, 1.0],
2438 active_fg => [0.8, 0.8, 0.8],
2439 can_hover => 1,
2440 align => 0,
2441 valign => 0,
2442 can_events => 1,
2443 @_
2444 )
2445}
2446
2447sub invoke_button_up {
2448 my ($self, $ev, $x, $y) = @_;
2449
2450 $self->emit ("activate")
2451 if $x >= 0 && $x < $self->{w}
2452 && $y >= 0 && $y < $self->{h};
2453
2454 1
2455}
2456
2457sub _draw {
2458 my ($self) = @_;
2459
2460 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2461
2462 glEnable GL_TEXTURE_2D;
2463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2464 glColor 0, 0, 0, 1;
2465
2466 my $tex = $tex[$GRAB == $self];
2467 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2468
2469 glDisable GL_TEXTURE_2D;
2470
2471 $self->SUPER::_draw;
2472}
2473
2474#############################################################################
2475
2476package CFPlus::UI::CheckBox;
2477
2478our @ISA = CFPlus::UI::DrawBG::;
2479
2480my @tex =
2481 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2482 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2483
2066use CFClient::OpenGL; 2484use CFPlus::OpenGL;
2067 2485
2068sub new { 2486sub new {
2069 my $class = shift; 2487 my $class = shift;
2070 2488
2071 $class->SUPER::new ( 2489 $class->SUPER::new (
… …
2128 glDisable GL_TEXTURE_2D; 2546 glDisable GL_TEXTURE_2D;
2129} 2547}
2130 2548
2131############################################################################# 2549#############################################################################
2132 2550
2133package CFClient::UI::Image; 2551package CFPlus::UI::Image;
2134 2552
2135our @ISA = CFClient::UI::Base::; 2553our @ISA = CFPlus::UI::Base::;
2136 2554
2137use CFClient::OpenGL; 2555use CFPlus::OpenGL;
2138 2556
2139our %texture_cache; 2557our %texture_cache;
2140 2558
2141sub new { 2559sub new {
2142 my $class = shift; 2560 my $class = shift;
2143 2561
2144 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2145 can_events => 0, 2563 can_events => 0,
2564 scale => 1,
2146 @_, 2565 @_,
2147 ); 2566 );
2148 2567
2149 $self->{path} || $self->{tex} 2568 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2569 or Carp::croak "'path' or 'tex' attributes required";
2151 2570
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2571 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2572 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154 2573
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2574 CFPlus::weaken $texture_cache{$self->{path}};
2156 2575
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2576 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2577
2159 $self 2578 $self
2160} 2579}
2161 2580
2162sub STORABLE_freeze { 2581sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2582 my ($self, $cloning) = @_;
2164 2583
2165 $self->{path} 2584 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2585 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167 2586
2168 $self->{path} 2587 $self->{path}
2169} 2588}
2170 2589
2171sub STORABLE_attach { 2590sub STORABLE_attach {
… …
2175} 2594}
2176 2595
2177sub size_request { 2596sub size_request {
2178 my ($self) = @_; 2597 my ($self) = @_;
2179 2598
2180 ($self->{tex}{w}, $self->{tex}{h}) 2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2181} 2600}
2182 2601
2183sub _draw { 2602sub _draw {
2184 my ($self) = @_; 2603 my ($self) = @_;
2185 2604
… …
2195 } 2614 }
2196 2615
2197 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199 2618
2200 $tex->draw_quad (0, 0, $w, $h); 2619 $tex->draw_quad_alpha (0, 0, $w, $h);
2201 2620
2202 glDisable GL_TEXTURE_2D; 2621 glDisable GL_TEXTURE_2D;
2203} 2622}
2204 2623
2205############################################################################# 2624#############################################################################
2206 2625
2207package CFClient::UI::ImageButton; 2626package CFPlus::UI::ImageButton;
2208 2627
2209our @ISA = CFClient::UI::Image::; 2628our @ISA = CFPlus::UI::Image::;
2210 2629
2211use CFClient::OpenGL; 2630use CFPlus::OpenGL;
2212 2631
2213my %textures; 2632my %textures;
2214 2633
2215sub new { 2634sub new {
2216 my $class = shift; 2635 my $class = shift;
… …
2238 1 2657 1
2239} 2658}
2240 2659
2241############################################################################# 2660#############################################################################
2242 2661
2243package CFClient::UI::VGauge; 2662package CFPlus::UI::VGauge;
2244 2663
2245our @ISA = CFClient::UI::Base::; 2664our @ISA = CFPlus::UI::Base::;
2246 2665
2247use List::Util qw(min max); 2666use List::Util qw(min max);
2248 2667
2249use CFClient::OpenGL; 2668use CFPlus::OpenGL;
2250 2669
2251my %tex = ( 2670my %tex = (
2252 food => [ 2671 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2672 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2673 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2674 ],
2256 grace => [ 2675 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2676 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2677 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2678 ],
2260 hp => [ 2679 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2681 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2682 ],
2264 mana => [ 2683 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2685 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2686 ],
2268); 2687);
2269 2688
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2689# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2374} 2793}
2375 2794
2376############################################################################# 2795#############################################################################
2377 2796
2378package CFClient::UI::Gauge; 2797package CFPlus::UI::Gauge;
2379 2798
2380our @ISA = CFClient::UI::VBox::; 2799our @ISA = CFPlus::UI::VBox::;
2381 2800
2382sub new { 2801sub new {
2383 my ($class, %arg) = @_; 2802 my ($class, %arg) = @_;
2384 2803
2385 my $self = $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2806 can_hover => 1,
2388 can_events => 1, 2807 can_events => 1,
2389 %arg, 2808 %arg,
2390 ); 2809 );
2391 2810
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2811 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2812 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2813 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2814
2396 $self 2815 $self
2397} 2816}
2398 2817
2399sub set_fontsize { 2818sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2839 $self->{value}->set_text ($val);
2421} 2840}
2422 2841
2423############################################################################# 2842#############################################################################
2424 2843
2425package CFClient::UI::Slider; 2844package CFPlus::UI::Slider;
2426 2845
2427use strict; 2846use strict;
2428 2847
2429use CFClient::OpenGL; 2848use CFPlus::OpenGL;
2430 2849
2431our @ISA = CFClient::UI::DrawBG::; 2850our @ISA = CFPlus::UI::DrawBG::;
2432 2851
2433my @tex = 2852my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2853 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2854 qw(s1_slider.png s1_slider_bg.png);
2436 2855
2437sub new { 2856sub new {
2438 my $class = shift; 2857 my $class = shift;
2439 2858
… …
2507 2926
2508 $self->SUPER::invoke_button_down ($ev, $x, $y); 2927 $self->SUPER::invoke_button_down ($ev, $x, $y);
2509 2928
2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2929 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2511 2930
2512 $self->invoke_mouse_motion ($ev, $x, $y) 2931 $self->invoke_mouse_motion ($ev, $x, $y);
2932
2933 1
2513} 2934}
2514 2935
2515sub invoke_mouse_motion { 2936sub invoke_mouse_motion {
2516 my ($self, $ev, $x, $y) = @_; 2937 my ($self, $ev, $x, $y) = @_;
2517 2938
… …
2533sub invoke_mouse_wheel { 2954sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 2955 my ($self, $ev) = @_;
2535 2956
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2957 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 2958
2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2960
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 2962
2540 ! ! $delta 2963 1
2541} 2964}
2542 2965
2543sub update { 2966sub update {
2544 my ($self) = @_; 2967 my ($self) = @_;
2545 2968
… …
2594 glDisable GL_TEXTURE_2D; 3017 glDisable GL_TEXTURE_2D;
2595} 3018}
2596 3019
2597############################################################################# 3020#############################################################################
2598 3021
2599package CFClient::UI::ValSlider; 3022package CFPlus::UI::ValSlider;
2600 3023
2601our @ISA = CFClient::UI::HBox::; 3024our @ISA = CFPlus::UI::HBox::;
2602 3025
2603sub new { 3026sub new {
2604 my ($class, %arg) = @_; 3027 my ($class, %arg) = @_;
2605 3028
2606 my $range = delete $arg{range}; 3029 my $range = delete $arg{range};
2607 3030
2608 my $self = $class->SUPER::new ( 3031 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3032 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3033 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 3034 to_value => sub { shift },
2612 from_value => sub { shift }, 3035 from_value => sub { shift },
2613 %arg, 3036 %arg,
2614 ); 3037 );
2615 3038
… …
2635sub set_range { shift->{slider}->set_range (@_) } 3058sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 3059sub set_value { shift->{slider}->set_value (@_) }
2637 3060
2638############################################################################# 3061#############################################################################
2639 3062
2640package CFClient::UI::TextScroller; 3063package CFPlus::UI::TextScroller;
2641 3064
2642our @ISA = CFClient::UI::HBox::; 3065our @ISA = CFPlus::UI::HBox::;
2643 3066
2644use CFClient::OpenGL; 3067use CFPlus::OpenGL;
2645 3068
2646sub new { 3069sub new {
2647 my $class = shift; 3070 my $class = shift;
2648 3071
2649 my $self = $class->SUPER::new ( 3072 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3074 can_events => 1,
2652 indent => 0, 3075 indent => 0,
2653 #font => default_font 3076 #font => default_font
2654 @_, 3077 @_,
2655 3078
2656 layout => (new CFClient::Layout), 3079 layout => (new CFPlus::Layout),
2657 par => [], 3080 par => [],
3081 max_par => 0,
2658 height => 0, 3082 height => 0,
2659 children => [ 3083 children => [
2660 (new CFClient::UI::Empty expand => 1), 3084 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3085 (new CFPlus::UI::Slider vertical => 1),
2662 ], 3086 ],
2663 ); 3087 );
2664 3088
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3089 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3090
… …
2675} 3099}
2676 3100
2677sub size_request { 3101sub size_request {
2678 my ($self) = @_; 3102 my ($self) = @_;
2679 3103
2680 my ($empty, $slider) = @{ $self->{children} }; 3104 my ($empty, $slider) = $self->visible_children;
2681 3105
2682 local $self->{children} = [$empty, $slider]; 3106 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request 3107 $self->SUPER::size_request
2684} 3108}
2685 3109
… …
2741sub set_offset { 3165sub set_offset {
2742 my ($self, $offset) = @_; 3166 my ($self, $offset) = @_;
2743 3167
2744 # todo: base offset on lines or so, not on pixels 3168 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3169 $self->{children}[1]->set_value ($offset);
3170}
3171
3172sub current_paragraph {
3173 my ($self) = @_;
3174
3175 $self->{top_paragraph} - 1
3176}
3177
3178sub scroll_to {
3179 my ($self, $para) = @_;
3180
3181 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3182
3183 $self->{scroll_to} = $para;
3184 $self->update;
2746} 3185}
2747 3186
2748sub clear { 3187sub clear {
2749 my ($self) = @_; 3188 my ($self) = @_;
2750 3189
… …
2772 3211
2773 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3212 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3213 push @{$self->{par}}, $para;
2775 } 3214 }
2776 3215
3216 if (my $max = $self->{max_par}) {
3217 shift @{$self->{par}} while @{$self->{par}} > $max;
3218 }
3219
2777 $self->{need_reflow}++; 3220 $self->{need_reflow}++;
2778 $self->update; 3221 $self->update;
2779} 3222}
2780 3223
2781sub scroll_to_bottom { 3224sub scroll_to_bottom {
2782 my ($self) = @_; 3225 my ($self) = @_;
2783 3226
2784 $self->{scroll_to_bottom} = 1; 3227 $self->{scroll_to} = $#{$self->{par}};
2785 $self->update; 3228 $self->update;
2786} 3229}
2787 3230
3231sub force_uptodate {
3232 my ($self) = @_;
3233
3234 if (delete $self->{need_reflow}) {
3235 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3236
3237 my $height = 0;
3238
3239 for my $para (@{$self->{par}}) {
3240 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3241 my $layout = $self->get_layout ($para);
3242 my ($w, $h) = $layout->size;
3243
3244 $para->{w} = $w + $para->{indent};
3245 $para->{h} = $h;
3246 $para->{wrapped} = $layout->has_wrapped;
3247 }
3248
3249 $para->{y} = $height;
3250 $height += $para->{h};
3251 }
3252
3253 $self->{height} = $height;
3254 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3255
3256 delete $self->{texture};
3257 }
3258
3259 if (my $paridx = delete $self->{scroll_to}) {
3260 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3261 }
3262}
3263
2788sub update { 3264sub update {
2789 my ($self) = @_; 3265 my ($self) = @_;
2790 3266
2791 $self->SUPER::update; 3267 $self->SUPER::update;
2792 3268
2793 return unless $self->{h} > 0; 3269 return unless $self->{h} > 0;
2794 3270
2795 delete $self->{texture}; 3271 delete $self->{texture};
2796 3272
2797 $ROOT->on_post_alloc ($self => sub { 3273 $ROOT->on_post_alloc ($self => sub {
3274 $self->force_uptodate;
3275
2798 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3276 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2799 3277
2800 if (delete $self->{need_reflow}) {
2801 my $height = 0;
2802
2803 for my $para (@{$self->{par}}) {
2804 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2805 my $layout = $self->get_layout ($para);
2806 my ($w, $h) = $layout->size;
2807
2808 $para->{w} = $w + $para->{indent};
2809 $para->{h} = $h;
2810 $para->{wrapped} = $layout->has_wrapped;
2811 }
2812
2813 $height += $para->{h};
2814 }
2815
2816 $self->{height} = $height;
2817
2818 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2819
2820 delete $self->{texture};
2821 }
2822
2823 if (delete $self->{scroll_to_bottom}) {
2824 $self->{children}[1]->set_value (1e10);
2825 }
2826
2827 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3278 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2828 glClearColor 0, 0, 0, 0; 3279 glClearColor 0, 0, 0, 0;
2829 glClear GL_COLOR_BUFFER_BIT; 3280 glClear GL_COLOR_BUFFER_BIT;
2830 3281
3282 package CFPlus::UI::Base;
3283 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3284 (0, 0, $self->{w}, $self->{h});
3285
3286 my $top = int $self->{children}[1]{range}[0];
3287
3288 my $paridx = 0;
3289 my $top_paragraph;
2831 my $top = int $self->{children}[1]{range}[0]; 3290 my $top = int $self->{children}[1]{range}[0];
2832 3291
2833 my $y0 = $top; 3292 my $y0 = $top;
2834 my $y1 = $top + $H; 3293 my $y1 = $top + $H;
2835 3294
2836 my $y = 0;
2837
2838 for my $para (@{$self->{par}}) { 3295 for my $para (@{$self->{par}}) {
2839 my $h = $para->{h}; 3296 my $h = $para->{h};
3297 my $y = $para->{y};
2840 3298
2841 if ($y0 < $y + $h && $y < $y1) { 3299 if ($y0 < $y + $h && $y < $y1) {
2842
2843 my $layout = $self->get_layout ($para); 3300 my $layout = $self->get_layout ($para);
2844 3301
2845 $layout->render ($para->{indent}, $y - $y0); 3302 $layout->render ($para->{indent}, $y - $y0);
2846 3303
2847 if (my @w = @{ $para->{widget} }) { 3304 if (my @w = @{ $para->{widget} }) {
… …
2856 $_->draw; 3313 $_->draw;
2857 } 3314 }
2858 } 3315 }
2859 } 3316 }
2860 3317
2861 $y += $h; 3318 $paridx++;
3319 $top_paragraph ||= $paridx if $y >= $top;
2862 } 3320 }
3321
3322 $self->{top_paragraph} = $top_paragraph;
2863 }; 3323 };
2864 }); 3324 });
2865} 3325}
2866 3326
2867sub reconfigure { 3327sub reconfigure {
… …
2885 $self->{children}[1]->draw; 3345 $self->{children}[1]->draw;
2886} 3346}
2887 3347
2888############################################################################# 3348#############################################################################
2889 3349
2890package CFClient::UI::Animator; 3350package CFPlus::UI::Animator;
2891 3351
2892use CFClient::OpenGL; 3352use CFPlus::OpenGL;
2893 3353
2894our @ISA = CFClient::UI::Bin::; 3354our @ISA = CFPlus::UI::Bin::;
2895 3355
2896sub moveto { 3356sub moveto {
2897 my ($self, $x, $y) = @_; 3357 my ($self, $x, $y) = @_;
2898 3358
2899 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3359 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2927 glPopMatrix; 3387 glPopMatrix;
2928} 3388}
2929 3389
2930############################################################################# 3390#############################################################################
2931 3391
2932package CFClient::UI::Flopper; 3392package CFPlus::UI::Flopper;
2933 3393
2934our @ISA = CFClient::UI::Button::; 3394our @ISA = CFPlus::UI::Button::;
2935 3395
2936sub new { 3396sub new {
2937 my $class = shift; 3397 my $class = shift;
2938 3398
2939 my $self = $class->SUPER::new ( 3399 my $self = $class->SUPER::new (
… …
2951 $self->{other}->toggle_visibility; 3411 $self->{other}->toggle_visibility;
2952} 3412}
2953 3413
2954############################################################################# 3414#############################################################################
2955 3415
2956package CFClient::UI::Tooltip; 3416package CFPlus::UI::Tooltip;
2957 3417
2958our @ISA = CFClient::UI::Bin::; 3418our @ISA = CFPlus::UI::Bin::;
2959 3419
2960use CFClient::OpenGL; 3420use CFPlus::OpenGL;
2961 3421
2962sub new { 3422sub new {
2963 my $class = shift; 3423 my $class = shift;
2964 3424
2965 $class->SUPER::new ( 3425 $class->SUPER::new (
… …
2968 ) 3428 )
2969} 3429}
2970 3430
2971sub set_tooltip_from { 3431sub set_tooltip_from {
2972 my ($self, $widget) = @_; 3432 my ($self, $widget) = @_;
3433
3434 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3435 if $widget->{tooltip} =~ /^#(.*)$/;
2973 3436
2974 my $tooltip = $widget->{tooltip}; 3437 my $tooltip = $widget->{tooltip};
2975 3438
2976 if ($ENV{CFPLUS_DEBUG} & 2) { 3439 if ($ENV{CFPLUS_DEBUG} & 2) {
2977 $tooltip .= "\n\n" . (ref $widget) . "\n" 3440 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2981 } 3444 }
2982 3445
2983 $tooltip =~ s/^\n+//; 3446 $tooltip =~ s/^\n+//;
2984 $tooltip =~ s/\n+$//; 3447 $tooltip =~ s/\n+$//;
2985 3448
2986 $self->add (new CFClient::UI::Label 3449 $self->add (new CFPlus::UI::Label
2987 markup => $tooltip, 3450 markup => $tooltip,
2988 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3451 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2989 fontsize => 0.8, 3452 fontsize => 0.8,
2990 fg => [0, 0, 0, 1], 3453 style => 1, # FLAG_INVERSE
2991 ellipsise => 0, 3454 ellipsise => 0,
2992 font => ($widget->{tooltip_font} || $::FONT_PROP), 3455 font => ($widget->{tooltip_font} || $::FONT_PROP),
2993 ); 3456 );
2994} 3457}
2995 3458
… …
3035 glTranslate 0.375, 0.375; 3498 glTranslate 0.375, 0.375;
3036 3499
3037 my ($w, $h) = @$self{qw(w h)}; 3500 my ($w, $h) = @$self{qw(w h)};
3038 3501
3039 glColor 1, 0.8, 0.4; 3502 glColor 1, 0.8, 0.4;
3040 glBegin GL_QUADS; 3503 glRect 0, 0, $w, $h;
3041 glVertex 0 , 0;
3042 glVertex 0 , $h;
3043 glVertex $w, $h;
3044 glVertex $w, 0;
3045 glEnd;
3046 3504
3047 glColor 0, 0, 0; 3505 glColor 0, 0, 0;
3048 glBegin GL_LINE_LOOP; 3506 glBegin GL_LINE_LOOP;
3049 glVertex 0 , 0; 3507 glVertex 0 , 0;
3050 glVertex 0 , $h; 3508 glVertex 0 , $h;
… …
3057 $self->SUPER::_draw; 3515 $self->SUPER::_draw;
3058} 3516}
3059 3517
3060############################################################################# 3518#############################################################################
3061 3519
3062package CFClient::UI::Face; 3520package CFPlus::UI::Face;
3063 3521
3064our @ISA = CFClient::UI::DrawBG::; 3522our @ISA = CFPlus::UI::DrawBG::;
3065 3523
3066use CFClient::OpenGL; 3524use CFPlus::OpenGL;
3067 3525
3068sub new { 3526sub new {
3069 my $class = shift; 3527 my $class = shift;
3070 3528
3071 my $self = $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
3530 size_w => 32,
3531 size_h => 8,
3072 aspect => 1, 3532 aspect => 1,
3073 can_events => 0, 3533 can_events => 0,
3074 @_, 3534 @_,
3075 ); 3535 );
3076 3536
3077 if ($self->{anim} && $self->{animspeed}) { 3537 if ($self->{anim} && $self->{animspeed}) {
3078 Scalar::Util::weaken (my $widget = $self); 3538 CFPlus::weaken (my $widget = $self);
3079 3539
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3080 $self->{timer} = Event->timer ( 3542 $self->{timer} = Event->timer (
3081 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3082 hard => 1, 3543 parked => 1,
3083 interval => $self->{animspeed},
3084 cb => sub { 3544 cb => sub {
3545 return unless $::CONN && $widget;
3546
3085 ++$widget->{frame}; 3547 ++$widget->{frame};
3548 $widget->update_face;
3086 $widget->update; 3549 $widget->update;
3550
3551 $widget->update_timer;
3087 }, 3552 },
3088 ); 3553 );
3554
3555 $self->update_face;
3556 $self->update_timer;
3089 } 3557 }
3090 3558
3091 $self 3559 $self
3092} 3560}
3093 3561
3562sub update_timer {
3563 my ($self) = @_;
3564
3565 return unless $self->{timer};
3566
3567 if ($self->{visible}) {
3568 $self->{timer}->at (
3569 $self->{anim_start}
3570 + $self->{animspeed}
3571 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572 );
3573 $self->{timer}->start;
3574 } else {
3575 $self->{timer}->stop;
3576 }
3577}
3578
3579sub update_face {
3580 my ($self) = @_;
3581
3582 return unless $::CONN;
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3589 }
3590 }
3591}
3592
3094sub size_request { 3593sub size_request {
3095 (32, 8) 3594 my ($self) = @_;
3595
3596 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex;
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3603 $self->realloc;
3604 });
3605 }
3606 }
3607 }
3608
3609 ($self->{size_w} || 8, $self->{size_h} || 8)
3096} 3610}
3097 3611
3098sub update { 3612sub update {
3099 my ($self) = @_; 3613 my ($self) = @_;
3100 3614
3101 return unless $self->{visible}; 3615 return unless $self->{visible};
3102 3616
3103 $self->SUPER::update; 3617 $self->SUPER::update;
3104} 3618}
3105 3619
3620sub invoke_visibility_change {
3621 my ($self) = @_;
3622
3623 $self->update_timer;
3624
3625 0
3626}
3627
3106sub _draw { 3628sub _draw {
3107 my ($self) = @_; 3629 my ($self) = @_;
3108 3630
3109 return unless $::CONN;
3110
3111 $self->SUPER::_draw; 3631 $self->SUPER::_draw;
3112 3632
3113 my $face; 3633 if (my $tex = $self->{tex}) {
3114
3115 if ($self->{frame}) {
3116 my $anim = $::CONN->{anim}[$self->{anim}];
3117
3118 $face = $anim->[ $self->{frame} % @$anim ]
3119 if $anim && @$anim;
3120 }
3121
3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3123
3124 if ($tex) {
3125 glEnable GL_TEXTURE_2D; 3634 glEnable GL_TEXTURE_2D;
3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3127 glColor 0, 0, 0, 1; 3636 glColor 0, 0, 0, 1;
3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3129 glDisable GL_TEXTURE_2D; 3638 glDisable GL_TEXTURE_2D;
… …
3131} 3640}
3132 3641
3133sub destroy { 3642sub destroy {
3134 my ($self) = @_; 3643 my ($self) = @_;
3135 3644
3136 $self->{timer}->cancel 3645 (delete $self->{timer})->cancel
3137 if $self->{timer}; 3646 if $self->{timer};
3138 3647
3139 $self->SUPER::destroy; 3648 $self->SUPER::destroy;
3140} 3649}
3141 3650
3142############################################################################# 3651#############################################################################
3143 3652
3144package CFClient::UI::Buttonbar; 3653package CFPlus::UI::Buttonbar;
3145 3654
3146our @ISA = CFClient::UI::HBox::; 3655our @ISA = CFPlus::UI::HBox::;
3147 3656
3148# TODO: should actualyl wrap buttons and other goodies. 3657# TODO: should actually wrap buttons and other goodies.
3149 3658
3150############################################################################# 3659#############################################################################
3151 3660
3152package CFClient::UI::Menu; 3661package CFPlus::UI::Menu;
3153 3662
3154our @ISA = CFClient::UI::FancyFrame::; 3663our @ISA = CFPlus::UI::Toplevel::;
3155 3664
3156use CFClient::OpenGL; 3665use CFPlus::OpenGL;
3157 3666
3158sub new { 3667sub new {
3159 my $class = shift; 3668 my $class = shift;
3160 3669
3161 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
3162 items => [], 3671 items => [],
3163 z => 100, 3672 z => 100,
3164 @_, 3673 @_,
3165 ); 3674 );
3166 3675
3167 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3676 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3168 3677
3169 for my $item (@{ $self->{items} }) { 3678 for my $item (@{ $self->{items} }) {
3170 my ($widget, $cb, $tooltip) = @$item; 3679 my ($widget, $cb, $tooltip) = @$item;
3171 3680
3172 # handle various types of items, only text for now 3681 # handle various types of items, only text for now
3173 if (!ref $widget) { 3682 if (!ref $widget) {
3174 if ($widget =~ /\t/) { 3683 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2; 3684 my ($left, $right) = split /\t/, $widget, 2;
3176 3685
3177 $widget = new CFClient::UI::HBox 3686 $widget = new CFPlus::UI::HBox
3178 can_hover => 1, 3687 can_hover => 1,
3179 can_events => 1, 3688 can_events => 1,
3180 tooltip => $tooltip, 3689 tooltip => $tooltip,
3181 children => [ 3690 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1), 3691 (new CFPlus::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1), 3692 (new CFPlus::UI::Label markup => $right, align => +1),
3184 ], 3693 ],
3185 ; 3694 ;
3186 3695
3187 } else { 3696 } else {
3188 $widget = new CFClient::UI::Label 3697 $widget = new CFPlus::UI::Label
3189 can_hover => 1, 3698 can_hover => 1,
3190 can_events => 1, 3699 can_events => 1,
3191 markup => $widget, 3700 markup => $widget,
3192 tooltip => $tooltip; 3701 tooltip => $tooltip;
3193 } 3702 }
… …
3241 1 3750 1
3242} 3751}
3243 3752
3244############################################################################# 3753#############################################################################
3245 3754
3246package CFClient::UI::Multiplexer; 3755package CFPlus::UI::Multiplexer;
3247 3756
3248our @ISA = CFClient::UI::Container::; 3757our @ISA = CFPlus::UI::Container::;
3249 3758
3250sub new { 3759sub new {
3251 my $class = shift; 3760 my $class = shift;
3252 3761
3253 my $self = $class->SUPER::new ( 3762 my $self = $class->SUPER::new (
… …
3314 $self->{current}->draw; 3823 $self->{current}->draw;
3315} 3824}
3316 3825
3317############################################################################# 3826#############################################################################
3318 3827
3319package CFClient::UI::Notebook; 3828package CFPlus::UI::Notebook;
3320 3829
3321our @ISA = CFClient::UI::VBox::; 3830our @ISA = CFPlus::UI::VBox::;
3322 3831
3323sub new { 3832sub new {
3324 my $class = shift; 3833 my $class = shift;
3325 3834
3326 my $self = $class->SUPER::new ( 3835 my $self = $class->SUPER::new (
3327 buttonbar => (new CFClient::UI::Buttonbar), 3836 buttonbar => (new CFPlus::UI::Buttonbar),
3328 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3329 # filter => # will be put between multiplexer and $self 3838 # filter => # will be put between multiplexer and $self
3330 @_, 3839 @_,
3331 ); 3840 );
3332 3841
3333 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3334 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3843 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3335 3844
3845 {
3846 Scalar::Util::weaken (my $wself = $self);
3847
3848 $self->{multiplexer}->connect (c_add => sub {
3849 my ($mplex, $widgets) = @_;
3850
3851 for my $child (@$widgets) {
3852 Scalar::Util::weaken $child;
3853 $child->{c_tab_} ||= do {
3854 my $tab =
3855 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3856 ? $child->{c_tab}
3857 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858
3859 $tab->connect (activate => sub {
3860 $wself->set_current_page ($child);
3861 });
3862
3863 $tab
3864 };
3865
3866 $self->{buttonbar}->add ($child->{c_tab_});
3867 }
3868 });
3869
3870 $self->{multiplexer}->connect (c_remove => sub {
3871 my ($mplex, $widgets) = @_;
3872
3873 for my $child (@$widgets) {
3874 $wself->{buttonbar}->remove ($child->{c_tab_});
3875 }
3876 });
3877 }
3878
3336 $self 3879 $self
3337} 3880}
3338 3881
3339sub add { 3882sub add {
3883 my ($self, @widgets) = @_;
3884
3885 $self->{multiplexer}->add (@widgets)
3886}
3887
3888sub remove {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->remove (@widgets)
3892}
3893
3894sub pages {
3895 my ($self) = @_;
3896 $self->{multiplexer}->children
3897}
3898
3899sub add_tab {
3340 my ($self, $title, $widget, $tooltip) = @_; 3900 my ($self, $title, $widget, $tooltip) = @_;
3341 3901
3342 Scalar::Util::weaken $self; 3902 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title;
3343 3904
3344 $self->{buttonbar}->add (new CFClient::UI::Button
3345 markup => $title,
3346 tooltip => $tooltip,
3347 on_activate => sub { $self->set_current_page ($widget) },
3348 );
3349
3350 $self->{multiplexer}->add ($widget); 3905 $self->add ($widget);
3351} 3906}
3352 3907
3353sub get_current_page { 3908sub get_current_page {
3354 my ($self) = @_; 3909 my ($self) = @_;
3355 3910
… …
3363 $self->emit (page_changed => $self->{multiplexer}{current}); 3918 $self->emit (page_changed => $self->{multiplexer}{current});
3364} 3919}
3365 3920
3366############################################################################# 3921#############################################################################
3367 3922
3368package CFClient::UI::Selector; 3923package CFPlus::UI::Selector;
3369 3924
3370use utf8; 3925use utf8;
3371 3926
3372our @ISA = CFClient::UI::Button::; 3927our @ISA = CFPlus::UI::Button::;
3373 3928
3374sub new { 3929sub new {
3375 my $class = shift; 3930 my $class = shift;
3376 3931
3377 my $self = $class->SUPER::new ( 3932 my $self = $class->SUPER::new (
… …
3394 my ($value, $title, $tooltip) = @$_; 3949 my ($value, $title, $tooltip) = @$_;
3395 3950
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3951 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 } 3952 }
3398 3953
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3954 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400} 3955}
3401 3956
3402sub _set_value { 3957sub _set_value {
3403 my ($self, $value) = @_; 3958 my ($self, $value) = @_;
3404 3959
… …
3419 $self->emit (changed => $value); 3974 $self->emit (changed => $value);
3420} 3975}
3421 3976
3422############################################################################# 3977#############################################################################
3423 3978
3424package CFClient::UI::Statusbox; 3979package CFPlus::UI::Statusbox;
3425 3980
3426our @ISA = CFClient::UI::VBox::; 3981our @ISA = CFPlus::UI::VBox::;
3427 3982
3428sub new { 3983sub new {
3429 my $class = shift; 3984 my $class = shift;
3430 3985
3431 my $self = $class->SUPER::new ( 3986 my $self = $class->SUPER::new (
3432 fontsize => 0.8, 3987 fontsize => 0.8,
3433 @_, 3988 @_,
3434 ); 3989 );
3435 3990
3436 Scalar::Util::weaken (my $this = $self); 3991 CFPlus::weaken (my $this = $self);
3437 3992
3438 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3993 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439 3994
3440 $self 3995 $self
3441} 3996}
… …
3443sub reorder { 3998sub reorder {
3444 my ($self) = @_; 3999 my ($self) = @_;
3445 my $NOW = Time::HiRes::time; 4000 my $NOW = Time::HiRes::time;
3446 4001
3447 # freeze display when hovering over any label 4002 # freeze display when hovering over any label
3448 return if $CFClient::UI::TOOLTIP->{owner} 4003 return if $CFPlus::UI::TOOLTIP->{owner}
3449 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4004 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3450 values %{ $self->{item} }; 4005 values %{ $self->{item} };
3451 4006
3452 while (my ($k, $v) = each %{ $self->{item} }) { 4007 while (my ($k, $v) = each %{ $self->{item} }) {
3453 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4008 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3454 } 4009 }
… …
3475 for ($short) { 4030 for ($short) {
3476 s/^\s+//; 4031 s/^\s+//;
3477 s/\s+/ /g; 4032 s/\s+/ /g;
3478 } 4033 }
3479 4034
3480 new CFClient::UI::Label 4035 new CFPlus::UI::Label
3481 markup => $short, 4036 markup => $short,
3482 tooltip => $item->{tooltip}, 4037 tooltip => $item->{tooltip},
3483 tooltip_font => $::FONT_PROP, 4038 tooltip_font => $::FONT_PROP,
3484 tooltip_width => 0.67, 4039 tooltip_width => 0.67,
3485 fontsize => $item->{fontsize} || $self->{fontsize}, 4040 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3564 $self->SUPER::destroy; 4119 $self->SUPER::destroy;
3565} 4120}
3566 4121
3567############################################################################# 4122#############################################################################
3568 4123
3569package CFClient::UI::Inventory;
3570
3571our @ISA = CFClient::UI::Table::;
3572
3573sub new {
3574 my $class = shift;
3575
3576 my $self = $class->SUPER::new (
3577 col_expand => [0, 1, 0],
3578 items => [],
3579 @_,
3580 );
3581
3582 $self->set_sort_order (undef);
3583
3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3620}
3621
3622sub set_items {
3623 my ($self, $items) = @_;
3624
3625 $self->{items} = [$items ? values %$items : ()];
3626 $self->update_items;
3627}
3628
3629#############################################################################
3630
3631package CFClient::UI::SpellList;
3632
3633our @ISA = CFClient::UI::Table::;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 binding => [],
3640 commands => [],
3641 @_,
3642 )
3643}
3644
3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658sub rebuild_spell_list {
3659 my ($self) = @_;
3660
3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3662 $self->clear;
3663
3664 return unless $::CONN;
3665
3666 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672 my $row = 0;
3673
3674 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675 my $spell = $self->{spell}{$_};
3676
3677 $row++;
3678
3679 my $spell_cb = sub {
3680 my ($widget, $ev) = @_;
3681
3682 if ($ev->{button} == 1) {
3683 $::CONN->user_send ("cast $spell->{name}");
3684 } elsif ($ev->{button} == 2) {
3685 $::CONN->user_send ("invoke $spell->{name}");
3686 } elsif ($ev->{button} == 3) {
3687 (new CFClient::UI::Menu
3688 items => [
3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691 ],
3692 )->popup ($ev);
3693 } else {
3694 return 0;
3695 }
3696
3697 1
3698 };
3699
3700 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702 #TODO: add path info to tooltip
3703 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705 $self->add (0, $row, new CFClient::UI::Face
3706 face => $spell->{face},
3707 can_hover => 1,
3708 can_events => 1,
3709 tooltip => $tooltip,
3710 on_button_down => $spell_cb,
3711 );
3712
3713 $self->add (1, $row, new CFClient::UI::Label
3714 expand => 1,
3715 text => $spell->{name},
3716 can_hover => 1,
3717 can_events => 1,
3718 tooltip => $tooltip,
3719 on_button_down => $spell_cb,
3720 );
3721
3722 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726 }
3727 });
3728}
3729
3730sub add_spell {
3731 my ($self, $spell) = @_;
3732
3733 $self->{spell}->{$spell->{name}} = $spell;
3734 $self->rebuild_spell_list;
3735}
3736
3737sub remove_spell {
3738 my ($self, $spell) = @_;
3739
3740 delete $self->{spell}->{$spell->{name}};
3741 $self->rebuild_spell_list;
3742}
3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3751#############################################################################
3752
3753package CFClient::UI::Root; 4124package CFPlus::UI::Root;
3754 4125
3755our @ISA = CFClient::UI::Container::; 4126our @ISA = CFPlus::UI::Container::;
3756 4127
3757use List::Util qw(min max); 4128use List::Util qw(min max);
3758 4129
3759use CFClient::OpenGL; 4130use CFPlus::OpenGL;
3760 4131
3761sub new { 4132sub new {
3762 my $class = shift; 4133 my $class = shift;
3763 4134
3764 my $self = $class->SUPER::new ( 4135 my $self = $class->SUPER::new (
3765 visible => 1, 4136 visible => 1,
3766 @_, 4137 @_,
3767 ); 4138 );
3768 4139
3769 Scalar::Util::weaken ($self->{root} = $self); 4140 CFPlus::weaken ($self->{root} = $self);
3770 4141
3771 $self 4142 $self
3772} 4143}
3773 4144
3774sub size_request { 4145sub size_request {
… …
3869 while ($self->{refresh_hook}) { 4240 while ($self->{refresh_hook}) {
3870 $_->() 4241 $_->()
3871 for values %{delete $self->{refresh_hook}}; 4242 for values %{delete $self->{refresh_hook}};
3872 } 4243 }
3873 4244
3874 if ($self->{realloc}) { 4245 while ($self->{realloc}) {
3875 my %queue; 4246 my %queue;
3876 my @queue; 4247 my @queue;
3877 my $widget; 4248 my $widget;
3878 4249
3879 outer: 4250 outer:
… …
3926 } 4297 }
3927 } 4298 }
3928 4299
3929 delete $self->{realloc}{$widget+0}; 4300 delete $self->{realloc}{$widget+0};
3930 } 4301 }
3931 }
3932 4302
3933 while (my $size_alloc = delete $self->{size_alloc}) { 4303 while (my $size_alloc = delete $self->{size_alloc}) {
3934 my @queue = sort { $b->{visible} <=> $a->{visible} } 4304 my @queue = sort { $a->{visible} <=> $b->{visible} }
3935 values %$size_alloc; 4305 values %$size_alloc;
3936 4306
3937 while () { 4307 while () {
3938 my $widget = pop @queue || last; 4308 my $widget = pop @queue || last;
3939 4309
3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4310 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3941 4311
3942 $w = 0 if $w < 0;
3943 $h = 0 if $h < 0;
3944
3945 $w = max $widget->{min_w}, $w; 4312 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h; 4313 $h = max $widget->{min_h}, $h;
3947 4314
3948# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4315# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3949# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4316# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3950 4317
3951 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4318 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3952 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4319 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3953 4320
3954 $w = int $w + 0.5; 4321 $w = int $w + 0.5;
3955 $h = int $h + 0.5; 4322 $h = int $h + 0.5;
3956 4323
3957 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4324 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3958 $widget->{old_w} = $widget->{w}; 4325 $widget->{old_w} = $widget->{w};
3959 $widget->{old_h} = $widget->{h}; 4326 $widget->{old_h} = $widget->{h};
3960 4327
3961 $widget->{w} = $w; 4328 $widget->{w} = $w;
3962 $widget->{h} = $h; 4329 $widget->{h} = $h;
3963 4330
3964 $widget->emit (size_allocate => $w, $h); 4331 $widget->emit (size_allocate => $w, $h);
4332 }
3965 } 4333 }
3966 } 4334 }
3967 } 4335 }
3968 4336
3969 while ($self->{post_alloc_hook}) { 4337 while ($self->{post_alloc_hook}) {
3970 $_->() 4338 $_->()
3971 for values %{delete $self->{post_alloc_hook}}; 4339 for values %{delete $self->{post_alloc_hook}};
3972 } 4340 }
3973
3974 4341
3975 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4342 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3976 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4343 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3977 glClear GL_COLOR_BUFFER_BIT; 4344 glClear GL_COLOR_BUFFER_BIT;
3978 4345
… …
3981 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4348 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3982 glMatrixMode GL_MODELVIEW; 4349 glMatrixMode GL_MODELVIEW;
3983 glLoadIdentity; 4350 glLoadIdentity;
3984 4351
3985 { 4352 {
3986 package CFClient::UI::Base; 4353 package CFPlus::UI::Base;
3987 4354
3988 ($draw_x, $draw_y, $draw_w, $draw_h) = 4355 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3989 (0, 0, $self->{w}, $self->{h}); 4356 (0, 0, $self->{w}, $self->{h});
3990 }
3991 4357
3992 $self->_draw; 4358 $self->_draw;
4359 }
3993} 4360}
3994 4361
3995############################################################################# 4362#############################################################################
3996 4363
3997package CFClient::UI; 4364package CFPlus::UI;
3998 4365
3999$ROOT = new CFClient::UI::Root; 4366$ROOT = new CFPlus::UI::Root;
4000$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4367$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4001 4368
40021 43691
4003 4370

Diff Legend

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