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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.430 by root, Tue Aug 21 02:39:17 2007 UTC

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

Diff Legend

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