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.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.429 by root, Tue Aug 21 00:59:34 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 {
432 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
433 445
446 Carp::confess unless $self->{parent};#d#
447
434 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435} 449}
436 450
437# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
438sub coord2global { 452sub coord2global {
439 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
454
455 Carp::confess unless $self->{parent};#d#
440 456
441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442} 458}
443 459
444sub invoke_focus_in { 460sub invoke_focus_in {
… …
492 508
493sub connect { 509sub connect {
494 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
495 511
496 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
497} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
498 532
499sub emit { 533sub emit {
500 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
501 535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
502 my @append 538 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event") 539 = $has_coords{$signal}
504 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
505 : (); 541 : ();
506 542
507 #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#
508 544
509 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
511 || ($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
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
513} 554}
514 555
515sub find_widget { 556#sub find_widget {
516 my ($self, $x, $y) = @_; 557# in .xs
517
518 return () unless $self->{can_events};
519
520 return $self
521 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
522 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
523
524 ()
525}
526 558
527sub set_parent { 559sub set_parent {
528 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
529 561
530 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
531 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
532} 564}
533 565
534sub realloc { 566sub realloc {
535 my ($self) = @_; 567 my ($self) = @_;
… …
561 593
562# 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
563# functions seems pointless. 595# functions seems pointless.
564our ($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
565 597
566sub draw { 598#sub draw {
567 my ($self) = @_; 599#CFPlus.xs
568
569 return unless $self->{h} && $self->{w};
570
571 # update screen rectangle
572 local $draw_x = $draw_x + $self->{x};
573 local $draw_y = $draw_y + $self->{y};
574
575 # skip widgets that are entirely outside the drawing area
576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
578
579 glPushMatrix;
580 glTranslate $self->{x}, $self->{y}, 0;
581
582 if ($self == $HOVER && $self->{can_hover}) {
583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
584 glEnable GL_BLEND;
585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
586 glBegin GL_QUADS;
587 glVertex 0 , 0;
588 glVertex $self->{w}, 0;
589 glVertex $self->{w}, $self->{h};
590 glVertex 0 , $self->{h};
591 glEnd;
592 glDisable GL_BLEND;
593 }
594
595 if ($ENV{CFPLUS_DEBUG} & 1) {
596 glPushMatrix;
597 glColor 1, 1, 0, 1;
598 glTranslate 0.375, 0.375;
599 glBegin GL_LINE_LOOP;
600 glVertex 0 , 0;
601 glVertex $self->{w} - 1, 0;
602 glVertex $self->{w} - 1, $self->{h} - 1;
603 glVertex 0 , $self->{h} - 1;
604 glEnd;
605 glPopMatrix;
606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
607 }
608
609 $self->_draw;
610 glPopMatrix;
611}
612 600
613sub _draw { 601sub _draw {
614 my ($self) = @_; 602 my ($self) = @_;
615 603
616 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
617} 605}
618 606
619sub DESTROY { 607sub DESTROY {
620 my ($self) = @_; 608 my ($self) = @_;
621 609
622 return if CFClient::in_destruct; 610 return if CFPlus::in_destruct;
623
624 delete $WIDGET{$self+0};
625 611
626 eval { $self->destroy }; 612 eval { $self->destroy };
627 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};
628} 616}
629 617
630############################################################################# 618#############################################################################
631 619
632package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
633 621
634our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
635 623
636use strict; 624use strict;
637use CFClient::OpenGL; 625use CFPlus::OpenGL;
638 626
639sub new { 627sub new {
640 my $class = shift; 628 my $class = shift;
641 629
642 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
673 } 661 }
674} 662}
675 663
676############################################################################# 664#############################################################################
677 665
678package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
679 667
680our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
681 669
682sub new { 670sub new {
683 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
684 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
685} 673}
… …
692 680
693sub draw { } 681sub draw { }
694 682
695############################################################################# 683#############################################################################
696 684
697package CFClient::UI::Container; 685package CFPlus::UI::Container;
698 686
699our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
700 688
701sub new { 689sub new {
702 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
703 691
704 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
708 can_events => 0, 696 can_events => 0,
709 %arg, 697 %arg,
710 ); 698 );
711 699
712 $self->add (@$children) 700 $self->add (@$children)
713 if $children; 701 if $children && @$children;
714 702
715 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
716} 712}
717 713
718sub add { 714sub add {
719 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
720 716
721 $_->set_parent ($self) 717 $_->set_parent ($self)
722 for @widgets; 718 for @widgets;
723 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
724 use sort 'stable'; 721 use sort 'stable';
725 722
726 $self->{children} = [ 723 $self->{children} = [
727 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
728 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
729 ]; 726 ];
730 727
731 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
732} 733}
733 734
734sub children { 735sub children {
735 @{ $_[0]{children} } 736 @{ $_[0]{children} }
736} 737}
737 738
738sub remove { 739sub remove {
739 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
740 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
741 delete $child->{parent}; 745 delete $child->{parent};
742 $child->hide; 746 $child->hide;
743
744 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
745 749
746 $self->realloc; 750 $self->realloc;
747} 751}
748 752
749sub clear { 753sub clear {
750 my ($self) = @_; 754 my ($self) = @_;
751 755
752 my $children = delete $self->{children}; 756 my $children = $self->{children};
753 $self->{children} = []; 757 $self->{children} = [];
754 758
755 for (@$children) { 759 for (@$children) {
756 delete $_->{parent}; 760 delete $_->{parent};
757 $_->hide; 761 $_->hide;
… …
777} 781}
778 782
779sub _draw { 783sub _draw {
780 my ($self) = @_; 784 my ($self) = @_;
781 785
782 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
783} 787}
784 788
785############################################################################# 789#############################################################################
786 790
787package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
788 792
789our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
790 794
791sub new { 795sub new {
792 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
793 797
794 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795 799
796 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
797} 801}
798 802
799sub add { 803sub add {
800 my ($self, $child) = @_; 804 my ($self, $child) = @_;
801 805
802 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
803 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
804} 808}
805 809
806sub remove { 810sub remove {
807 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
808 812
809 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
810 814
811 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
812 unless @{$self->{children}}; 816 unless @{$self->{children}};
813} 817}
814 818
815sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
816 820
… …
828 832
829############################################################################# 833#############################################################################
830 834
831# back-buffered drawing area 835# back-buffered drawing area
832 836
833package CFClient::UI::Window; 837package CFPlus::UI::Window;
834 838
835our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
836 840
837use CFClient::OpenGL; 841use CFPlus::OpenGL;
838 842
839sub new { 843sub new {
840 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
841 845
842 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
864} 868}
865 869
866sub render_child { 870sub render_child {
867 my ($self) = @_; 871 my ($self) = @_;
868 872
869 $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 {
870 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
871 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
872 876
873 { 877 {
874 package CFClient::UI::Base; 878 package CFPlus::UI::Base;
875 879
876 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
878 } 884 }
879
880 $self->_render;
881 }; 885 };
882} 886}
883 887
884sub _draw { 888sub _draw {
885 my ($self) = @_; 889 my ($self) = @_;
886
887 my ($w, $h) = @$self{qw(w h)};
888 890
889 my $tex = $self->{texture} 891 my $tex = $self->{texture}
890 or return; 892 or return;
891 893
892 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
895 897
896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
897 899
898 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
899} 901}
900 902
901############################################################################# 903#############################################################################
902 904
903package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
904 906
907use List::Util qw(min max);
908
905our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
906 910
907sub new { 911sub new {
908 my $class = shift; 912 my $class = shift;
909 913
910 $class->SUPER::new ( 914 $class->SUPER::new (
… …
917sub size_request { 921sub size_request {
918 my ($self) = @_; 922 my ($self) = @_;
919 923
920 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
921 925
922 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
923 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
924 928
925 ($w, $h) 929 ($w, $h)
926} 930}
927 931
928sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
940} 944}
941 945
942sub set_offset { 946sub set_offset {
943 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
944 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}) {
945 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
946 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
947 955
956 $self->emit (changed => $x, $y);
948 $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 }
949} 977}
950 978
951# 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
952sub coord2local { 980sub coord2local {
953 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
968 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
969 997
970 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
972 ) { 1000 ) {
973 $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})
974 } else { 1002 } else {
975 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
976 } 1004 }
977} 1005}
978 1006
979sub _render { 1007sub _render {
980 my ($self) = @_; 1008 my ($self) = @_;
981 1009
982 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};
983 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};
984 1012
985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986 1014
987 $self->SUPER::_render; 1015 $self->SUPER::_render;
988} 1016}
989 1017
990############################################################################# 1018#############################################################################
991 1019
992package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
993 1021
994our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
995 1023
996sub new { 1024sub new {
997 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
998 1026
999 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1000 1028
1001 my $self; 1029 my $self;
1002 1030
1003 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1004 vertical => 1, 1045 vertical => 1,
1005 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1006 on_changed => sub { 1047 on_changed => sub {
1007 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008 }, 1050 },
1009 ; 1051 ;
1010 1052
1011 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
1012 vp => (new CFClient::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1013 can_events => 1, 1056 can_events => 1,
1014 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1015 %arg, 1061 %arg,
1016 ); 1062 );
1017 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
1018 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
1019 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1020 1088
1021 $self 1089 $self
1022} 1090}
1023
1024#TODO# update range on size_allocate depending on child
1025 1091
1026sub add { 1092sub add {
1027 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1028 1094
1029 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1030} 1096}
1031 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
1032sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1034 1152
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $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};
1038 1155
1039 1 1156 1
1040} 1157}
1041 1158
1042sub update_slider { 1159sub invoke_button_down {
1043 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1044 1161
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1162 if ($ev->{button} == 2) {
1046} 1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1047 1166
1048sub update { 1167 0
1049 my ($self) = @_; 1168}
1050 1169
1051 $self->SUPER::update; 1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1052 1172
1053 $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
1054} 1189}
1055 1190
1056sub invoke_size_allocate { 1191sub invoke_size_allocate {
1057 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1058 1193
1059 $self->update_slider; 1194 $self->update_slider;
1060
1061 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1062} 1196}
1063 1197
1064############################################################################# 1198#############################################################################
1065 1199
1066package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1067 1201
1068our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1069 1203
1070use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1071 1205
1072sub new { 1206sub new {
1073 my $class = shift; 1207 my $class = shift;
1074 1208
1075 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1101 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1102} 1236}
1103 1237
1104############################################################################# 1238#############################################################################
1105 1239
1106package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1107 1241
1108our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1109 1243
1110use 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;
1111 1345
1112my $bg = 1346my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1115 1349
1116my @border = 1350my @border =
1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118 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);
1119 1357
1120sub new { 1358sub new {
1121 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1122 1360
1123 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
… …
1128 min_w => 64, 1366 min_w => 64,
1129 min_h => 32, 1367 min_h => 32,
1130 %arg, 1368 %arg,
1131 ); 1369 );
1132 1370
1133 $self->{title_widget} = new CFClient::UI::Label 1371 $self->{title_widget} = new CFPlus::UI::Label
1134 align => 0, 1372 align => 0,
1135 valign => 1, 1373 valign => 1,
1136 text => $self->{title}, 1374 text => $self->{title},
1137 fontsize => $self->{border}, 1375 fontsize => $self->{border},
1138 if exists $self->{title}; 1376 if exists $self->{title};
1139 1377
1140 if ($self->{has_close_button}) { 1378 if ($self->{has_close_button}) {
1141 $self->{close_button} = 1379 $self->{close_button} =
1142 new CFClient::UI::ImageButton 1380 new CFPlus::UI::ImageButton
1143 path => 'x1_close.png', 1381 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") }; 1382 on_activate => sub { $self->emit ("delete") };
1145 1383
1146 $self->CFClient::UI::Container::add ($self->{close_button}); 1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1147 } 1385 }
1148 1386
1149 $self 1387 $self
1150} 1388}
1151 1389
1152sub add { 1390sub add {
1153 my ($self, @widgets) = @_; 1391 my ($self, @widgets) = @_;
1154 1392
1155 $self->SUPER::add (@widgets); 1393 $self->SUPER::add (@widgets);
1156 $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};
1157 $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};
1158} 1396}
1159 1397
1160sub border { 1398sub border {
1161 int $_[0]{border} * $::FONTSIZE 1399 int $_[0]{border} * $::FONTSIZE
1162} 1400}
… …
1270 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271 1509
1272 ! ! $self->{motion} 1510 ! ! $self->{motion}
1273} 1511}
1274 1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
1519}
1520
1275sub _draw { 1521sub _draw {
1276 my ($self) = @_; 1522 my ($self) = @_;
1277 1523
1278 my $child = $self->{children}[0]; 1524 my $child = $self->{children}[0];
1279 1525
… …
1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1285 1531
1286 my $border = $self->border; 1532 my $border = $self->border;
1287 1533
1288 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1289 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1292 $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);
1293 1553
1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1295 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1296 1556
1297 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1316 if $self->{close_button}; 1576 if $self->{close_button};
1317} 1577}
1318 1578
1319############################################################################# 1579#############################################################################
1320 1580
1321package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1322 1582
1323our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1324 1584
1325use List::Util qw(max sum); 1585use List::Util qw(max sum);
1326 1586
1327use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1328 1588
1329sub new { 1589sub new {
1330 my $class = shift; 1590 my $class = shift;
1331 1591
1332 $class->SUPER::new ( 1592 $class->SUPER::new (
1333 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1334 @_, 1595 @_,
1335 ) 1596 )
1336} 1597}
1337 1598
1338sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340}
1341
1342sub add { 1599sub add {
1343 my ($self, $x, $y, $child) = @_; 1600 my ($self, @widgets) = @_;
1344 1601
1345 $child->set_parent ($self); 1602 for my $child (@widgets) {
1346 $self->{children}[$y][$x] = $child; 1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1347 1606
1348 $self->realloc; 1607 $self->SUPER::add (@widgets);
1349} 1608}
1350 1609
1351sub remove { 1610sub add_at {
1611 my $self = shift;
1612
1613 my @widgets;
1614
1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617
1618 $child->{c_row} = $row;
1619 $child->{c_col} = $col;
1620
1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1352 my ($self, $child) = @_; 1628 my ($self) = @_;
1353 1629
1354 # TODO: not yet implemented 1630 my (@w, @h);
1355}
1356
1357# TODO: move to container class maybe? send children a signal on removal?
1358sub clear {
1359 my ($self) = @_;
1360 1631
1361 my @children = $self->children; 1632 my @children = $self->children;
1362 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1363 1643 }
1364 for (@children) {
1365 delete $_->{parent};
1366 $_->hide;
1367 }
1368 1644
1369 $self->realloc; 1645 # second pass, rows
1370} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1371
1372sub get_wh {
1373 my ($self) = @_;
1374
1375 my (@w, @h);
1376
1377 for my $y (0 .. $#{$self->{children}}) {
1378 my $row = $self->{children}[$y]
1379 or next;
1380
1381 for my $x (0 .. $#$row) {
1382 my $widget = $row->[$x]
1383 or next;
1384 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1385 1648
1386 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1387 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1388 } 1653 }
1389 } 1654 }
1390 1655
1391 (\@w, \@h) 1656 (\@w, \@h)
1392} 1657}
… …
1408 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1409 1674
1410 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1411 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1412 1677
1413 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1414 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1415 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1416 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1417 1682
1418 # linearly scale sizes
1419 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421 1684
1422 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
1423 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1424 1694
1425 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1426 1697
1427 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1428 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1429 or next;
1430 1700
1431 my $x = 0; 1701 $widget->configure (
1432 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1433 1704 );
1434 for my $c (0 .. $#$row) { 1705 }
1435 my $col_w = $ws->[$c];
1436 1706
1437 if (my $widget = $row->[$c]) { 1707 1
1438 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1439 }
1440 1709
1441 $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};
1442 } 1737 }
1738 }
1443 1739
1444 $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});
1445 } 1771 }
1446 1772
1447 1 1773 1
1448} 1774}
1449 1775
1450sub find_widget {
1451 my ($self, $x, $y) = @_;
1452
1453 $x -= $self->{x};
1454 $y -= $self->{y};
1455
1456 my $res;
1457
1458 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1459 $res = $_->find_widget ($x, $y)
1460 and return $res;
1461 }
1462
1463 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1464}
1465
1466sub _draw {
1467 my ($self) = @_;
1468
1469 for (grep $_, @{$self->{children}}) {
1470 $_->draw for grep $_, @$_;
1471 }
1472}
1473
1474############################################################################# 1776#############################################################################
1475 1777
1476package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1477 1779
1478our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1479 1781
1480sub size_request { 1782sub size_request {
1481 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1482 1786
1483 $self->{vertical} 1787 $self->{vertical}
1484 ? ( 1788 ? (
1485 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1486 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1487 ) 1791 )
1488 : ( 1792 : (
1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1490 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1491 ) 1795 )
1492} 1796}
1493 1797
1494sub invoke_size_allocate { 1798sub invoke_size_allocate {
1495 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1516 $req[$_] += $space * $children[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1517 for 0 .. $#children; 1821 for 0 .. $#children;
1518 } 1822 }
1519 } 1823 }
1520 1824
1521 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1522 1826
1523 my $pos = 0; 1827 my $pos = 0;
1524 for (0 .. $#children) { 1828 for (0 .. $#children) {
1525 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1526 $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));
… …
1531 1 1835 1
1532} 1836}
1533 1837
1534############################################################################# 1838#############################################################################
1535 1839
1536package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1537 1841
1538our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1539 1843
1540sub new { 1844sub new {
1541 my $class = shift; 1845 my $class = shift;
1542 1846
1543 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1546 ) 1850 )
1547} 1851}
1548 1852
1549############################################################################# 1853#############################################################################
1550 1854
1551package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1552 1856
1553our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1554 1858
1555sub new { 1859sub new {
1556 my $class = shift; 1860 my $class = shift;
1557 1861
1558 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1561 ) 1865 )
1562} 1866}
1563 1867
1564############################################################################# 1868#############################################################################
1565 1869
1566package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1567 1871
1568our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1569 1873
1570use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1571 1875
1572sub new { 1876sub new {
1573 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1574 1878
1575 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1578 #active_bg => none 1882 #active_bg => none
1579 #font => default_font 1883 #font => default_font
1580 #text => initial text 1884 #text => initial text
1581 #markup => initial narkup 1885 #markup => initial narkup
1582 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1583 ellipsise => 3, # end 1888 ellipsise => 3, # end
1584 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1585 fontsize => 1, 1890 fontsize => 1,
1586 align => -1, 1891 align => -1,
1587 valign => -1, 1892 valign => -1,
1588 padding_x => 2, 1893 padding_x => 2,
1589 padding_y => 2, 1894 padding_y => 2,
1590 can_events => 0, 1895 can_events => 0,
1591 %arg 1896 %arg
1592 ); 1897 );
1593 1898
1594 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1595 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1596 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1597 $self->{template} = $layout; 1902 $self->{template} = $layout;
1598 } 1903 }
1599 1904
1600 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1604 } 1909 }
1605 1910
1606 $self 1911 $self
1607} 1912}
1608 1913
1609sub escape($) {
1610 local $_ = $_[0];
1611
1612 s/&/&amp;/g;
1613 s/>/&gt;/g;
1614 s/</&lt;/g;
1615
1616 $_
1617}
1618
1619sub update { 1914sub update {
1620 my ($self) = @_; 1915 my ($self) = @_;
1621 1916
1622 delete $self->{texture}; 1917 delete $self->{texture};
1623 $self->SUPER::update; 1918 $self->SUPER::update;
… …
1626sub realloc { 1921sub realloc {
1627 my ($self) = @_; 1922 my ($self) = @_;
1628 1923
1629 delete $self->{ox}; 1924 delete $self->{ox};
1630 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1926}
1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1631} 1932}
1632 1933
1633sub set_text { 1934sub set_text {
1634 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1635 1936
… …
1743 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
1744 2045
1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1747 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1748 }; 2051 };
1749 2052
1750 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2053# unless ($self->{list}) {
1751 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
1752 2055# CFPlus::OpenGL::glNewList $self->{list};
1753 $self->{layout}->render ($self->{ox}, $self->{oy}); 2056# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2057# CFPlus::OpenGL::glEndList;
2058# }
2059#
2060# CFPlus::OpenGL::glCallList $self->{list};
2061
2062 $self->{layout}->draw;
1754} 2063}
2064
2065#sub destroy {
2066# my ($self) = @_;
2067#
2068# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2069#
2070# $self->SUPER::destroy;
2071#}
1755 2072
1756############################################################################# 2073#############################################################################
1757 2074
1758package CFClient::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
1759 2076
1760our @ISA = CFClient::UI::Label::; 2077our @ISA = CFPlus::UI::Label::;
1761 2078
1762use CFClient::OpenGL; 2079use CFPlus::OpenGL;
1763 2080
1764sub new { 2081sub new {
1765 my $class = shift; 2082 my $class = shift;
1766 2083
1767 $class->SUPER::new ( 2084 $class->SUPER::new (
1768 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
1769 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
1770 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
1771 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
1772 can_hover => 1, 2091 can_hover => 1,
1773 can_focus => 1, 2092 can_focus => 1,
1774 valign => 0, 2093 valign => 0,
1775 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0,
1776 #text => ... 2096 #text => ...
1777 #hidden => "*", 2097 #hidden => "*",
1778 @_ 2098 @_
1779 ) 2099 )
1780} 2100}
… …
1825 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1826 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1827 2147
1828 my $text = $self->get_text; 2148 my $text = $self->get_text;
1829 2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2151
1830 if ($uni == 8) { 2152 if ($uni == 8) {
1831 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1833 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1834 } elsif ($sym == CFClient::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1835 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1836 } elsif ($sym == CFClient::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1837 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1838 } elsif ($sym == CFClient::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
2172 } elsif ($uni == 21) { # ctrl-u
2173 $text = "";
1839 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1840 } elsif ($sym == CFClient::SDLK_END) {
1841 $self->{cursor} = length $text;
1842 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1843 $self->emit ('escape'); 2176 $self->emit ('escape');
1844 } elsif ($uni) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1845 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else { 2181 } else {
1847 return 0; 2182 return 0;
1848 } 2183 }
1849 2184
1850 $self->_set_text ($text); 2185 $self->_set_text ($text);
1851 2186
1852 $self->realloc; 2187 $self->realloc;
2188 $self->update;
1853 2189
1854 1 2190 1
1855} 2191}
1856 2192
1857sub invoke_focus_in { 2193sub invoke_focus_in {
… …
1916 2252
1917 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
1918 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
1919 utf8::encode $text; 2255 utf8::encode $text;
1920 2256
1921 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1922 } 2258 }
1923 2259
1924 glColor @{$self->{fg}}; 2260 glColor_premultiply @{$self->{active_fg}};
1925 glBegin GL_LINES; 2261 glBegin GL_LINES;
1926 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928 glEnd; 2264 glEnd;
1929 }
1930}
1931 2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2284 glEnd;
2285 }
2286}
2287
2288#############################################################################
2289
1932package CFClient::UI::Entry; 2290package CFPlus::UI::Entry;
1933 2291
1934our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = CFPlus::UI::EntryBase::;
1935 2293
1936use CFClient::OpenGL; 2294use CFPlus::OpenGL;
1937 2295
1938sub invoke_key_down { 2296sub invoke_key_down {
1939 my ($self, $ev) = @_; 2297 my ($self, $ev) = @_;
1940 2298
1941 my $sym = $ev->{sym}; 2299 my $sym = $ev->{sym};
1942 2300
1943 if ($sym == 13) { 2301 if ($ev->{uni} == 0x0d || $sym == 13) {
1944 unshift @{$self->{history}}, 2302 unshift @{$self->{history}},
1945 my $txt = $self->get_text; 2303 my $txt = $self->get_text;
1946 2304
1947 $self->{history_pointer} = -1; 2305 $self->{history_pointer} = -1;
1948 $self->{history_saveback} = ''; 2306 $self->{history_saveback} = '';
1949 $self->emit (activate => $txt); 2307 $self->emit (activate => $txt);
1950 $self->update; 2308 $self->update;
1951 2309
1952 } elsif ($sym == CFClient::SDLK_UP) { 2310 } elsif ($sym == CFPlus::SDLK_UP) {
1953 if ($self->{history_pointer} < 0) { 2311 if ($self->{history_pointer} < 0) {
1954 $self->{history_saveback} = $self->get_text; 2312 $self->{history_saveback} = $self->get_text;
1955 } 2313 }
1956 if (@{$self->{history} || []} > 0) { 2314 if (@{$self->{history} || []} > 0) {
1957 $self->{history_pointer}++; 2315 $self->{history_pointer}++;
… …
1959 $self->{history_pointer} = @{$self->{history} || []} - 1; 2317 $self->{history_pointer} = @{$self->{history} || []} - 1;
1960 } 2318 }
1961 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1962 } 2320 }
1963 2321
1964 } elsif ($sym == CFClient::SDLK_DOWN) { 2322 } elsif ($sym == CFPlus::SDLK_DOWN) {
1965 $self->{history_pointer}--; 2323 $self->{history_pointer}--;
1966 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967 2325
1968 if ($self->{history_pointer} >= 0) { 2326 if ($self->{history_pointer} >= 0) {
1969 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2327 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1978 1 2336 1
1979} 2337}
1980 2338
1981############################################################################# 2339#############################################################################
1982 2340
2341package CFPlus::UI::TextEdit;
2342
2343our @ISA = CFPlus::UI::EntryBase::;
2344
2345use CFPlus::OpenGL;
2346
2347sub move_cursor_ver {
2348 my ($self, $dy) = @_;
2349
2350 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2351
2352 $y += $dy;
2353
2354 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2355 $self->{cursor} = $index;
2356 delete $self->{cur_h};
2357 $self->update;
2358 return;
2359 }
2360}
2361
2362sub invoke_key_down {
2363 my ($self, $ev) = @_;
2364
2365 my $sym = $ev->{sym};
2366
2367 if ($sym == CFPlus::SDLK_UP) {
2368 $self->move_cursor_ver (-1);
2369 } elsif ($sym == CFPlus::SDLK_DOWN) {
2370 $self->move_cursor_ver (+1);
2371 } else {
2372 return $self->SUPER::invoke_key_down ($ev)
2373 }
2374
2375 1
2376}
2377
2378#############################################################################
2379
1983package CFClient::UI::Button; 2380package CFPlus::UI::ButtonBin;
1984 2381
1985our @ISA = CFClient::UI::Label::; 2382our @ISA = CFPlus::UI::Bin::;
1986 2383
1987use CFClient::OpenGL; 2384use CFPlus::OpenGL;
1988 2385
1989my @tex = 2386my @tex =
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991 qw(b1_button_active.png); 2388 qw(b1_button_inactive.png b1_button_active.png);
1992 2389
1993sub new { 2390sub new {
1994 my $class = shift; 2391 my $class = shift;
1995 2392
1996 $class->SUPER::new ( 2393 $class->SUPER::new (
1997 padding_x => 4,
1998 padding_y => 4,
1999 fg => [1, 1, 1],
2000 active_fg => [0, 0, 1],
2001 can_hover => 1, 2394 can_hover => 1,
2002 align => 0, 2395 align => 0,
2003 valign => 0, 2396 valign => 0,
2004 can_events => 1, 2397 can_events => 1,
2005 @_ 2398 @_
… …
2017} 2410}
2018 2411
2019sub _draw { 2412sub _draw {
2020 my ($self) = @_; 2413 my ($self) = @_;
2021 2414
2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2023
2024 glEnable GL_TEXTURE_2D; 2415 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 glColor 0, 0, 0, 1; 2417 glColor 0, 0, 0, 1;
2027 2418
2419 my $tex = $tex[$GRAB == $self];
2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2420 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2029 2421
2030 glDisable GL_TEXTURE_2D; 2422 glDisable GL_TEXTURE_2D;
2031 2423
2032 $self->SUPER::_draw; 2424 $self->SUPER::_draw;
2033} 2425}
2034 2426
2035############################################################################# 2427#############################################################################
2036 2428
2429package CFPlus::UI::Button;
2430
2431our @ISA = CFPlus::UI::Label::;
2432
2433use CFPlus::OpenGL;
2434
2435my @tex =
2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2437 qw(b1_button_inactive.png b1_button_active.png);
2438
2439sub new {
2440 my $class = shift;
2441
2442 $class->SUPER::new (
2443 padding_x => 4,
2444 padding_y => 4,
2445 fg => [1.0, 1.0, 1.0],
2446 active_fg => [0.8, 0.8, 0.8],
2447 can_hover => 1,
2448 align => 0,
2449 valign => 0,
2450 can_events => 1,
2451 @_
2452 )
2453}
2454
2455sub invoke_button_up {
2456 my ($self, $ev, $x, $y) = @_;
2457
2458 $self->emit ("activate")
2459 if $x >= 0 && $x < $self->{w}
2460 && $y >= 0 && $y < $self->{h};
2461
2462 1
2463}
2464
2465sub _draw {
2466 my ($self) = @_;
2467
2468 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2469
2470 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 0, 0, 0, 1;
2473
2474 my $tex = $tex[$GRAB == $self];
2475 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2476
2477 glDisable GL_TEXTURE_2D;
2478
2479 $self->SUPER::_draw;
2480}
2481
2482#############################################################################
2483
2484package CFPlus::UI::CheckBox;
2485
2486our @ISA = CFPlus::UI::DrawBG::;
2487
2488my @tex =
2489 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2490 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2491
2492use CFPlus::OpenGL;
2493
2494sub new {
2495 my $class = shift;
2496
2497 $class->SUPER::new (
2498 padding_x => 2,
2499 padding_y => 2,
2500 fg => [1, 1, 1],
2501 active_fg => [1, 1, 0],
2502 bg => [0, 0, 0, 0.2],
2503 active_bg => [1, 1, 1, 0.5],
2504 state => 0,
2505 can_hover => 1,
2506 @_
2507 )
2508}
2509
2510sub size_request {
2511 my ($self) = @_;
2512
2513 (6) x 2
2514}
2515
2516sub toggle {
2517 my ($self) = @_;
2518
2519 $self->{state} = !$self->{state};
2520 $self->emit (changed => $self->{state});
2521 $self->update;
2522}
2523
2524sub invoke_button_down {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2528 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2529 $self->toggle;
2530 } else {
2531 return 0
2532 }
2533
2534 1
2535}
2536
2537sub _draw {
2538 my ($self) = @_;
2539
2540 $self->SUPER::_draw;
2541
2542 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2543
2544 my ($w, $h) = @$self{qw(w h)};
2545
2546 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2547
2548 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2549
2550 my $tex = $self->{state} ? $tex[1] : $tex[0];
2551
2552 glEnable GL_TEXTURE_2D;
2553 $tex->draw_quad_alpha (0, 0, $s, $s);
2554 glDisable GL_TEXTURE_2D;
2555}
2556
2557#############################################################################
2558
2559package CFPlus::UI::Image;
2560
2561our @ISA = CFPlus::UI::Base::;
2562
2563use CFPlus::OpenGL;
2564
2565our %texture_cache;
2566
2567sub new {
2568 my $class = shift;
2569
2570 my $self = $class->SUPER::new (
2571 can_events => 0,
2572 scale => 1,
2573 @_,
2574 );
2575
2576 $self->{path} || $self->{tex}
2577 or Carp::croak "'path' or 'tex' attributes required";
2578
2579 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2580 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2581
2582 CFPlus::weaken $texture_cache{$self->{path}};
2583
2584 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2585
2586 $self
2587}
2588
2589sub STORABLE_freeze {
2590 my ($self, $cloning) = @_;
2591
2592 $self->{path}
2593 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2594
2595 $self->{path}
2596}
2597
2598sub STORABLE_attach {
2599 my ($self, $cloning, $path) = @_;
2600
2601 $self->new (path => $path)
2602}
2603
2604sub size_request {
2605 my ($self) = @_;
2606
2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2608}
2609
2610sub _draw {
2611 my ($self) = @_;
2612
2613 my $tex = $self->{tex};
2614
2615 my ($w, $h) = ($self->{w}, $self->{h});
2616
2617 if ($self->{rot90}) {
2618 glRotate 90, 0, 0, 1;
2619 glTranslate 0, -$self->{w}, 0;
2620
2621 ($w, $h) = ($h, $w);
2622 }
2623
2624 glEnable GL_TEXTURE_2D;
2625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2626
2627 $tex->draw_quad_alpha (0, 0, $w, $h);
2628
2629 glDisable GL_TEXTURE_2D;
2630}
2631
2632#############################################################################
2633
2037package CFClient::UI::ImageButton; 2634package CFPlus::UI::ImageButton;
2038 2635
2039our @ISA = CFClient::UI::Image::; 2636our @ISA = CFPlus::UI::Image::;
2040 2637
2041use CFClient::OpenGL; 2638use CFPlus::OpenGL;
2042 2639
2043my %textures; 2640my %textures;
2044 2641
2045sub new { 2642sub new {
2046 my $class = shift; 2643 my $class = shift;
… …
2056 can_events => 1, 2653 can_events => 1,
2057 @_ 2654 @_
2058 ); 2655 );
2059} 2656}
2060 2657
2658sub invoke_button_down {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 1
2662}
2663
2061sub invoke_button_up { 2664sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_; 2665 my ($self, $ev, $x, $y) = @_;
2063 2666
2064 $self->emit ("activate") 2667 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w} 2668 if $x >= 0 && $x < $self->{w}
… …
2068 1 2671 1
2069} 2672}
2070 2673
2071############################################################################# 2674#############################################################################
2072 2675
2073package CFClient::UI::CheckBox;
2074
2075our @ISA = CFClient::UI::DrawBG::;
2076
2077my @tex =
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081use CFClient::OpenGL;
2082
2083sub new {
2084 my $class = shift;
2085
2086 $class->SUPER::new (
2087 padding_x => 2,
2088 padding_y => 2,
2089 fg => [1, 1, 1],
2090 active_fg => [1, 1, 0],
2091 bg => [0, 0, 0, 0.2],
2092 active_bg => [1, 1, 1, 0.5],
2093 state => 0,
2094 can_hover => 1,
2095 @_
2096 )
2097}
2098
2099sub size_request {
2100 my ($self) = @_;
2101
2102 (6) x 2
2103}
2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2113sub invoke_button_down {
2114 my ($self, $ev, $x, $y) = @_;
2115
2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118 $self->toggle;
2119 } else {
2120 return 0
2121 }
2122
2123 1
2124}
2125
2126sub _draw {
2127 my ($self) = @_;
2128
2129 $self->SUPER::_draw;
2130
2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133 my ($w, $h) = @$self{qw(w h)};
2134
2135 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141 glEnable GL_TEXTURE_2D;
2142 $tex->draw_quad_alpha (0, 0, $s, $s);
2143 glDisable GL_TEXTURE_2D;
2144}
2145
2146#############################################################################
2147
2148package CFClient::UI::Image; 2676package CFPlus::UI::VGauge;
2149 2677
2150our @ISA = CFClient::UI::Base::; 2678our @ISA = CFPlus::UI::Base::;
2151
2152use CFClient::OpenGL;
2153
2154our %texture_cache;
2155
2156sub new {
2157 my $class = shift;
2158
2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2163
2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2166
2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174 $self
2175}
2176
2177sub size_request {
2178 my ($self) = @_;
2179
2180 ($self->{tex}{w}, $self->{tex}{h})
2181}
2182
2183sub _draw {
2184 my ($self) = @_;
2185
2186 my $tex = $self->{tex};
2187
2188 my ($w, $h) = ($self->{w}, $self->{h});
2189
2190 if ($self->{rot90}) {
2191 glRotate 90, 0, 0, 1;
2192 glTranslate 0, -$self->{w}, 0;
2193
2194 ($w, $h) = ($h, $w);
2195 }
2196
2197 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200 $tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::VGauge;
2208
2209our @ISA = CFClient::UI::Base::;
2210 2679
2211use List::Util qw(min max); 2680use List::Util qw(min max);
2212 2681
2213use CFClient::OpenGL; 2682use CFPlus::OpenGL;
2214 2683
2215my %tex = ( 2684my %tex = (
2216 food => [ 2685 food => [
2217 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2686 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2687 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219 ], 2688 ],
2220 grace => [ 2689 grace => [
2221 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2690 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2691 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223 ], 2692 ],
2224 hp => [ 2693 hp => [
2225 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2694 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2695 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227 ], 2696 ],
2228 mana => [ 2697 mana => [
2229 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2698 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2699 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231 ], 2700 ],
2232); 2701);
2233 2702
2234# eg. VGauge->new (gauge => 'food'), default gauge: food 2703# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2337 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2338} 2807}
2339 2808
2340############################################################################# 2809#############################################################################
2341 2810
2342package CFClient::UI::Gauge; 2811package CFPlus::UI::Gauge;
2343 2812
2344our @ISA = CFClient::UI::VBox::; 2813our @ISA = CFPlus::UI::VBox::;
2345 2814
2346sub new { 2815sub new {
2347 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2348 2817
2349 my $self = $class->SUPER::new ( 2818 my $self = $class->SUPER::new (
… …
2351 can_hover => 1, 2820 can_hover => 1,
2352 can_events => 1, 2821 can_events => 1,
2353 %arg, 2822 %arg,
2354 ); 2823 );
2355 2824
2356 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2825 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2826 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2827 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359 2828
2360 $self 2829 $self
2361} 2830}
2362 2831
2363sub set_fontsize { 2832sub set_fontsize {
… …
2384 $self->{value}->set_text ($val); 2853 $self->{value}->set_text ($val);
2385} 2854}
2386 2855
2387############################################################################# 2856#############################################################################
2388 2857
2389package CFClient::UI::Slider; 2858package CFPlus::UI::Slider;
2390 2859
2391use strict; 2860use strict;
2392 2861
2393use CFClient::OpenGL; 2862use CFPlus::OpenGL;
2394 2863
2395our @ISA = CFClient::UI::DrawBG::; 2864our @ISA = CFPlus::UI::DrawBG::;
2396 2865
2397my @tex = 2866my @tex =
2398 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2867 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399 qw(s1_slider.png s1_slider_bg.png); 2868 qw(s1_slider.png s1_slider_bg.png);
2400 2869
2401sub new { 2870sub new {
2402 my $class = shift; 2871 my $class = shift;
2403 2872
… …
2471 2940
2472 $self->SUPER::invoke_button_down ($ev, $x, $y); 2941 $self->SUPER::invoke_button_down ($ev, $x, $y);
2473 2942
2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2943 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2475 2944
2476 $self->invoke_mouse_motion ($ev, $x, $y) 2945 $self->invoke_mouse_motion ($ev, $x, $y);
2946
2947 1
2477} 2948}
2478 2949
2479sub invoke_mouse_motion { 2950sub invoke_mouse_motion {
2480 my ($self, $ev, $x, $y) = @_; 2951 my ($self, $ev, $x, $y) = @_;
2481 2952
… …
2497sub invoke_mouse_wheel { 2968sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_; 2969 my ($self, $ev) = @_;
2499 2970
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2971 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501 2972
2973 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2974
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 2975 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503 2976
2504 ! ! $delta 2977 1
2505} 2978}
2506 2979
2507sub update { 2980sub update {
2508 my ($self) = @_; 2981 my ($self) = @_;
2509 2982
… …
2558 glDisable GL_TEXTURE_2D; 3031 glDisable GL_TEXTURE_2D;
2559} 3032}
2560 3033
2561############################################################################# 3034#############################################################################
2562 3035
2563package CFClient::UI::ValSlider; 3036package CFPlus::UI::ValSlider;
2564 3037
2565our @ISA = CFClient::UI::HBox::; 3038our @ISA = CFPlus::UI::HBox::;
2566 3039
2567sub new { 3040sub new {
2568 my ($class, %arg) = @_; 3041 my ($class, %arg) = @_;
2569 3042
2570 my $range = delete $arg{range}; 3043 my $range = delete $arg{range};
2571 3044
2572 my $self = $class->SUPER::new ( 3045 my $self = $class->SUPER::new (
2573 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3046 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3047 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575 to_value => sub { shift }, 3048 to_value => sub { shift },
2576 from_value => sub { shift }, 3049 from_value => sub { shift },
2577 %arg, 3050 %arg,
2578 ); 3051 );
2579 3052
… …
2599sub set_range { shift->{slider}->set_range (@_) } 3072sub set_range { shift->{slider}->set_range (@_) }
2600sub set_value { shift->{slider}->set_value (@_) } 3073sub set_value { shift->{slider}->set_value (@_) }
2601 3074
2602############################################################################# 3075#############################################################################
2603 3076
2604package CFClient::UI::TextScroller; 3077package CFPlus::UI::TextScroller;
2605 3078
2606our @ISA = CFClient::UI::HBox::; 3079our @ISA = CFPlus::UI::HBox::;
2607 3080
2608use CFClient::OpenGL; 3081use CFPlus::OpenGL;
2609 3082
2610sub new { 3083sub new {
2611 my $class = shift; 3084 my $class = shift;
2612 3085
2613 my $self = $class->SUPER::new ( 3086 my $self = $class->SUPER::new (
… …
2615 can_events => 1, 3088 can_events => 1,
2616 indent => 0, 3089 indent => 0,
2617 #font => default_font 3090 #font => default_font
2618 @_, 3091 @_,
2619 3092
2620 layout => (new CFClient::Layout), 3093 layout => (new CFPlus::Layout),
2621 par => [], 3094 par => [],
3095 max_par => 0,
2622 height => 0, 3096 height => 0,
2623 children => [ 3097 children => [
2624 (new CFClient::UI::Empty expand => 1), 3098 (new CFPlus::UI::Empty expand => 1),
2625 (new CFClient::UI::Slider vertical => 1), 3099 (new CFPlus::UI::Slider vertical => 1),
2626 ], 3100 ],
2627 ); 3101 );
2628 3102
2629 $self->{children}[1]->connect (changed => sub { $self->update }); 3103 $self->{children}[1]->connect (changed => sub { $self->update });
2630 3104
… …
2639} 3113}
2640 3114
2641sub size_request { 3115sub size_request {
2642 my ($self) = @_; 3116 my ($self) = @_;
2643 3117
2644 my ($empty, $slider) = @{ $self->{children} }; 3118 my ($empty, $slider) = $self->visible_children;
2645 3119
2646 local $self->{children} = [$empty, $slider]; 3120 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request 3121 $self->SUPER::size_request
2648} 3122}
2649 3123
… …
2707 3181
2708 # todo: base offset on lines or so, not on pixels 3182 # todo: base offset on lines or so, not on pixels
2709 $self->{children}[1]->set_value ($offset); 3183 $self->{children}[1]->set_value ($offset);
2710} 3184}
2711 3185
3186sub current_paragraph {
3187 my ($self) = @_;
3188
3189 $self->{top_paragraph} - 1
3190}
3191
3192sub scroll_to {
3193 my ($self, $para) = @_;
3194
3195 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3196
3197 $self->{scroll_to} = $para;
3198 $self->update;
3199}
3200
2712sub clear { 3201sub clear {
2713 my ($self) = @_; 3202 my ($self) = @_;
2714 3203
2715 my (undef, undef, @other) = @{ $self->{children} }; 3204 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other; 3205 $self->remove ($_) for @other;
… …
2719 $self->{height} = 0; 3208 $self->{height} = 0;
2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3209 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721} 3210}
2722 3211
2723sub add_paragraph { 3212sub add_paragraph {
2724 my ($self, $color, $para, $indent) = @_; 3213 my $self = shift;
2725 3214
2726 my ($text, @w) = ref $para ? @$para : $para; 3215 for my $para (@_) {
2727
2728 $para = { 3216 $para = {
3217 fg => [1, 1, 1, 1],
3218 indent => 0,
3219 markup => "",
3220 widget => [],
3221 ref $para ? %$para : (markup => $para),
2729 w => 1e10, 3222 w => 1e10,
2730 wrapped => 1, 3223 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2735 }; 3224 };
2736 3225
2737 $self->add (@w) if @w; 3226 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738 push @{$self->{par}}, $para; 3227 push @{$self->{par}}, $para;
3228 }
3229
3230 if (my $max = $self->{max_par}) {
3231 shift @{$self->{par}} while @{$self->{par}} > $max;
3232 }
2739 3233
2740 $self->{need_reflow}++; 3234 $self->{need_reflow}++;
2741 $self->update; 3235 $self->update;
2742} 3236}
2743 3237
2744sub scroll_to_bottom { 3238sub scroll_to_bottom {
2745 my ($self) = @_; 3239 my ($self) = @_;
2746 3240
2747 $self->{scroll_to_bottom} = 1; 3241 $self->{scroll_to} = $#{$self->{par}};
2748 $self->update; 3242 $self->update;
2749} 3243}
2750 3244
3245sub force_uptodate {
3246 my ($self) = @_;
3247
3248 if (delete $self->{need_reflow}) {
3249 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3250
3251 my $height = 0;
3252
3253 for my $para (@{$self->{par}}) {
3254 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3255 my $layout = $self->get_layout ($para);
3256 my ($w, $h) = $layout->size;
3257
3258 $para->{w} = $w + $para->{indent};
3259 $para->{h} = $h;
3260 $para->{wrapped} = $layout->has_wrapped;
3261 }
3262
3263 $para->{y} = $height;
3264 $height += $para->{h};
3265 }
3266
3267 $self->{height} = $height;
3268 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3269
3270 delete $self->{texture};
3271 }
3272
3273 if (my $paridx = delete $self->{scroll_to}) {
3274 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3275 }
3276}
3277
2751sub update { 3278sub update {
2752 my ($self) = @_; 3279 my ($self) = @_;
2753 3280
2754 $self->SUPER::update; 3281 $self->SUPER::update;
2755 3282
2756 return unless $self->{h} > 0; 3283 return unless $self->{h} > 0;
2757 3284
2758 delete $self->{texture}; 3285 delete $self->{texture};
2759 3286
2760 $ROOT->on_post_alloc ($self => sub { 3287 $ROOT->on_post_alloc ($self => sub {
3288 $self->force_uptodate;
3289
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3290 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762 3291
2763 if (delete $self->{need_reflow}) {
2764 my $height = 0;
2765
2766 for my $para (@{$self->{par}}) {
2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768 my $layout = $self->get_layout ($para);
2769 my ($w, $h) = $layout->size;
2770
2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2774 }
2775
2776 $height += $para->{h};
2777 }
2778
2779 $self->{height} = $height;
2780
2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3292 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791 glClearColor 0, 0, 0, 0; 3293 glClearColor 0, 0, 0, 0;
2792 glClear GL_COLOR_BUFFER_BIT; 3294 glClear GL_COLOR_BUFFER_BIT;
2793 3295
3296 package CFPlus::UI::Base;
3297 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3298 (0, 0, $self->{w}, $self->{h});
3299
3300 my $top = int $self->{children}[1]{range}[0];
3301
3302 my $paridx = 0;
3303 my $top_paragraph;
2794 my $top = int $self->{children}[1]{range}[0]; 3304 my $top = int $self->{children}[1]{range}[0];
2795 3305
2796 my $y0 = $top; 3306 my $y0 = $top;
2797 my $y1 = $top + $H; 3307 my $y1 = $top + $H;
2798 3308
2799 my $y = 0;
2800
2801 for my $para (@{$self->{par}}) { 3309 for my $para (@{$self->{par}}) {
2802 my $h = $para->{h}; 3310 my $h = $para->{h};
3311 my $y = $para->{y};
2803 3312
2804 if ($y0 < $y + $h && $y < $y1) { 3313 if ($y0 < $y + $h && $y < $y1) {
2805
2806 my $layout = $self->get_layout ($para); 3314 my $layout = $self->get_layout ($para);
2807 3315
2808 $layout->render ($para->{indent}, $y - $y0); 3316 $layout->render ($para->{indent}, $y - $y0);
3317 $layout->draw;
2809 3318
2810 if (my @w = @{ $para->{widget} }) { 3319 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes; 3320 my @s = $layout->get_shapes;
2812 3321
2813 for (@w) { 3322 for (@w) {
… …
2819 $_->draw; 3328 $_->draw;
2820 } 3329 }
2821 } 3330 }
2822 } 3331 }
2823 3332
2824 $y += $h; 3333 $paridx++;
3334 $top_paragraph ||= $paridx if $y >= $top;
2825 } 3335 }
3336
3337 $self->{top_paragraph} = $top_paragraph;
2826 }; 3338 };
2827 }); 3339 });
2828} 3340}
2829 3341
2830sub reconfigure { 3342sub reconfigure {
… …
2848 $self->{children}[1]->draw; 3360 $self->{children}[1]->draw;
2849} 3361}
2850 3362
2851############################################################################# 3363#############################################################################
2852 3364
2853package CFClient::UI::Animator; 3365package CFPlus::UI::Animator;
2854 3366
2855use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2856 3368
2857our @ISA = CFClient::UI::Bin::; 3369our @ISA = CFPlus::UI::Bin::;
2858 3370
2859sub moveto { 3371sub moveto {
2860 my ($self, $x, $y) = @_; 3372 my ($self, $x, $y) = @_;
2861 3373
2862 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3374 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2890 glPopMatrix; 3402 glPopMatrix;
2891} 3403}
2892 3404
2893############################################################################# 3405#############################################################################
2894 3406
2895package CFClient::UI::Flopper; 3407package CFPlus::UI::Flopper;
2896 3408
2897our @ISA = CFClient::UI::Button::; 3409our @ISA = CFPlus::UI::Button::;
2898 3410
2899sub new { 3411sub new {
2900 my $class = shift; 3412 my $class = shift;
2901 3413
2902 my $self = $class->SUPER::new ( 3414 my $self = $class->SUPER::new (
… …
2914 $self->{other}->toggle_visibility; 3426 $self->{other}->toggle_visibility;
2915} 3427}
2916 3428
2917############################################################################# 3429#############################################################################
2918 3430
2919package CFClient::UI::Tooltip; 3431package CFPlus::UI::Tooltip;
2920 3432
2921our @ISA = CFClient::UI::Bin::; 3433our @ISA = CFPlus::UI::Bin::;
2922 3434
2923use CFClient::OpenGL; 3435use CFPlus::OpenGL;
2924 3436
2925sub new { 3437sub new {
2926 my $class = shift; 3438 my $class = shift;
2927 3439
2928 $class->SUPER::new ( 3440 $class->SUPER::new (
… …
2931 ) 3443 )
2932} 3444}
2933 3445
2934sub set_tooltip_from { 3446sub set_tooltip_from {
2935 my ($self, $widget) = @_; 3447 my ($self, $widget) = @_;
3448
3449 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3450 if $widget->{tooltip} =~ /^#(.*)$/;
2936 3451
2937 my $tooltip = $widget->{tooltip}; 3452 my $tooltip = $widget->{tooltip};
2938 3453
2939 if ($ENV{CFPLUS_DEBUG} & 2) { 3454 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n" 3455 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2944 } 3459 }
2945 3460
2946 $tooltip =~ s/^\n+//; 3461 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//; 3462 $tooltip =~ s/\n+$//;
2948 3463
2949 $self->add (new CFClient::UI::Label 3464 $self->add (new CFPlus::UI::Label
2950 markup => $tooltip, 3465 markup => $tooltip,
2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3466 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952 fontsize => 0.8, 3467 fontsize => 0.8,
2953 fg => [0, 0, 0, 1], 3468 style => 1, # FLAG_INVERSE
2954 ellipsise => 0, 3469 ellipsise => 0,
2955 font => ($widget->{tooltip_font} || $::FONT_PROP), 3470 font => ($widget->{tooltip_font} || $::FONT_PROP),
2956 ); 3471 );
2957} 3472}
2958 3473
… …
2977 3492
2978 $self->{root}->on_post_alloc ("move_$self" => sub { 3493 $self->{root}->on_post_alloc ("move_$self" => sub {
2979 my $widget = $self->{owner} 3494 my $widget = $self->{owner}
2980 or return; 3495 or return;
2981 3496
3497 if ($widget->{visible}) {
2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3498 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983 3499
2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3500 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985 if $x + $self->{w} > $self->{root}{w}; 3501 if $x + $self->{w} > $self->{root}{w};
2986 3502
2987 $self->move_abs ($x, $y); 3503 $self->move_abs ($x, $y);
3504 } else {
3505 $self->hide;
3506 }
2988 }); 3507 });
2989} 3508}
2990 3509
2991sub _draw { 3510sub _draw {
2992 my ($self) = @_; 3511 my ($self) = @_;
… …
2994 glTranslate 0.375, 0.375; 3513 glTranslate 0.375, 0.375;
2995 3514
2996 my ($w, $h) = @$self{qw(w h)}; 3515 my ($w, $h) = @$self{qw(w h)};
2997 3516
2998 glColor 1, 0.8, 0.4; 3517 glColor 1, 0.8, 0.4;
2999 glBegin GL_QUADS; 3518 glRect 0, 0, $w, $h;
3000 glVertex 0 , 0;
3001 glVertex 0 , $h;
3002 glVertex $w, $h;
3003 glVertex $w, 0;
3004 glEnd;
3005 3519
3006 glColor 0, 0, 0; 3520 glColor 0, 0, 0;
3007 glBegin GL_LINE_LOOP; 3521 glBegin GL_LINE_LOOP;
3008 glVertex 0 , 0; 3522 glVertex 0 , 0;
3009 glVertex 0 , $h; 3523 glVertex 0 , $h;
… …
3016 $self->SUPER::_draw; 3530 $self->SUPER::_draw;
3017} 3531}
3018 3532
3019############################################################################# 3533#############################################################################
3020 3534
3021package CFClient::UI::Face; 3535package CFPlus::UI::Face;
3022 3536
3023our @ISA = CFClient::UI::Base::; 3537our @ISA = CFPlus::UI::DrawBG::;
3024 3538
3025use CFClient::OpenGL; 3539use CFPlus::OpenGL;
3026 3540
3027sub new { 3541sub new {
3028 my $class = shift; 3542 my $class = shift;
3029 3543
3030 my $self = $class->SUPER::new ( 3544 my $self = $class->SUPER::new (
3545 size_w => 32,
3546 size_h => 8,
3031 aspect => 1, 3547 aspect => 1,
3032 can_events => 0, 3548 can_events => 0,
3033 @_, 3549 @_,
3034 ); 3550 );
3035 3551
3036 if ($self->{anim} && $self->{animspeed}) { 3552 if ($self->{anim} && $self->{animspeed}) {
3037 Scalar::Util::weaken (my $widget = $self); 3553 CFPlus::weaken (my $widget = $self);
3038 3554
3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3039 $self->{timer} = Event->timer ( 3557 $self->{timer} = Event->timer (
3040 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041 hard => 1, 3558 parked => 1,
3042 interval => $self->{animspeed},
3043 cb => sub { 3559 cb => sub {
3560 return unless $::CONN;
3561
3562 my $w = $widget
3563 or return;
3564
3044 ++$widget->{frame}; 3565 ++$w->{frame};
3566 $w->update_face;
3567
3568 # somehow, $widget can go away
3045 $widget->update; 3569 $w->update;
3570 $w->update_timer;
3046 }, 3571 },
3047 ); 3572 );
3573
3574 $self->update_face;
3575 $self->update_timer;
3048 } 3576 }
3049 3577
3050 $self 3578 $self
3051} 3579}
3052 3580
3581sub update_timer {
3582 my ($self) = @_;
3583
3584 return unless $self->{timer};
3585
3586 if ($self->{visible}) {
3587 $self->{timer}->at (
3588 $self->{anim_start}
3589 + $self->{animspeed}
3590 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3591 );
3592 $self->{timer}->start;
3593 } else {
3594 $self->{timer}->stop;
3595 }
3596}
3597
3598sub update_face {
3599 my ($self) = @_;
3600
3601 if ($::CONN) {
3602 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3603 if ($anim && @$anim) {
3604 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3605 delete $self->{face_change_cb};
3606
3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3608 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure });
3610 }
3611 }
3612 }
3613 }
3614 }
3615}
3616
3053sub size_request { 3617sub size_request {
3054 (32, 8) 3618 my ($self) = @_;
3619
3620 if ($::CONN) {
3621 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3622 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3623 if ($tex->{name}) {
3624 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3625 } elsif (!$tex->{loading}) {
3626 $tex->upload (sub { $self->reconfigure });
3627 }
3628 }
3629
3630 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3631 }
3632 }
3633
3634 ($self->{size_w} || 8, $self->{size_h} || 8)
3055} 3635}
3056 3636
3057sub update { 3637sub update {
3058 my ($self) = @_; 3638 my ($self) = @_;
3059 3639
3060 return unless $self->{visible}; 3640 return unless $self->{visible};
3061 3641
3062 $self->SUPER::update; 3642 $self->SUPER::update;
3063} 3643}
3064 3644
3645sub invoke_visibility_change {
3646 my ($self) = @_;
3647
3648 $self->update_timer;
3649
3650 0
3651}
3652
3065sub _draw { 3653sub _draw {
3066 my ($self) = @_; 3654 my ($self) = @_;
3067 3655
3068 return unless $::CONN; 3656 $self->SUPER::_draw;
3069 3657
3070 my $face; 3658 if (my $tex = $self->{tex}) {
3071
3072 if ($self->{frame}) {
3073 my $anim = $::CONN->{anim}[$self->{anim}];
3074
3075 $face = $anim->[ $self->{frame} % @$anim ]
3076 if $anim && @$anim;
3077 }
3078
3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3080
3081 if ($tex) {
3082 glEnable GL_TEXTURE_2D; 3659 glEnable GL_TEXTURE_2D;
3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084 glColor 0, 0, 0, 1; 3661 glColor 0, 0, 0, 1;
3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3662 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3086 glDisable GL_TEXTURE_2D; 3663 glDisable GL_TEXTURE_2D;
… …
3088} 3665}
3089 3666
3090sub destroy { 3667sub destroy {
3091 my ($self) = @_; 3668 my ($self) = @_;
3092 3669
3093 $self->{timer}->cancel 3670 (delete $self->{timer})->cancel
3094 if $self->{timer}; 3671 if $self->{timer};
3095 3672
3096 $self->SUPER::destroy; 3673 $self->SUPER::destroy;
3097} 3674}
3098 3675
3099############################################################################# 3676#############################################################################
3100 3677
3101package CFClient::UI::Buttonbar; 3678package CFPlus::UI::Buttonbar;
3102 3679
3103our @ISA = CFClient::UI::HBox::; 3680our @ISA = CFPlus::UI::HBox::;
3104 3681
3105# TODO: should actualyl wrap buttons and other goodies. 3682# TODO: should actually wrap buttons and other goodies.
3106 3683
3107############################################################################# 3684#############################################################################
3108 3685
3109package CFClient::UI::Menu; 3686package CFPlus::UI::Menu;
3110 3687
3111our @ISA = CFClient::UI::FancyFrame::; 3688our @ISA = CFPlus::UI::Toplevel::;
3112 3689
3113use CFClient::OpenGL; 3690use CFPlus::OpenGL;
3114 3691
3115sub new { 3692sub new {
3116 my $class = shift; 3693 my $class = shift;
3117 3694
3118 my $self = $class->SUPER::new ( 3695 my $self = $class->SUPER::new (
3119 items => [], 3696 items => [],
3120 z => 100, 3697 z => 100,
3121 @_, 3698 @_,
3122 ); 3699 );
3123 3700
3124 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3701 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125 3702
3126 for my $item (@{ $self->{items} }) { 3703 for my $item (@{ $self->{items} }) {
3127 my ($widget, $cb, $tooltip) = @$item; 3704 my ($widget, $cb, $tooltip) = @$item;
3128 3705
3129 # handle various types of items, only text for now 3706 # handle various types of items, only text for now
3130 if (!ref $widget) { 3707 if (!ref $widget) {
3131 if ($widget =~ /\t/) { 3708 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2; 3709 my ($left, $right) = split /\t/, $widget, 2;
3133 3710
3134 $widget = new CFClient::UI::HBox 3711 $widget = new CFPlus::UI::HBox
3135 can_hover => 1, 3712 can_hover => 1,
3136 can_events => 1, 3713 can_events => 1,
3137 tooltip => $tooltip, 3714 tooltip => $tooltip,
3138 children => [ 3715 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1), 3716 (new CFPlus::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1), 3717 (new CFPlus::UI::Label markup => $right, align => +1),
3141 ], 3718 ],
3142 ; 3719 ;
3143 3720
3144 } else { 3721 } else {
3145 $widget = new CFClient::UI::Label 3722 $widget = new CFPlus::UI::Label
3146 can_hover => 1, 3723 can_hover => 1,
3147 can_events => 1, 3724 can_events => 1,
3148 markup => $widget, 3725 markup => $widget,
3149 tooltip => $tooltip; 3726 tooltip => $tooltip;
3150 } 3727 }
… …
3198 1 3775 1
3199} 3776}
3200 3777
3201############################################################################# 3778#############################################################################
3202 3779
3203package CFClient::UI::Multiplexer; 3780package CFPlus::UI::Multiplexer;
3204 3781
3205our @ISA = CFClient::UI::Container::; 3782our @ISA = CFPlus::UI::Container::;
3206 3783
3207sub new { 3784sub new {
3208 my $class = shift; 3785 my $class = shift;
3209 3786
3210 my $self = $class->SUPER::new ( 3787 my $self = $class->SUPER::new (
… …
3271 $self->{current}->draw; 3848 $self->{current}->draw;
3272} 3849}
3273 3850
3274############################################################################# 3851#############################################################################
3275 3852
3276package CFClient::UI::Notebook; 3853package CFPlus::UI::Notebook;
3277 3854
3278our @ISA = CFClient::UI::VBox::; 3855our @ISA = CFPlus::UI::VBox::;
3279 3856
3280sub new { 3857sub new {
3281 my $class = shift; 3858 my $class = shift;
3282 3859
3283 my $self = $class->SUPER::new ( 3860 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar), 3861 buttonbar => (new CFPlus::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3862 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self 3863 # filter => # will be put between multiplexer and $self
3287 @_, 3864 @_,
3288 ); 3865 );
3289 3866
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3867 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3291 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3868 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3292 3869
3870 {
3871 Scalar::Util::weaken (my $wself = $self);
3872
3873 $self->{multiplexer}->connect (c_add => sub {
3874 my ($mplex, $widgets) = @_;
3875
3876 for my $child (@$widgets) {
3877 Scalar::Util::weaken $child;
3878 $child->{c_tab_} ||= do {
3879 my $tab =
3880 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3881 ? $child->{c_tab}
3882 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3883
3884 $tab->connect (activate => sub {
3885 $wself->set_current_page ($child);
3886 });
3887
3888 $tab
3889 };
3890
3891 $self->{buttonbar}->add ($child->{c_tab_});
3892 }
3893 });
3894
3895 $self->{multiplexer}->connect (c_remove => sub {
3896 my ($mplex, $widgets) = @_;
3897
3898 for my $child (@$widgets) {
3899 $wself->{buttonbar}->remove ($child->{c_tab_});
3900 }
3901 });
3902 }
3903
3293 $self 3904 $self
3294} 3905}
3295 3906
3296sub add { 3907sub add {
3908 my ($self, @widgets) = @_;
3909
3910 $self->{multiplexer}->add (@widgets)
3911}
3912
3913sub remove {
3914 my ($self, @widgets) = @_;
3915
3916 $self->{multiplexer}->remove (@widgets)
3917}
3918
3919sub pages {
3920 my ($self) = @_;
3921 $self->{multiplexer}->children
3922}
3923
3924sub add_tab {
3297 my ($self, $title, $widget, $tooltip) = @_; 3925 my ($self, $title, $widget, $tooltip) = @_;
3298 3926
3299 Scalar::Util::weaken $self; 3927 $title = [$title, $tooltip] unless ref $title;
3928 $widget->{c_tab} = $title;
3300 3929
3301 $self->{buttonbar}->add (new CFClient::UI::Button
3302 markup => $title,
3303 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) },
3305 );
3306
3307 $self->{multiplexer}->add ($widget); 3930 $self->add ($widget);
3308} 3931}
3309 3932
3310sub get_current_page { 3933sub get_current_page {
3311 my ($self) = @_; 3934 my ($self) = @_;
3312 3935
… …
3320 $self->emit (page_changed => $self->{multiplexer}{current}); 3943 $self->emit (page_changed => $self->{multiplexer}{current});
3321} 3944}
3322 3945
3323############################################################################# 3946#############################################################################
3324 3947
3325package CFClient::UI::Combobox; 3948package CFPlus::UI::Selector;
3326 3949
3327use utf8; 3950use utf8;
3328 3951
3329our @ISA = CFClient::UI::Button::; 3952our @ISA = CFPlus::UI::Button::;
3330 3953
3331sub new { 3954sub new {
3332 my $class = shift; 3955 my $class = shift;
3333 3956
3334 my $self = $class->SUPER::new ( 3957 my $self = $class->SUPER::new (
… …
3351 my ($value, $title, $tooltip) = @$_; 3974 my ($value, $title, $tooltip) = @$_;
3352 3975
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3976 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 } 3977 }
3355 3978
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3979 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357} 3980}
3358 3981
3359sub _set_value { 3982sub _set_value {
3360 my ($self, $value) = @_; 3983 my ($self, $value) = @_;
3361 3984
… …
3376 $self->emit (changed => $value); 3999 $self->emit (changed => $value);
3377} 4000}
3378 4001
3379############################################################################# 4002#############################################################################
3380 4003
3381package CFClient::UI::Statusbox; 4004package CFPlus::UI::Statusbox;
3382 4005
3383our @ISA = CFClient::UI::VBox::; 4006our @ISA = CFPlus::UI::VBox::;
3384 4007
3385sub new { 4008sub new {
3386 my $class = shift; 4009 my $class = shift;
3387 4010
3388 my $self = $class->SUPER::new ( 4011 my $self = $class->SUPER::new (
3389 fontsize => 0.8, 4012 fontsize => 0.8,
3390 @_, 4013 @_,
3391 ); 4014 );
3392 4015
3393 Scalar::Util::weaken (my $this = $self); 4016 CFPlus::weaken (my $this = $self);
3394 4017
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4018 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396 4019
3397 $self 4020 $self
3398} 4021}
… …
3400sub reorder { 4023sub reorder {
3401 my ($self) = @_; 4024 my ($self) = @_;
3402 my $NOW = Time::HiRes::time; 4025 my $NOW = Time::HiRes::time;
3403 4026
3404 # freeze display when hovering over any label 4027 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner} 4028 return if $CFPlus::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4029 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} }; 4030 values %{ $self->{item} };
3408 4031
3409 while (my ($k, $v) = each %{ $self->{item} }) { 4032 while (my ($k, $v) = each %{ $self->{item} }) {
3410 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4033 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411 } 4034 }
… …
3432 for ($short) { 4055 for ($short) {
3433 s/^\s+//; 4056 s/^\s+//;
3434 s/\s+/ /g; 4057 s/\s+/ /g;
3435 } 4058 }
3436 4059
3437 new CFClient::UI::Label 4060 new CFPlus::UI::Label
3438 markup => $short, 4061 markup => $short,
3439 tooltip => $item->{tooltip}, 4062 tooltip => $item->{tooltip},
3440 tooltip_font => $::FONT_PROP, 4063 tooltip_font => $::FONT_PROP,
3441 tooltip_width => 0.67, 4064 tooltip_width => 0.67,
3442 fontsize => $item->{fontsize} || $self->{fontsize}, 4065 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3521 $self->SUPER::destroy; 4144 $self->SUPER::destroy;
3522} 4145}
3523 4146
3524############################################################################# 4147#############################################################################
3525 4148
3526package CFClient::UI::Inventory;
3527
3528our @ISA = CFClient::UI::Table::;
3529
3530sub new {
3531 my $class = shift;
3532
3533 my $self = $class->SUPER::new (
3534 col_expand => [0, 1, 0],
3535 @_,
3536 );
3537
3538 $self
3539}
3540
3541sub set_items {
3542 my ($self, $items) = @_;
3543
3544 $self->clear;
3545 return unless $items;
3546
3547 my @items = sort {
3548 ($a->{type} <=> $b->{type})
3549 or ($a->{name} cmp $b->{name})
3550 } values %$items;
3551
3552 $self->{real_items} = \@items;
3553
3554 my $row = 0;
3555 for my $item (@items) {
3556 CFClient::Item::update_widgets $item;
3557
3558 $self->add (0, $row, $item->{face_widget});
3559 $self->add (1, $row, $item->{desc_widget});
3560 $self->add (2, $row, $item->{weight_widget});
3561
3562 $row++;
3563 }
3564}
3565
3566#############################################################################
3567
3568package CFClient::UI::SpellList;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
3578 @_,
3579 )
3580}
3581
3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3667sub add_spell {
3668 my ($self, $spell) = @_;
3669
3670 $self->{spell}->{$spell->{name}} = $spell;
3671 $self->rebuild_spell_list;
3672}
3673
3674sub remove_spell {
3675 my ($self, $spell) = @_;
3676
3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3688#############################################################################
3689
3690package CFClient::UI::Root; 4149package CFPlus::UI::Root;
3691 4150
3692our @ISA = CFClient::UI::Container::; 4151our @ISA = CFPlus::UI::Container::;
3693 4152
3694use List::Util qw(min max); 4153use List::Util qw(min max);
3695 4154
3696use CFClient::OpenGL; 4155use CFPlus::OpenGL;
3697 4156
3698sub new { 4157sub new {
3699 my $class = shift; 4158 my $class = shift;
3700 4159
3701 my $self = $class->SUPER::new ( 4160 my $self = $class->SUPER::new (
3702 visible => 1, 4161 visible => 1,
3703 @_, 4162 @_,
3704 ); 4163 );
3705 4164
3706 Scalar::Util::weaken ($self->{root} = $self); 4165 CFPlus::weaken ($self->{root} = $self);
3707 4166
3708 $self 4167 $self
3709} 4168}
3710 4169
3711sub size_request { 4170sub size_request {
… …
3759} 4218}
3760 4219
3761sub update { 4220sub update {
3762 my ($self) = @_; 4221 my ($self) = @_;
3763 4222
3764 $::WANT_REFRESH++; 4223 $::WANT_REFRESH->start;
3765} 4224}
3766 4225
3767sub add { 4226sub add {
3768 my ($self, @children) = @_; 4227 my ($self, @children) = @_;
3769 4228
… …
3806 while ($self->{refresh_hook}) { 4265 while ($self->{refresh_hook}) {
3807 $_->() 4266 $_->()
3808 for values %{delete $self->{refresh_hook}}; 4267 for values %{delete $self->{refresh_hook}};
3809 } 4268 }
3810 4269
3811 if ($self->{realloc}) { 4270 while ($self->{realloc}) {
3812 my %queue; 4271 my %queue;
3813 my @queue; 4272 my @queue;
3814 my $widget; 4273 my $widget;
3815 4274
3816 outer: 4275 outer:
… …
3863 } 4322 }
3864 } 4323 }
3865 4324
3866 delete $self->{realloc}{$widget+0}; 4325 delete $self->{realloc}{$widget+0};
3867 } 4326 }
3868 }
3869 4327
3870 while (my $size_alloc = delete $self->{size_alloc}) { 4328 while (my $size_alloc = delete $self->{size_alloc}) {
3871 my @queue = sort { $b->{visible} <=> $a->{visible} } 4329 my @queue = sort { $a->{visible} <=> $b->{visible} }
3872 values %$size_alloc; 4330 values %$size_alloc;
3873 4331
3874 while () { 4332 while () {
3875 my $widget = pop @queue || last; 4333 my $widget = pop @queue || last;
3876 4334
3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4335 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3878 4336
3879 $w = 0 if $w < 0;
3880 $h = 0 if $h < 0;
3881
3882 $w = max $widget->{min_w}, $w; 4337 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h; 4338 $h = max $widget->{min_h}, $h;
3884 4339
4340# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4341# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4342
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4343 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4344 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887 4345
3888 $w = int $w + 0.5; 4346 $w = int $w + 0.5;
3889 $h = int $h + 0.5; 4347 $h = int $h + 0.5;
3890 4348
3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4349 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3892 $widget->{old_w} = $widget->{w}; 4350 $widget->{old_w} = $widget->{w};
3893 $widget->{old_h} = $widget->{h}; 4351 $widget->{old_h} = $widget->{h};
3894 4352
3895 $widget->{w} = $w; 4353 $widget->{w} = $w;
3896 $widget->{h} = $h; 4354 $widget->{h} = $h;
3897 4355
3898 $widget->emit (size_allocate => $w, $h); 4356 $widget->emit (size_allocate => $w, $h);
4357 }
3899 } 4358 }
3900 } 4359 }
3901 } 4360 }
3902 4361
3903 while ($self->{post_alloc_hook}) { 4362 while ($self->{post_alloc_hook}) {
3904 $_->() 4363 $_->()
3905 for values %{delete $self->{post_alloc_hook}}; 4364 for values %{delete $self->{post_alloc_hook}};
3906 } 4365 }
3907
3908 4366
3909 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4367 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4368 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3911 glClear GL_COLOR_BUFFER_BIT; 4369 glClear GL_COLOR_BUFFER_BIT;
3912 4370
… …
3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4373 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916 glMatrixMode GL_MODELVIEW; 4374 glMatrixMode GL_MODELVIEW;
3917 glLoadIdentity; 4375 glLoadIdentity;
3918 4376
3919 { 4377 {
3920 package CFClient::UI::Base; 4378 package CFPlus::UI::Base;
3921 4379
3922 ($draw_x, $draw_y, $draw_w, $draw_h) = 4380 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h}); 4381 (0, 0, $self->{w}, $self->{h});
3924 }
3925 4382
3926 $self->_draw; 4383 $self->_draw;
4384 }
3927} 4385}
3928 4386
3929############################################################################# 4387#############################################################################
3930 4388
3931package CFClient::UI; 4389package CFPlus::UI;
3932 4390
3933$ROOT = new CFClient::UI::Root; 4391$ROOT = new CFPlus::UI::Root;
3934$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4392$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935 4393
39361 43941
3937 4395

Diff Legend

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