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

Diff Legend

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