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.332 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.420 by root, Wed Jul 25 15:50:17 2007 UTC

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

Diff Legend

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