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.336 by root, Sun Jul 23 16:46:06 2006 UTC vs.
Revision 1.422 by root, Thu Aug 2 14:35:21 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 c_col => 0,
1033 c_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 c_col => 1,
1044 c_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 c_col => 0,
1066 c_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->{c_rowspan} ||= 1;
1604 $child->{c_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->{c_row} = $row;
1378 $self->{force_size_alloc} = 1; 1619 $child->{c_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->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
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->{c_rowspan} <=> $b->{c_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(c_row req_h c_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(c_row c_col req_w req_h c_rowspan c_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}) {
… …
1647sub realloc { 1921sub realloc {
1648 my ($self) = @_; 1922 my ($self) = @_;
1649 1923
1650 delete $self->{ox}; 1924 delete $self->{ox};
1651 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1926}
1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1652} 1932}
1653 1933
1654sub set_text { 1934sub set_text {
1655 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1656 1936
… …
1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1768 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
1769 }; 2049 };
1770 2050
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2051# unless ($self->{list}) {
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2052# $self->{list} = CFPlus::OpenGL::glGenList;
2053# CFPlus::OpenGL::glNewList $self->{list};
2054# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2055# CFPlus::OpenGL::glEndList;
2056# }
2057#
2058# CFPlus::OpenGL::glCallList $self->{list};
1773 2059
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2061}
2062
2063#sub destroy {
2064# my ($self) = @_;
2065#
2066# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2067#
2068# $self->SUPER::destroy;
2069#}
1776 2070
1777############################################################################# 2071#############################################################################
1778 2072
1779package CFClient::UI::EntryBase; 2073package CFPlus::UI::EntryBase;
1780 2074
1781our @ISA = CFClient::UI::Label::; 2075our @ISA = CFPlus::UI::Label::;
1782 2076
1783use CFClient::OpenGL; 2077use CFPlus::OpenGL;
1784 2078
1785sub new { 2079sub new {
1786 my $class = shift; 2080 my $class = shift;
1787 2081
1788 $class->SUPER::new ( 2082 $class->SUPER::new (
1789 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
1790 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
1791 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
1792 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
1793 can_hover => 1, 2089 can_hover => 1,
1794 can_focus => 1, 2090 can_focus => 1,
1795 valign => 0, 2091 valign => 0,
1796 can_events => 1, 2092 can_events => 1,
2093 ellipsise => 0,
1797 #text => ... 2094 #text => ...
1798 #hidden => "*", 2095 #hidden => "*",
1799 @_ 2096 @_
1800 ) 2097 )
1801} 2098}
… …
1846 my $sym = $ev->{sym}; 2143 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2144 my $uni = $ev->{unicode};
1848 2145
1849 my $text = $self->get_text; 2146 my $text = $self->get_text;
1850 2147
2148 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2149
1851 if ($uni == 8) { 2150 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2151 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2152 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2153 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2154 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2155 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2156 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2157 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2158 } elsif ($sym == CFPlus::SDLK_HOME) {
2159 # what a hack
2160 $self->{cursor} =
2161 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2162 ? length $1
2163 : 0;
2164 } elsif ($sym == CFPlus::SDLK_END) {
2165 # uh, again
2166 $self->{cursor} =
2167 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2168 ? $self->{cursor} + length $1
2169 : length $self->{text};
2170 } elsif ($uni == 21) { # ctrl-u
2171 $text = "";
1860 $self->{cursor} = 0; 2172 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2173 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2174 $self->emit ('escape');
1865 } elsif ($uni) { 2175 } elsif ($uni == 0x0d) {
2176 substr $text, $self->{cursor}++, 0, "\012";
2177 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2178 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2179 } else {
1868 return 0; 2180 return 0;
1869 } 2181 }
1870 2182
1871 $self->_set_text ($text); 2183 $self->_set_text ($text);
1872 2184
1873 $self->realloc; 2185 $self->realloc;
2186 $self->update;
1874 2187
1875 1 2188 1
1876} 2189}
1877 2190
1878sub invoke_focus_in { 2191sub invoke_focus_in {
… …
1937 2250
1938 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
1939 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
1940 utf8::encode $text; 2253 utf8::encode $text;
1941 2254
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1943 } 2256 }
1944 2257
1945 glColor @{$self->{fg}}; 2258 glColor_premultiply @{$self->{active_fg}};
1946 glBegin GL_LINES; 2259 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 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}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2262 glEnd;
1950 }
1951}
1952 2263
2264 glLineWidth 3;
2265 glColor @{$self->{active_outline}};
2266 glBegin GL_LINE_LOOP;
2267 glVertex 0, 0;
2268 glVertex $self->{w} - 1, 0;
2269 glVertex $self->{w} - 1, $self->{h} - 1;
2270 glVertex 0, $self->{h} - 1;
2271 glEnd;
2272 glLineWidth 1;
2273
2274 } else {
2275 glColor @{$self->{outline}};
2276 glTranslate .375, .375;
2277 glBegin GL_LINE_STRIP;
2278 glVertex 0, $self->{h} * .5;
2279 glVertex 0, $self->{h} - 3;
2280 glVertex $self->{w} - 1, $self->{h} - 3;
2281 glVertex $self->{w} - 1, $self->{h} * .5;
2282 glEnd;
2283 }
2284}
2285
2286#############################################################################
2287
1953package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1954 2289
1955our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1956 2291
1957use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1958 2293
1959sub invoke_key_down { 2294sub invoke_key_down {
1960 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1961 2296
1962 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1963 2298
1964 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
1967 2302
1968 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2305 $self->emit (activate => $txt);
1971 $self->update; 2306 $self->update;
1972 2307
1973 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1976 } 2311 }
1977 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2316 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2318 }
1984 2319
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2323
1989 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2334 1
2000} 2335}
2001 2336
2002############################################################################# 2337#############################################################################
2003 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
2004package CFClient::UI::Button; 2378package CFPlus::UI::ButtonBin;
2005 2379
2006our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Bin::;
2007 2381
2008use CFClient::OpenGL; 2382use CFPlus::OpenGL;
2009 2383
2010my @tex = 2384my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2386 qw(b1_button_inactive.png b1_button_active.png);
2013 2387
2014sub new { 2388sub new {
2015 my $class = shift; 2389 my $class = shift;
2016 2390
2017 $class->SUPER::new ( 2391 $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, 2392 can_hover => 1,
2023 align => 0, 2393 align => 0,
2024 valign => 0, 2394 valign => 0,
2025 can_events => 1, 2395 can_events => 1,
2026 @_ 2396 @_
… …
2038} 2408}
2039 2409
2040sub _draw { 2410sub _draw {
2041 my ($self) = @_; 2411 my ($self) = @_;
2042 2412
2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2044
2045 glEnable GL_TEXTURE_2D; 2413 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2415 glColor 0, 0, 0, 1;
2048 2416
2417 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2419
2051 glDisable GL_TEXTURE_2D; 2420 glDisable GL_TEXTURE_2D;
2052 2421
2053 $self->SUPER::_draw; 2422 $self->SUPER::_draw;
2054} 2423}
2055 2424
2056############################################################################# 2425#############################################################################
2057 2426
2058package CFClient::UI::CheckBox; 2427package CFPlus::UI::Button;
2059 2428
2060our @ISA = CFClient::UI::DrawBG::; 2429our @ISA = CFPlus::UI::Label::;
2430
2431use CFPlus::OpenGL;
2061 2432
2062my @tex = 2433my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2434 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2435 qw(b1_button_inactive.png b1_button_active.png);
2436
2437sub new {
2438 my $class = shift;
2439
2440 $class->SUPER::new (
2441 padding_x => 4,
2442 padding_y => 4,
2443 fg => [1.0, 1.0, 1.0],
2444 active_fg => [0.8, 0.8, 0.8],
2445 can_hover => 1,
2446 align => 0,
2447 valign => 0,
2448 can_events => 1,
2449 @_
2450 )
2451}
2452
2453sub invoke_button_up {
2454 my ($self, $ev, $x, $y) = @_;
2455
2456 $self->emit ("activate")
2457 if $x >= 0 && $x < $self->{w}
2458 && $y >= 0 && $y < $self->{h};
2459
2460 1
2461}
2462
2463sub _draw {
2464 my ($self) = @_;
2465
2466 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2467
2468 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 0, 0, 0, 1;
2471
2472 my $tex = $tex[$GRAB == $self];
2473 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2474
2475 glDisable GL_TEXTURE_2D;
2476
2477 $self->SUPER::_draw;
2478}
2479
2480#############################################################################
2481
2482package CFPlus::UI::CheckBox;
2483
2484our @ISA = CFPlus::UI::DrawBG::;
2485
2486my @tex =
2487 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2488 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2489
2066use CFClient::OpenGL; 2490use CFPlus::OpenGL;
2067 2491
2068sub new { 2492sub new {
2069 my $class = shift; 2493 my $class = shift;
2070 2494
2071 $class->SUPER::new ( 2495 $class->SUPER::new (
… …
2128 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2129} 2553}
2130 2554
2131############################################################################# 2555#############################################################################
2132 2556
2133package CFClient::UI::Image; 2557package CFPlus::UI::Image;
2134 2558
2135our @ISA = CFClient::UI::Base::; 2559our @ISA = CFPlus::UI::Base::;
2136 2560
2137use CFClient::OpenGL; 2561use CFPlus::OpenGL;
2138 2562
2139our %texture_cache; 2563our %texture_cache;
2140 2564
2141sub new { 2565sub new {
2142 my $class = shift; 2566 my $class = shift;
2143 2567
2144 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2145 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2146 @_, 2571 @_,
2147 ); 2572 );
2148 2573
2149 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
2151 2576
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2577 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2578 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154 2579
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2580 CFPlus::weaken $texture_cache{$self->{path}};
2156 2581
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2582 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2583
2159 $self 2584 $self
2160} 2585}
2161 2586
2162sub STORABLE_freeze { 2587sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2588 my ($self, $cloning) = @_;
2164 2589
2165 $self->{path} 2590 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2591 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167 2592
2168 $self->{path} 2593 $self->{path}
2169} 2594}
2170 2595
2171sub STORABLE_attach { 2596sub STORABLE_attach {
… …
2175} 2600}
2176 2601
2177sub size_request { 2602sub size_request {
2178 my ($self) = @_; 2603 my ($self) = @_;
2179 2604
2180 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2181} 2606}
2182 2607
2183sub _draw { 2608sub _draw {
2184 my ($self) = @_; 2609 my ($self) = @_;
2185 2610
… …
2195 } 2620 }
2196 2621
2197 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199 2624
2200 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2201 2626
2202 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2203} 2628}
2204 2629
2205############################################################################# 2630#############################################################################
2206 2631
2207package CFClient::UI::ImageButton; 2632package CFPlus::UI::ImageButton;
2208 2633
2209our @ISA = CFClient::UI::Image::; 2634our @ISA = CFPlus::UI::Image::;
2210 2635
2211use CFClient::OpenGL; 2636use CFPlus::OpenGL;
2212 2637
2213my %textures; 2638my %textures;
2214 2639
2215sub new { 2640sub new {
2216 my $class = shift; 2641 my $class = shift;
… …
2238 1 2663 1
2239} 2664}
2240 2665
2241############################################################################# 2666#############################################################################
2242 2667
2243package CFClient::UI::VGauge; 2668package CFPlus::UI::VGauge;
2244 2669
2245our @ISA = CFClient::UI::Base::; 2670our @ISA = CFPlus::UI::Base::;
2246 2671
2247use List::Util qw(min max); 2672use List::Util qw(min max);
2248 2673
2249use CFClient::OpenGL; 2674use CFPlus::OpenGL;
2250 2675
2251my %tex = ( 2676my %tex = (
2252 food => [ 2677 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2678 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2679 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2680 ],
2256 grace => [ 2681 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2682 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/ 2683 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2684 ],
2260 hp => [ 2685 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2686 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2687 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2688 ],
2264 mana => [ 2689 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2690 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/ 2691 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2692 ],
2268); 2693);
2269 2694
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2695# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2798 glDisable GL_TEXTURE_2D;
2374} 2799}
2375 2800
2376############################################################################# 2801#############################################################################
2377 2802
2378package CFClient::UI::Gauge; 2803package CFPlus::UI::Gauge;
2379 2804
2380our @ISA = CFClient::UI::VBox::; 2805our @ISA = CFPlus::UI::VBox::;
2381 2806
2382sub new { 2807sub new {
2383 my ($class, %arg) = @_; 2808 my ($class, %arg) = @_;
2384 2809
2385 my $self = $class->SUPER::new ( 2810 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2812 can_hover => 1,
2388 can_events => 1, 2813 can_events => 1,
2389 %arg, 2814 %arg,
2390 ); 2815 );
2391 2816
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2817 $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); 2818 $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"); 2819 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2820
2396 $self 2821 $self
2397} 2822}
2398 2823
2399sub set_fontsize { 2824sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2845 $self->{value}->set_text ($val);
2421} 2846}
2422 2847
2423############################################################################# 2848#############################################################################
2424 2849
2425package CFClient::UI::Slider; 2850package CFPlus::UI::Slider;
2426 2851
2427use strict; 2852use strict;
2428 2853
2429use CFClient::OpenGL; 2854use CFPlus::OpenGL;
2430 2855
2431our @ISA = CFClient::UI::DrawBG::; 2856our @ISA = CFPlus::UI::DrawBG::;
2432 2857
2433my @tex = 2858my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2859 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2860 qw(s1_slider.png s1_slider_bg.png);
2436 2861
2437sub new { 2862sub new {
2438 my $class = shift; 2863 my $class = shift;
2439 2864
… …
2507 2932
2508 $self->SUPER::invoke_button_down ($ev, $x, $y); 2933 $self->SUPER::invoke_button_down ($ev, $x, $y);
2509 2934
2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2935 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2511 2936
2512 $self->invoke_mouse_motion ($ev, $x, $y) 2937 $self->invoke_mouse_motion ($ev, $x, $y);
2938
2939 1
2513} 2940}
2514 2941
2515sub invoke_mouse_motion { 2942sub invoke_mouse_motion {
2516 my ($self, $ev, $x, $y) = @_; 2943 my ($self, $ev, $x, $y) = @_;
2517 2944
… …
2533sub invoke_mouse_wheel { 2960sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 2961 my ($self, $ev) = @_;
2535 2962
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2963 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 2964
2965 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2966
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2967 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 2968
2540 ! ! $delta 2969 1
2541} 2970}
2542 2971
2543sub update { 2972sub update {
2544 my ($self) = @_; 2973 my ($self) = @_;
2545 2974
… …
2594 glDisable GL_TEXTURE_2D; 3023 glDisable GL_TEXTURE_2D;
2595} 3024}
2596 3025
2597############################################################################# 3026#############################################################################
2598 3027
2599package CFClient::UI::ValSlider; 3028package CFPlus::UI::ValSlider;
2600 3029
2601our @ISA = CFClient::UI::HBox::; 3030our @ISA = CFPlus::UI::HBox::;
2602 3031
2603sub new { 3032sub new {
2604 my ($class, %arg) = @_; 3033 my ($class, %arg) = @_;
2605 3034
2606 my $range = delete $arg{range}; 3035 my $range = delete $arg{range};
2607 3036
2608 my $self = $class->SUPER::new ( 3037 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3038 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3039 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 3040 to_value => sub { shift },
2612 from_value => sub { shift }, 3041 from_value => sub { shift },
2613 %arg, 3042 %arg,
2614 ); 3043 );
2615 3044
… …
2635sub set_range { shift->{slider}->set_range (@_) } 3064sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 3065sub set_value { shift->{slider}->set_value (@_) }
2637 3066
2638############################################################################# 3067#############################################################################
2639 3068
2640package CFClient::UI::TextScroller; 3069package CFPlus::UI::TextScroller;
2641 3070
2642our @ISA = CFClient::UI::HBox::; 3071our @ISA = CFPlus::UI::HBox::;
2643 3072
2644use CFClient::OpenGL; 3073use CFPlus::OpenGL;
2645 3074
2646sub new { 3075sub new {
2647 my $class = shift; 3076 my $class = shift;
2648 3077
2649 my $self = $class->SUPER::new ( 3078 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3080 can_events => 1,
2652 indent => 0, 3081 indent => 0,
2653 #font => default_font 3082 #font => default_font
2654 @_, 3083 @_,
2655 3084
2656 layout => (new CFClient::Layout), 3085 layout => (new CFPlus::Layout),
2657 par => [], 3086 par => [],
3087 max_par => 0,
2658 height => 0, 3088 height => 0,
2659 children => [ 3089 children => [
2660 (new CFClient::UI::Empty expand => 1), 3090 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3091 (new CFPlus::UI::Slider vertical => 1),
2662 ], 3092 ],
2663 ); 3093 );
2664 3094
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3095 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3096
… …
2675} 3105}
2676 3106
2677sub size_request { 3107sub size_request {
2678 my ($self) = @_; 3108 my ($self) = @_;
2679 3109
2680 my ($empty, $slider) = @{ $self->{children} }; 3110 my ($empty, $slider) = $self->visible_children;
2681 3111
2682 local $self->{children} = [$empty, $slider]; 3112 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request 3113 $self->SUPER::size_request
2684} 3114}
2685 3115
… …
2743 3173
2744 # todo: base offset on lines or so, not on pixels 3174 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3175 $self->{children}[1]->set_value ($offset);
2746} 3176}
2747 3177
3178sub current_paragraph {
3179 my ($self) = @_;
3180
3181 $self->{top_paragraph} - 1
3182}
3183
3184sub scroll_to {
3185 my ($self, $para) = @_;
3186
3187 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3188
3189 $self->{scroll_to} = $para;
3190 $self->update;
3191}
3192
2748sub clear { 3193sub clear {
2749 my ($self) = @_; 3194 my ($self) = @_;
2750 3195
2751 my (undef, undef, @other) = @{ $self->{children} }; 3196 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other; 3197 $self->remove ($_) for @other;
… …
2755 $self->{height} = 0; 3200 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3201 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 3202}
2758 3203
2759sub add_paragraph { 3204sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 3205 my $self = shift;
2761 3206
2762 my ($text, @w) = ref $para ? @$para : $para; 3207 for my $para (@_) {
2763
2764 $para = { 3208 $para = {
3209 fg => [1, 1, 1, 1],
3210 indent => 0,
3211 markup => "",
3212 widget => [],
3213 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 3214 w => 1e10,
2766 wrapped => 1, 3215 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 3216 };
2772 3217
2773 $self->add (@w) if @w; 3218 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3219 push @{$self->{par}}, $para;
3220 }
3221
3222 if (my $max = $self->{max_par}) {
3223 shift @{$self->{par}} while @{$self->{par}} > $max;
3224 }
2775 3225
2776 $self->{need_reflow}++; 3226 $self->{need_reflow}++;
2777 $self->update; 3227 $self->update;
2778} 3228}
2779 3229
2780sub scroll_to_bottom { 3230sub scroll_to_bottom {
2781 my ($self) = @_; 3231 my ($self) = @_;
2782 3232
2783 $self->{scroll_to_bottom} = 1; 3233 $self->{scroll_to} = $#{$self->{par}};
2784 $self->update; 3234 $self->update;
2785} 3235}
2786 3236
3237sub force_uptodate {
3238 my ($self) = @_;
3239
3240 if (delete $self->{need_reflow}) {
3241 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3242
3243 my $height = 0;
3244
3245 for my $para (@{$self->{par}}) {
3246 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3247 my $layout = $self->get_layout ($para);
3248 my ($w, $h) = $layout->size;
3249
3250 $para->{w} = $w + $para->{indent};
3251 $para->{h} = $h;
3252 $para->{wrapped} = $layout->has_wrapped;
3253 }
3254
3255 $para->{y} = $height;
3256 $height += $para->{h};
3257 }
3258
3259 $self->{height} = $height;
3260 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3261
3262 delete $self->{texture};
3263 }
3264
3265 if (my $paridx = delete $self->{scroll_to}) {
3266 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3267 }
3268}
3269
2787sub update { 3270sub update {
2788 my ($self) = @_; 3271 my ($self) = @_;
2789 3272
2790 $self->SUPER::update; 3273 $self->SUPER::update;
2791 3274
2792 return unless $self->{h} > 0; 3275 return unless $self->{h} > 0;
2793 3276
2794 delete $self->{texture}; 3277 delete $self->{texture};
2795 3278
2796 $ROOT->on_post_alloc ($self => sub { 3279 $ROOT->on_post_alloc ($self => sub {
3280 $self->force_uptodate;
3281
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3282 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798 3283
2799 if (delete $self->{need_reflow}) {
2800 my $height = 0;
2801
2802 for my $para (@{$self->{par}}) {
2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804 my $layout = $self->get_layout ($para);
2805 my ($w, $h) = $layout->size;
2806
2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2810 }
2811
2812 $height += $para->{h};
2813 }
2814
2815 $self->{height} = $height;
2816
2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819 delete $self->{texture};
2820 }
2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3284 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827 glClearColor 0, 0, 0, 0; 3285 glClearColor 0, 0, 0, 0;
2828 glClear GL_COLOR_BUFFER_BIT; 3286 glClear GL_COLOR_BUFFER_BIT;
2829 3287
3288 package CFPlus::UI::Base;
3289 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3290 (0, 0, $self->{w}, $self->{h});
3291
3292 my $top = int $self->{children}[1]{range}[0];
3293
3294 my $paridx = 0;
3295 my $top_paragraph;
2830 my $top = int $self->{children}[1]{range}[0]; 3296 my $top = int $self->{children}[1]{range}[0];
2831 3297
2832 my $y0 = $top; 3298 my $y0 = $top;
2833 my $y1 = $top + $H; 3299 my $y1 = $top + $H;
2834 3300
2835 my $y = 0;
2836
2837 for my $para (@{$self->{par}}) { 3301 for my $para (@{$self->{par}}) {
2838 my $h = $para->{h}; 3302 my $h = $para->{h};
3303 my $y = $para->{y};
2839 3304
2840 if ($y0 < $y + $h && $y < $y1) { 3305 if ($y0 < $y + $h && $y < $y1) {
2841
2842 my $layout = $self->get_layout ($para); 3306 my $layout = $self->get_layout ($para);
2843 3307
2844 $layout->render ($para->{indent}, $y - $y0); 3308 $layout->render ($para->{indent}, $y - $y0);
2845 3309
2846 if (my @w = @{ $para->{widget} }) { 3310 if (my @w = @{ $para->{widget} }) {
… …
2855 $_->draw; 3319 $_->draw;
2856 } 3320 }
2857 } 3321 }
2858 } 3322 }
2859 3323
2860 $y += $h; 3324 $paridx++;
3325 $top_paragraph ||= $paridx if $y >= $top;
2861 } 3326 }
3327
3328 $self->{top_paragraph} = $top_paragraph;
2862 }; 3329 };
2863 }); 3330 });
2864} 3331}
2865 3332
2866sub reconfigure { 3333sub reconfigure {
… …
2884 $self->{children}[1]->draw; 3351 $self->{children}[1]->draw;
2885} 3352}
2886 3353
2887############################################################################# 3354#############################################################################
2888 3355
2889package CFClient::UI::Animator; 3356package CFPlus::UI::Animator;
2890 3357
2891use CFClient::OpenGL; 3358use CFPlus::OpenGL;
2892 3359
2893our @ISA = CFClient::UI::Bin::; 3360our @ISA = CFPlus::UI::Bin::;
2894 3361
2895sub moveto { 3362sub moveto {
2896 my ($self, $x, $y) = @_; 3363 my ($self, $x, $y) = @_;
2897 3364
2898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3365 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2926 glPopMatrix; 3393 glPopMatrix;
2927} 3394}
2928 3395
2929############################################################################# 3396#############################################################################
2930 3397
2931package CFClient::UI::Flopper; 3398package CFPlus::UI::Flopper;
2932 3399
2933our @ISA = CFClient::UI::Button::; 3400our @ISA = CFPlus::UI::Button::;
2934 3401
2935sub new { 3402sub new {
2936 my $class = shift; 3403 my $class = shift;
2937 3404
2938 my $self = $class->SUPER::new ( 3405 my $self = $class->SUPER::new (
… …
2950 $self->{other}->toggle_visibility; 3417 $self->{other}->toggle_visibility;
2951} 3418}
2952 3419
2953############################################################################# 3420#############################################################################
2954 3421
2955package CFClient::UI::Tooltip; 3422package CFPlus::UI::Tooltip;
2956 3423
2957our @ISA = CFClient::UI::Bin::; 3424our @ISA = CFPlus::UI::Bin::;
2958 3425
2959use CFClient::OpenGL; 3426use CFPlus::OpenGL;
2960 3427
2961sub new { 3428sub new {
2962 my $class = shift; 3429 my $class = shift;
2963 3430
2964 $class->SUPER::new ( 3431 $class->SUPER::new (
… …
2967 ) 3434 )
2968} 3435}
2969 3436
2970sub set_tooltip_from { 3437sub set_tooltip_from {
2971 my ($self, $widget) = @_; 3438 my ($self, $widget) = @_;
3439
3440 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3441 if $widget->{tooltip} =~ /^#(.*)$/;
2972 3442
2973 my $tooltip = $widget->{tooltip}; 3443 my $tooltip = $widget->{tooltip};
2974 3444
2975 if ($ENV{CFPLUS_DEBUG} & 2) { 3445 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n" 3446 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2980 } 3450 }
2981 3451
2982 $tooltip =~ s/^\n+//; 3452 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//; 3453 $tooltip =~ s/\n+$//;
2984 3454
2985 $self->add (new CFClient::UI::Label 3455 $self->add (new CFPlus::UI::Label
2986 markup => $tooltip, 3456 markup => $tooltip,
2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3457 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988 fontsize => 0.8, 3458 fontsize => 0.8,
2989 fg => [0, 0, 0, 1], 3459 style => 1, # FLAG_INVERSE
2990 ellipsise => 0, 3460 ellipsise => 0,
2991 font => ($widget->{tooltip_font} || $::FONT_PROP), 3461 font => ($widget->{tooltip_font} || $::FONT_PROP),
2992 ); 3462 );
2993} 3463}
2994 3464
… …
3034 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3035 3505
3036 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3037 3507
3038 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3039 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3040 glVertex 0 , 0;
3041 glVertex 0 , $h;
3042 glVertex $w, $h;
3043 glVertex $w, 0;
3044 glEnd;
3045 3510
3046 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3047 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3048 glVertex 0 , 0; 3513 glVertex 0 , 0;
3049 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3056 $self->SUPER::_draw; 3521 $self->SUPER::_draw;
3057} 3522}
3058 3523
3059############################################################################# 3524#############################################################################
3060 3525
3061package CFClient::UI::Face; 3526package CFPlus::UI::Face;
3062 3527
3063our @ISA = CFClient::UI::Base::; 3528our @ISA = CFPlus::UI::DrawBG::;
3064 3529
3065use CFClient::OpenGL; 3530use CFPlus::OpenGL;
3066 3531
3067sub new { 3532sub new {
3068 my $class = shift; 3533 my $class = shift;
3069 3534
3070 my $self = $class->SUPER::new ( 3535 my $self = $class->SUPER::new (
3536 size_w => 32,
3537 size_h => 8,
3071 aspect => 1, 3538 aspect => 1,
3072 can_events => 0, 3539 can_events => 0,
3073 @_, 3540 @_,
3074 ); 3541 );
3075 3542
3076 if ($self->{anim} && $self->{animspeed}) { 3543 if ($self->{anim} && $self->{animspeed}) {
3077 Scalar::Util::weaken (my $widget = $self); 3544 CFPlus::weaken (my $widget = $self);
3078 3545
3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3079 $self->{timer} = Event->timer ( 3548 $self->{timer} = Event->timer (
3080 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081 hard => 1, 3549 parked => 1,
3082 interval => $self->{animspeed},
3083 cb => sub { 3550 cb => sub {
3551 return unless $::CONN && $widget;
3552
3084 ++$widget->{frame}; 3553 ++$widget->{frame};
3554 $widget->update_face;
3085 $widget->update; 3555 $widget->update;
3556
3557 $widget->update_timer;
3086 }, 3558 },
3087 ); 3559 );
3560
3561 $self->update_face;
3562 $self->update_timer;
3088 } 3563 }
3089 3564
3090 $self 3565 $self
3091} 3566}
3092 3567
3568sub update_timer {
3569 my ($self) = @_;
3570
3571 return unless $self->{timer};
3572
3573 if ($self->{visible}) {
3574 $self->{timer}->at (
3575 $self->{anim_start}
3576 + $self->{animspeed}
3577 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3578 );
3579 $self->{timer}->start;
3580 } else {
3581 $self->{timer}->stop;
3582 }
3583}
3584
3585sub update_face {
3586 my ($self) = @_;
3587
3588 return unless $::CONN;
3589
3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3591 if ($anim && @$anim) {
3592 delete $self->{wait_face};
3593 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3594 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3595 }
3596 }
3597}
3598
3093sub size_request { 3599sub size_request {
3094 (32, 8) 3600 my ($self) = @_;
3601
3602 if ($::CONN) {
3603 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3604 if (my $tex = $::CONN->{texture}[$faceid]) {
3605 $self->{tex} = $tex;
3606 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3607 } else {
3608 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3609 $self->realloc;
3610 });
3611 }
3612 }
3613 }
3614
3615 ($self->{size_w} || 8, $self->{size_h} || 8)
3095} 3616}
3096 3617
3097sub update { 3618sub update {
3098 my ($self) = @_; 3619 my ($self) = @_;
3099 3620
3100 return unless $self->{visible}; 3621 return unless $self->{visible};
3101 3622
3102 $self->SUPER::update; 3623 $self->SUPER::update;
3103} 3624}
3104 3625
3626sub invoke_visibility_change {
3627 my ($self) = @_;
3628
3629 $self->update_timer;
3630
3631 0
3632}
3633
3105sub _draw { 3634sub _draw {
3106 my ($self) = @_; 3635 my ($self) = @_;
3107 3636
3108 return unless $::CONN; 3637 $self->SUPER::_draw;
3109 3638
3110 my $face; 3639 if (my $tex = $self->{tex}) {
3111
3112 if ($self->{frame}) {
3113 my $anim = $::CONN->{anim}[$self->{anim}];
3114
3115 $face = $anim->[ $self->{frame} % @$anim ]
3116 if $anim && @$anim;
3117 }
3118
3119 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3120
3121 if ($tex) {
3122 glEnable GL_TEXTURE_2D; 3640 glEnable GL_TEXTURE_2D;
3123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3124 glColor 0, 0, 0, 1; 3642 glColor 0, 0, 0, 1;
3125 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3643 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3126 glDisable GL_TEXTURE_2D; 3644 glDisable GL_TEXTURE_2D;
… …
3128} 3646}
3129 3647
3130sub destroy { 3648sub destroy {
3131 my ($self) = @_; 3649 my ($self) = @_;
3132 3650
3133 $self->{timer}->cancel 3651 (delete $self->{timer})->cancel
3134 if $self->{timer}; 3652 if $self->{timer};
3135 3653
3136 $self->SUPER::destroy; 3654 $self->SUPER::destroy;
3137} 3655}
3138 3656
3139############################################################################# 3657#############################################################################
3140 3658
3141package CFClient::UI::Buttonbar; 3659package CFPlus::UI::Buttonbar;
3142 3660
3143our @ISA = CFClient::UI::HBox::; 3661our @ISA = CFPlus::UI::HBox::;
3144 3662
3145# TODO: should actualyl wrap buttons and other goodies. 3663# TODO: should actually wrap buttons and other goodies.
3146 3664
3147############################################################################# 3665#############################################################################
3148 3666
3149package CFClient::UI::Menu; 3667package CFPlus::UI::Menu;
3150 3668
3151our @ISA = CFClient::UI::FancyFrame::; 3669our @ISA = CFPlus::UI::Toplevel::;
3152 3670
3153use CFClient::OpenGL; 3671use CFPlus::OpenGL;
3154 3672
3155sub new { 3673sub new {
3156 my $class = shift; 3674 my $class = shift;
3157 3675
3158 my $self = $class->SUPER::new ( 3676 my $self = $class->SUPER::new (
3159 items => [], 3677 items => [],
3160 z => 100, 3678 z => 100,
3161 @_, 3679 @_,
3162 ); 3680 );
3163 3681
3164 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3682 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3165 3683
3166 for my $item (@{ $self->{items} }) { 3684 for my $item (@{ $self->{items} }) {
3167 my ($widget, $cb, $tooltip) = @$item; 3685 my ($widget, $cb, $tooltip) = @$item;
3168 3686
3169 # handle various types of items, only text for now 3687 # handle various types of items, only text for now
3170 if (!ref $widget) { 3688 if (!ref $widget) {
3171 if ($widget =~ /\t/) { 3689 if ($widget =~ /\t/) {
3172 my ($left, $right) = split /\t/, $widget, 2; 3690 my ($left, $right) = split /\t/, $widget, 2;
3173 3691
3174 $widget = new CFClient::UI::HBox 3692 $widget = new CFPlus::UI::HBox
3175 can_hover => 1, 3693 can_hover => 1,
3176 can_events => 1, 3694 can_events => 1,
3177 tooltip => $tooltip, 3695 tooltip => $tooltip,
3178 children => [ 3696 children => [
3179 (new CFClient::UI::Label markup => $left, expand => 1), 3697 (new CFPlus::UI::Label markup => $left, expand => 1),
3180 (new CFClient::UI::Label markup => $right, align => +1), 3698 (new CFPlus::UI::Label markup => $right, align => +1),
3181 ], 3699 ],
3182 ; 3700 ;
3183 3701
3184 } else { 3702 } else {
3185 $widget = new CFClient::UI::Label 3703 $widget = new CFPlus::UI::Label
3186 can_hover => 1, 3704 can_hover => 1,
3187 can_events => 1, 3705 can_events => 1,
3188 markup => $widget, 3706 markup => $widget,
3189 tooltip => $tooltip; 3707 tooltip => $tooltip;
3190 } 3708 }
… …
3238 1 3756 1
3239} 3757}
3240 3758
3241############################################################################# 3759#############################################################################
3242 3760
3243package CFClient::UI::Multiplexer; 3761package CFPlus::UI::Multiplexer;
3244 3762
3245our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3246 3764
3247sub new { 3765sub new {
3248 my $class = shift; 3766 my $class = shift;
3249 3767
3250 my $self = $class->SUPER::new ( 3768 my $self = $class->SUPER::new (
… …
3311 $self->{current}->draw; 3829 $self->{current}->draw;
3312} 3830}
3313 3831
3314############################################################################# 3832#############################################################################
3315 3833
3316package CFClient::UI::Notebook; 3834package CFPlus::UI::Notebook;
3317 3835
3318our @ISA = CFClient::UI::VBox::; 3836our @ISA = CFPlus::UI::VBox::;
3319 3837
3320sub new { 3838sub new {
3321 my $class = shift; 3839 my $class = shift;
3322 3840
3323 my $self = $class->SUPER::new ( 3841 my $self = $class->SUPER::new (
3324 buttonbar => (new CFClient::UI::Buttonbar), 3842 buttonbar => (new CFPlus::UI::Buttonbar),
3325 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3843 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3326 # filter => # will be put between multiplexer and $self 3844 # filter => # will be put between multiplexer and $self
3327 @_, 3845 @_,
3328 ); 3846 );
3329 3847
3330 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3848 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3331 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3849 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3332 3850
3851 {
3852 Scalar::Util::weaken (my $wself = $self);
3853
3854 $self->{multiplexer}->connect (c_add => sub {
3855 my ($mplex, $widgets) = @_;
3856
3857 for my $child (@$widgets) {
3858 Scalar::Util::weaken $child;
3859 $child->{c_tab_} ||= do {
3860 my $tab =
3861 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3862 ? $child->{c_tab}
3863 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3864
3865 $tab->connect (activate => sub {
3866 $wself->set_current_page ($child);
3867 });
3868
3869 $tab
3870 };
3871
3872 $self->{buttonbar}->add ($child->{c_tab_});
3873 }
3874 });
3875
3876 $self->{multiplexer}->connect (c_remove => sub {
3877 my ($mplex, $widgets) = @_;
3878
3879 for my $child (@$widgets) {
3880 $wself->{buttonbar}->remove ($child->{c_tab_});
3881 }
3882 });
3883 }
3884
3333 $self 3885 $self
3334} 3886}
3335 3887
3336sub add { 3888sub add {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->add (@widgets)
3892}
3893
3894sub remove {
3895 my ($self, @widgets) = @_;
3896
3897 $self->{multiplexer}->remove (@widgets)
3898}
3899
3900sub pages {
3901 my ($self) = @_;
3902 $self->{multiplexer}->children
3903}
3904
3905sub add_tab {
3337 my ($self, $title, $widget, $tooltip) = @_; 3906 my ($self, $title, $widget, $tooltip) = @_;
3338 3907
3339 Scalar::Util::weaken $self; 3908 $title = [$title, $tooltip] unless ref $title;
3909 $widget->{c_tab} = $title;
3340 3910
3341 $self->{buttonbar}->add (new CFClient::UI::Button
3342 markup => $title,
3343 tooltip => $tooltip,
3344 on_activate => sub { $self->set_current_page ($widget) },
3345 );
3346
3347 $self->{multiplexer}->add ($widget); 3911 $self->add ($widget);
3348} 3912}
3349 3913
3350sub get_current_page { 3914sub get_current_page {
3351 my ($self) = @_; 3915 my ($self) = @_;
3352 3916
… …
3360 $self->emit (page_changed => $self->{multiplexer}{current}); 3924 $self->emit (page_changed => $self->{multiplexer}{current});
3361} 3925}
3362 3926
3363############################################################################# 3927#############################################################################
3364 3928
3365package CFClient::UI::Combobox; 3929package CFPlus::UI::Selector;
3366 3930
3367use utf8; 3931use utf8;
3368 3932
3369our @ISA = CFClient::UI::Button::; 3933our @ISA = CFPlus::UI::Button::;
3370 3934
3371sub new { 3935sub new {
3372 my $class = shift; 3936 my $class = shift;
3373 3937
3374 my $self = $class->SUPER::new ( 3938 my $self = $class->SUPER::new (
… …
3391 my ($value, $title, $tooltip) = @$_; 3955 my ($value, $title, $tooltip) = @$_;
3392 3956
3393 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3957 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3394 } 3958 }
3395 3959
3396 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3960 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3397} 3961}
3398 3962
3399sub _set_value { 3963sub _set_value {
3400 my ($self, $value) = @_; 3964 my ($self, $value) = @_;
3401 3965
… …
3416 $self->emit (changed => $value); 3980 $self->emit (changed => $value);
3417} 3981}
3418 3982
3419############################################################################# 3983#############################################################################
3420 3984
3421package CFClient::UI::Statusbox; 3985package CFPlus::UI::Statusbox;
3422 3986
3423our @ISA = CFClient::UI::VBox::; 3987our @ISA = CFPlus::UI::VBox::;
3424 3988
3425sub new { 3989sub new {
3426 my $class = shift; 3990 my $class = shift;
3427 3991
3428 my $self = $class->SUPER::new ( 3992 my $self = $class->SUPER::new (
3429 fontsize => 0.8, 3993 fontsize => 0.8,
3430 @_, 3994 @_,
3431 ); 3995 );
3432 3996
3433 Scalar::Util::weaken (my $this = $self); 3997 CFPlus::weaken (my $this = $self);
3434 3998
3435 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3999 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3436 4000
3437 $self 4001 $self
3438} 4002}
… …
3440sub reorder { 4004sub reorder {
3441 my ($self) = @_; 4005 my ($self) = @_;
3442 my $NOW = Time::HiRes::time; 4006 my $NOW = Time::HiRes::time;
3443 4007
3444 # freeze display when hovering over any label 4008 # freeze display when hovering over any label
3445 return if $CFClient::UI::TOOLTIP->{owner} 4009 return if $CFPlus::UI::TOOLTIP->{owner}
3446 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4010 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3447 values %{ $self->{item} }; 4011 values %{ $self->{item} };
3448 4012
3449 while (my ($k, $v) = each %{ $self->{item} }) { 4013 while (my ($k, $v) = each %{ $self->{item} }) {
3450 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4014 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3451 } 4015 }
… …
3472 for ($short) { 4036 for ($short) {
3473 s/^\s+//; 4037 s/^\s+//;
3474 s/\s+/ /g; 4038 s/\s+/ /g;
3475 } 4039 }
3476 4040
3477 new CFClient::UI::Label 4041 new CFPlus::UI::Label
3478 markup => $short, 4042 markup => $short,
3479 tooltip => $item->{tooltip}, 4043 tooltip => $item->{tooltip},
3480 tooltip_font => $::FONT_PROP, 4044 tooltip_font => $::FONT_PROP,
3481 tooltip_width => 0.67, 4045 tooltip_width => 0.67,
3482 fontsize => $item->{fontsize} || $self->{fontsize}, 4046 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3561 $self->SUPER::destroy; 4125 $self->SUPER::destroy;
3562} 4126}
3563 4127
3564############################################################################# 4128#############################################################################
3565 4129
3566package CFClient::UI::Inventory;
3567
3568our @ISA = CFClient::UI::Table::;
3569
3570sub new {
3571 my $class = shift;
3572
3573 my $self = $class->SUPER::new (
3574 col_expand => [0, 1, 0],
3575 items => [],
3576 @_,
3577 );
3578
3579 $self->set_sort_order (undef);
3580
3581 $self
3582}
3583
3584sub update_items {
3585 my ($self) = @_;
3586
3587 $self->clear;
3588
3589 my @item = $self->{sort}->(@{ $self->{items} });
3590
3591 my @adds;
3592 my $row = 0;
3593 for my $item ($self->{sort}->(@{ $self->{items} })) {
3594 CFClient::Item::update_widgets $item;
3595
3596 push @adds, 0, $row, $item->{face_widget};
3597 push @adds, 1, $row, $item->{desc_widget};
3598 push @adds, 2, $row, $item->{weight_widget};
3599
3600 $row++;
3601 }
3602
3603 $self->add (@adds);
3604}
3605
3606sub set_sort_order {
3607 my ($self, $order) = @_;
3608
3609 $self->{sort} = $order ||= sub {
3610 sort {
3611 $a->{type} <=> $b->{type}
3612 or $a->{name} cmp $b->{name}
3613 } @_
3614 };
3615
3616 $self->update_items;
3617}
3618
3619sub set_items {
3620 my ($self, $items) = @_;
3621
3622 $self->{items} = [$items ? values %$items : ()];
3623 $self->update_items;
3624}
3625
3626#############################################################################
3627
3628package CFClient::UI::SpellList;
3629
3630our @ISA = CFClient::UI::Table::;
3631
3632sub new {
3633 my $class = shift;
3634
3635 my $self = $class->SUPER::new (
3636 binding => [],
3637 commands => [],
3638 @_,
3639 )
3640}
3641
3642my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3643
3644my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3645 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3646my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3648my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3652my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3654
3655sub rebuild_spell_list {
3656 my ($self) = @_;
3657
3658 $CFClient::UI::ROOT->on_refresh ($self => sub {
3659 $self->clear;
3660
3661 return unless $::CONN;
3662
3663 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3664 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3665 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3666 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3667 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3668
3669 my $row = 0;
3670
3671 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3672 my $spell = $self->{spell}{$_};
3673
3674 $row++;
3675
3676 my $spell_cb = sub {
3677 my ($widget, $ev) = @_;
3678
3679 if ($ev->{button} == 1) {
3680 $::CONN->user_send ("cast $spell->{name}");
3681 } elsif ($ev->{button} == 2) {
3682 $::CONN->user_send ("invoke $spell->{name}");
3683 } elsif ($ev->{button} == 3) {
3684 (new CFClient::UI::Menu
3685 items => [
3686 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3687 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3688 ],
3689 )->popup ($ev);
3690 } else {
3691 return 0;
3692 }
3693
3694 1
3695 };
3696
3697 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3698
3699 #TODO: add path info to tooltip
3700 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3701
3702 $self->add (0, $row, new CFClient::UI::Face
3703 face => $spell->{face},
3704 can_hover => 1,
3705 can_events => 1,
3706 tooltip => $tooltip,
3707 on_button_down => $spell_cb,
3708 );
3709
3710 $self->add (1, $row, new CFClient::UI::Label
3711 expand => 1,
3712 text => $spell->{name},
3713 can_hover => 1,
3714 can_events => 1,
3715 tooltip => $tooltip,
3716 on_button_down => $spell_cb,
3717 );
3718
3719 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3720 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3721 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3722 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3723 }
3724 });
3725}
3726
3727sub add_spell {
3728 my ($self, $spell) = @_;
3729
3730 $self->{spell}->{$spell->{name}} = $spell;
3731 $self->rebuild_spell_list;
3732}
3733
3734sub remove_spell {
3735 my ($self, $spell) = @_;
3736
3737 delete $self->{spell}->{$spell->{name}};
3738 $self->rebuild_spell_list;
3739}
3740
3741sub clear_spells {
3742 my ($self) = @_;
3743
3744 $self->{spell} = {};
3745 $self->rebuild_spell_list;
3746}
3747
3748#############################################################################
3749
3750package CFClient::UI::Root; 4130package CFPlus::UI::Root;
3751 4131
3752our @ISA = CFClient::UI::Container::; 4132our @ISA = CFPlus::UI::Container::;
3753 4133
3754use List::Util qw(min max); 4134use List::Util qw(min max);
3755 4135
3756use CFClient::OpenGL; 4136use CFPlus::OpenGL;
3757 4137
3758sub new { 4138sub new {
3759 my $class = shift; 4139 my $class = shift;
3760 4140
3761 my $self = $class->SUPER::new ( 4141 my $self = $class->SUPER::new (
3762 visible => 1, 4142 visible => 1,
3763 @_, 4143 @_,
3764 ); 4144 );
3765 4145
3766 Scalar::Util::weaken ($self->{root} = $self); 4146 CFPlus::weaken ($self->{root} = $self);
3767 4147
3768 $self 4148 $self
3769} 4149}
3770 4150
3771sub size_request { 4151sub size_request {
… …
3866 while ($self->{refresh_hook}) { 4246 while ($self->{refresh_hook}) {
3867 $_->() 4247 $_->()
3868 for values %{delete $self->{refresh_hook}}; 4248 for values %{delete $self->{refresh_hook}};
3869 } 4249 }
3870 4250
3871 if ($self->{realloc}) { 4251 while ($self->{realloc}) {
3872 my %queue; 4252 my %queue;
3873 my @queue; 4253 my @queue;
3874 my $widget; 4254 my $widget;
3875 4255
3876 outer: 4256 outer:
… …
3923 } 4303 }
3924 } 4304 }
3925 4305
3926 delete $self->{realloc}{$widget+0}; 4306 delete $self->{realloc}{$widget+0};
3927 } 4307 }
3928 }
3929 4308
3930 while (my $size_alloc = delete $self->{size_alloc}) { 4309 while (my $size_alloc = delete $self->{size_alloc}) {
3931 my @queue = sort { $b->{visible} <=> $a->{visible} } 4310 my @queue = sort { $a->{visible} <=> $b->{visible} }
3932 values %$size_alloc; 4311 values %$size_alloc;
3933 4312
3934 while () { 4313 while () {
3935 my $widget = pop @queue || last; 4314 my $widget = pop @queue || last;
3936 4315
3937 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4316 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3938 4317
3939 $w = 0 if $w < 0;
3940 $h = 0 if $h < 0;
3941
3942 $w = max $widget->{min_w}, $w; 4318 $w = max $widget->{min_w}, $w;
3943 $h = max $widget->{min_h}, $h; 4319 $h = max $widget->{min_h}, $h;
3944 4320
4321# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4322# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4323
3945 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4324 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4325 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3947 4326
3948 $w = int $w + 0.5; 4327 $w = int $w + 0.5;
3949 $h = int $h + 0.5; 4328 $h = int $h + 0.5;
3950 4329
3951 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4330 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3952 $widget->{old_w} = $widget->{w}; 4331 $widget->{old_w} = $widget->{w};
3953 $widget->{old_h} = $widget->{h}; 4332 $widget->{old_h} = $widget->{h};
3954 4333
3955 $widget->{w} = $w; 4334 $widget->{w} = $w;
3956 $widget->{h} = $h; 4335 $widget->{h} = $h;
3957 4336
3958 $widget->emit (size_allocate => $w, $h); 4337 $widget->emit (size_allocate => $w, $h);
4338 }
3959 } 4339 }
3960 } 4340 }
3961 } 4341 }
3962 4342
3963 while ($self->{post_alloc_hook}) { 4343 while ($self->{post_alloc_hook}) {
3964 $_->() 4344 $_->()
3965 for values %{delete $self->{post_alloc_hook}}; 4345 for values %{delete $self->{post_alloc_hook}};
3966 } 4346 }
3967
3968 4347
3969 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4348 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3970 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4349 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3971 glClear GL_COLOR_BUFFER_BIT; 4350 glClear GL_COLOR_BUFFER_BIT;
3972 4351
… …
3975 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4354 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3976 glMatrixMode GL_MODELVIEW; 4355 glMatrixMode GL_MODELVIEW;
3977 glLoadIdentity; 4356 glLoadIdentity;
3978 4357
3979 { 4358 {
3980 package CFClient::UI::Base; 4359 package CFPlus::UI::Base;
3981 4360
3982 ($draw_x, $draw_y, $draw_w, $draw_h) = 4361 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3983 (0, 0, $self->{w}, $self->{h}); 4362 (0, 0, $self->{w}, $self->{h});
3984 }
3985 4363
3986 $self->_draw; 4364 $self->_draw;
4365 }
3987} 4366}
3988 4367
3989############################################################################# 4368#############################################################################
3990 4369
3991package CFClient::UI; 4370package CFPlus::UI;
3992 4371
3993$ROOT = new CFClient::UI::Root; 4372$ROOT = new CFPlus::UI::Root;
3994$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4373$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3995 4374
39961 43751
3997 4376

Diff Legend

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