ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.332 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.431 by root, Tue Aug 21 02:41:52 2007 UTC

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

Diff Legend

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