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.339 by root, Sun Jul 30 12:15:19 2006 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 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;
… …
110 } 113 }
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 { __widget_ref__ => $_[0]{s_id} }
279}
280
269sub show { 281sub show {
270 my ($self) = @_; 282 my ($self) = @_;
271 283
272 return if $self->{parent}; 284 return if $self->{parent};
273 285
274 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
275} 287}
276 288
277sub set_visible { 289sub set_visible {
278 my ($self) = @_; 290 my ($self) = @_;
279 291
… …
300 delete $self->{root}; 312 delete $self->{root};
301 313
302 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
304 316
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
307 319
308 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
310} 322}
… …
312sub set_visibility { 324sub set_visibility {
313 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
314 326
315 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
316 328
317 $visible ? $self->hide 329 $visible ? $self->show
318 : $self->show; 330 : $self->hide;
319} 331}
320 332
321sub toggle_visibility { 333sub toggle_visibility {
322 my ($self) = @_; 334 my ($self) = @_;
323 335
… …
367 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
368 380
369 if ($self->{aspect}) { 381 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
371 383
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 386
375 # use alignment to adjust x, y 387 # use alignment to adjust x, y
376 388
377 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
419 431
420 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
421 433
422 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
423 435
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 439 }
428} 440}
429 441
430# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
431sub coord2local { 443sub coord2local {
… …
497sub connect { 509sub connect {
498 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
499 511
500 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
501 513
502 defined wantarray and CFClient::guard { 514 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
505 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
506} 524}
507 525
508my %has_coords = ( 526my %has_coords = (
509 button_down => 1, 527 button_down => 1,
510 button_up => 1, 528 button_up => 1,
… …
513); 531);
514 532
515sub emit { 533sub emit {
516 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
517 535
518 # I do not really like this solution, but I dislike duplication 536 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 537 # and needlessly verbose code, either.
520 my @append 538 my @append
521 = $has_coords{$signal} 539 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
523 : (); 541 : ();
524 542
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 544
527 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 554}
532 555
533sub find_widget { 556#sub find_widget {
534 my ($self, $x, $y) = @_; 557# in .xs
535
536 return () unless $self->{can_events};
537
538 return $self
539 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542 ()
543}
544 558
545sub set_parent { 559sub set_parent {
546 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
547 561
548 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
550} 564}
551 565
552sub realloc { 566sub realloc {
553 my ($self) = @_; 567 my ($self) = @_;
… …
579 593
580# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless. 595# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583 597
584sub draw { 598#sub draw {
585 my ($self) = @_; 599#CFPlus.xs
586
587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597 glPushMatrix;
598 glTranslate $self->{x}, $self->{y}, 0;
599
600 if ($self == $HOVER && $self->{can_hover}) {
601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602 glEnable GL_BLEND;
603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glBegin GL_QUADS;
605 glVertex 0 , 0;
606 glVertex $self->{w}, 0;
607 glVertex $self->{w}, $self->{h};
608 glVertex 0 , $self->{h};
609 glEnd;
610 glDisable GL_BLEND;
611 }
612
613 if ($ENV{CFPLUS_DEBUG} & 1) {
614 glPushMatrix;
615 glColor 1, 1, 0, 1;
616 glTranslate 0.375, 0.375;
617 glBegin GL_LINE_LOOP;
618 glVertex 0 , 0;
619 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1;
622 glEnd;
623 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 }
626
627 $self->_draw;
628 glPopMatrix;
629}
630 600
631sub _draw { 601sub _draw {
632 my ($self) = @_; 602 my ($self) = @_;
633 603
634 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
635} 605}
636 606
637sub DESTROY { 607sub DESTROY {
638 my ($self) = @_; 608 my ($self) = @_;
639 609
640 return if CFClient::in_destruct; 610 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 611
644 eval { $self->destroy }; 612 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
646} 616}
647 617
648############################################################################# 618#############################################################################
649 619
650package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
651 621
652our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
653 623
654use strict; 624use strict;
655use CFClient::OpenGL; 625use CFPlus::OpenGL;
656 626
657sub new { 627sub new {
658 my $class = shift; 628 my $class = shift;
659 629
660 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
691 } 661 }
692} 662}
693 663
694############################################################################# 664#############################################################################
695 665
696package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
697 667
698our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
699 669
700sub new { 670sub new {
701 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
703} 673}
… …
710 680
711sub draw { } 681sub draw { }
712 682
713############################################################################# 683#############################################################################
714 684
715package CFClient::UI::Container; 685package CFPlus::UI::Container;
716 686
717our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
718 688
719sub new { 689sub new {
720 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
721 691
722 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
726 can_events => 0, 696 can_events => 0,
727 %arg, 697 %arg,
728 ); 698 );
729 699
730 $self->add (@$children) 700 $self->add (@$children)
731 if $children; 701 if $children && @$children;
732 702
733 $self 703 $self
734} 704}
735 705
736sub realloc { 706sub realloc {
… …
745 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
746 716
747 $_->set_parent ($self) 717 $_->set_parent ($self)
748 for @widgets; 718 for @widgets;
749 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 721 use sort 'stable';
751 722
752 $self->{children} = [ 723 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
755 ]; 726 ];
756 727
757 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
758} 731}
759 732
760sub children { 733sub children {
761 @{ $_[0]{children} } 734 @{ $_[0]{children} }
762} 735}
… …
773} 746}
774 747
775sub clear { 748sub clear {
776 my ($self) = @_; 749 my ($self) = @_;
777 750
778 my $children = delete $self->{children}; 751 my $children = $self->{children};
779 $self->{children} = []; 752 $self->{children} = [];
780 753
781 for (@$children) { 754 for (@$children) {
782 delete $_->{parent}; 755 delete $_->{parent};
783 $_->hide; 756 $_->hide;
… …
808 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
809} 782}
810 783
811############################################################################# 784#############################################################################
812 785
813package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
814 787
815our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
816 789
817sub new { 790sub new {
818 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
819 792
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 794
822 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
823} 796}
824 797
825sub add { 798sub add {
… …
832sub remove { 805sub remove {
833 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
834 807
835 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
836 809
837 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 811 unless @{$self->{children}};
839} 812}
840 813
841sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
842 815
… …
854 827
855############################################################################# 828#############################################################################
856 829
857# back-buffered drawing area 830# back-buffered drawing area
858 831
859package CFClient::UI::Window; 832package CFPlus::UI::Window;
860 833
861our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
862 835
863use CFClient::OpenGL; 836use CFPlus::OpenGL;
864 837
865sub new { 838sub new {
866 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
867 840
868 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
890} 863}
891 864
892sub render_child { 865sub render_child {
893 my ($self) = @_; 866 my ($self) = @_;
894 867
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
898 871
899 { 872 {
900 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
901 874
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
904 } 879 }
905
906 $self->_render;
907 }; 880 };
908} 881}
909 882
910sub _draw { 883sub _draw {
911 my ($self) = @_; 884 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 885
915 my $tex = $self->{texture} 886 my $tex = $self->{texture}
916 or return; 887 or return;
917 888
918 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
921 892
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
923 894
924 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
925} 896}
926 897
927############################################################################# 898#############################################################################
928 899
929package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
930 901
902use List::Util qw(min max);
903
931our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
932 905
933sub new { 906sub new {
934 my $class = shift; 907 my $class = shift;
935 908
936 $class->SUPER::new ( 909 $class->SUPER::new (
… …
943sub size_request { 916sub size_request {
944 my ($self) = @_; 917 my ($self) = @_;
945 918
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 920
948 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
950 923
951 ($w, $h) 924 ($w, $h)
952} 925}
953 926
954sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
966} 939}
967 940
968sub set_offset { 941sub set_offset {
969 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
970 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
973 950
951 $self->emit (changed => $x, $y);
974 $self->update; 952 $self->update;
953 }
975} 954}
976 955
977# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 957sub coord2local {
979 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
995 974
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 977 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 979 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 981 }
1003} 982}
1004 983
1005sub _render { 984sub _render {
1006 my ($self) = @_; 985 my ($self) = @_;
1007 986
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 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}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 989
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 991
1013 $self->SUPER::_render; 992 $self->SUPER::_render;
1014} 993}
1015 994
1016############################################################################# 995#############################################################################
1017 996
1018package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
1019 998
1020our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
1021 1000
1022sub new { 1001sub new {
1023 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
1024 1003
1025 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1026 1005
1027 my $self; 1006 my $self;
1028 1007
1029 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1030 vertical => 1, 1022 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1024 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1027 },
1035 ; 1028 ;
1036 1029
1037 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1039 can_events => 1, 1033 can_events => 1,
1040 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1041 %arg, 1038 %arg,
1042 ); 1039 );
1043 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
1045 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1046 1065
1047 $self 1066 $self
1048} 1067}
1049
1050#TODO# update range on size_allocate depending on child
1051 1068
1052sub add { 1069sub add {
1053 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1054 1071
1055 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
1056} 1073}
1057 1074
1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1058sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1060 1125
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1128
1065 1 1129 1
1066} 1130}
1067 1131
1068sub update_slider { 1132sub invoke_button_down {
1069 my ($self) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1070 1134
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1135 if ($ev->{button} == 2) {
1072} 1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1073 1139
1074sub update { 1140 0
1075 my ($self) = @_; 1141}
1076 1142
1077 $self->SUPER::update; 1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1078 1145
1079 $self->update_slider; 1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1080} 1162}
1081 1163
1082sub invoke_size_allocate { 1164sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1084 1166
1085 $self->update_slider; 1167 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1169}
1089 1170
1090############################################################################# 1171#############################################################################
1091 1172
1092package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1093 1174
1094our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1095 1176
1096use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1097 1178
1098sub new { 1179sub new {
1099 my $class = shift; 1180 my $class = shift;
1100 1181
1101 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1128} 1209}
1129 1210
1130############################################################################# 1211#############################################################################
1131 1212
1132package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1133 1214
1134our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1135 1216
1136use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1137 1318
1138my $bg = 1319my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1141 1322
1142my @border = 1323my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1145 1330
1146sub new { 1331sub new {
1147 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1148 1333
1149 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1339 min_w => 64,
1155 min_h => 32, 1340 min_h => 32,
1156 %arg, 1341 %arg,
1157 ); 1342 );
1158 1343
1159 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1345 align => 0,
1161 valign => 1, 1346 valign => 1,
1162 text => $self->{title}, 1347 text => $self->{title},
1163 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1164 if exists $self->{title}; 1349 if exists $self->{title};
1165 1350
1166 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1352 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1354 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1355 on_activate => sub { $self->emit ("delete") };
1171 1356
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1358 }
1174 1359
1175 $self 1360 $self
1176} 1361}
1177 1362
1178sub add { 1363sub add {
1179 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1180 1365
1181 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $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}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1369}
1185 1370
1186sub border { 1371sub border {
1187 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1188} 1373}
… …
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319 1504
1320 my $border = $self->border; 1505 my $border = $self->border;
1321 1506
1322 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1323 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327 1526
1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1330 1529
1331 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1350 if $self->{close_button}; 1549 if $self->{close_button};
1351} 1550}
1352 1551
1353############################################################################# 1552#############################################################################
1354 1553
1355package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1356 1555
1357our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1358 1557
1359use List::Util qw(max sum); 1558use List::Util qw(max sum);
1360 1559
1361use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1362 1561
1363sub new { 1562sub new {
1364 my $class = shift; 1563 my $class = shift;
1365 1564
1366 $class->SUPER::new ( 1565 $class->SUPER::new (
1367 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1368 @_, 1568 @_,
1369 ) 1569 )
1370} 1570}
1371 1571
1372sub children {
1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374}
1375
1376sub add { 1572sub add {
1573 my ($self, @widgets) = @_;
1574
1575 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1581}
1582
1583sub add_at {
1377 my ($self) = shift; 1584 my $self = shift;
1585
1586 my @widgets;
1378 1587
1379 while (@_) { 1588 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1381 $child->set_parent ($self);
1382 $self->{children}[$y][$x] = $child;
1383 }
1384 1590
1385 $self->{force_realloc} = 1; 1591 $child->{row} = $row;
1386 $self->{force_size_alloc} = 1; 1592 $child->{col} = $col;
1387 $self->realloc;
1388}
1389 1593
1390sub remove { 1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1391 my ($self, $child) = @_; 1601 my ($self) = @_;
1392 1602
1393 # TODO: not yet implemented 1603 my (@w, @h);
1394}
1395
1396# TODO: move to container class maybe? send children a signal on removal?
1397sub clear {
1398 my ($self) = @_;
1399 1604
1400 my @children = $self->children; 1605 my @children = $self->children;
1401 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1402 1616 }
1403 for (@children) {
1404 delete $_->{parent};
1405 $_->hide;
1406 }
1407 1617
1408 $self->realloc; 1618 # second pass, rows
1409} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1410
1411sub get_wh {
1412 my ($self) = @_;
1413
1414 my (@w, @h);
1415
1416 for my $y (0 .. $#{$self->{children}}) {
1417 my $row = $self->{children}[$y]
1418 or next;
1419
1420 for my $x (0 .. $#$row) {
1421 my $widget = $row->[$x]
1422 or next;
1423 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1424 1621
1425 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1426 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427 } 1626 }
1428 } 1627 }
1429 1628
1430 (\@w, \@h) 1629 (\@w, \@h)
1431} 1630}
… …
1447 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1448 1647
1449 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1451 1650
1452 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1453 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1456 1655
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1657
1461 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1462 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1463 1667
1464 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465 1670
1466 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1467 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1468 or next;
1469 1673
1470 my $x = 0; 1674 $widget->configure (
1471 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472 1677 );
1473 for my $c (0 .. $#$row) { 1678 }
1474 my $col_w = $ws->[$c];
1475 1679
1476 if (my $widget = $row->[$c]) { 1680 1
1477 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1478 }
1479 1682
1480 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1481 } 1721 }
1722 }
1482 1723
1483 $y += $row_h; 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1726
1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_;
1750
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758
1759 $child->configure ($x, $y, $w, $h);
1484 } 1760 }
1485 1761
1486 1 1762 1
1487} 1763}
1488 1764
1489sub find_widget {
1490 my ($self, $x, $y) = @_;
1491
1492 $x -= $self->{x};
1493 $y -= $self->{y};
1494
1495 my $res;
1496
1497 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498 $res = $_->find_widget ($x, $y)
1499 and return $res;
1500 }
1501
1502 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503}
1504
1505sub _draw {
1506 my ($self) = @_;
1507
1508 for (grep $_, @{$self->{children}}) {
1509 $_->draw for grep $_, @$_;
1510 }
1511}
1512
1513############################################################################# 1765#############################################################################
1514 1766
1515package CFClient::UI::Box; 1767package CFPlus::UI::Box;
1516 1768
1517our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1518 1770
1519sub size_request { 1771sub size_request {
1520 my ($self) = @_; 1772 my ($self) = @_;
1521 1773
1522 $self->{vertical} 1774 $self->{vertical}
… …
1555 $req[$_] += $space * $children[$_]{expand} 1807 $req[$_] += $space * $children[$_]{expand}
1556 for 0 .. $#children; 1808 for 0 .. $#children;
1557 } 1809 }
1558 } 1810 }
1559 1811
1560 CFClient::UI::harmonize \@req; 1812 CFPlus::UI::harmonize \@req;
1561 1813
1562 my $pos = 0; 1814 my $pos = 0;
1563 for (0 .. $#children) { 1815 for (0 .. $#children) {
1564 my $alloc = $req[$_]; 1816 my $alloc = $req[$_];
1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1570 1 1822 1
1571} 1823}
1572 1824
1573############################################################################# 1825#############################################################################
1574 1826
1575package CFClient::UI::HBox; 1827package CFPlus::UI::HBox;
1576 1828
1577our @ISA = CFClient::UI::Box::; 1829our @ISA = CFPlus::UI::Box::;
1578 1830
1579sub new { 1831sub new {
1580 my $class = shift; 1832 my $class = shift;
1581 1833
1582 $class->SUPER::new ( 1834 $class->SUPER::new (
… …
1585 ) 1837 )
1586} 1838}
1587 1839
1588############################################################################# 1840#############################################################################
1589 1841
1590package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1591 1843
1592our @ISA = CFClient::UI::Box::; 1844our @ISA = CFPlus::UI::Box::;
1593 1845
1594sub new { 1846sub new {
1595 my $class = shift; 1847 my $class = shift;
1596 1848
1597 $class->SUPER::new ( 1849 $class->SUPER::new (
… …
1600 ) 1852 )
1601} 1853}
1602 1854
1603############################################################################# 1855#############################################################################
1604 1856
1605package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1606 1858
1607our @ISA = CFClient::UI::DrawBG::; 1859our @ISA = CFPlus::UI::DrawBG::;
1608 1860
1609use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1610 1862
1611sub new { 1863sub new {
1612 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1613 1865
1614 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
… …
1617 #active_bg => none 1869 #active_bg => none
1618 #font => default_font 1870 #font => default_font
1619 #text => initial text 1871 #text => initial text
1620 #markup => initial narkup 1872 #markup => initial narkup
1621 #max_w => maximum pixel width 1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1622 ellipsise => 3, # end 1875 ellipsise => 3, # end
1623 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1877 fontsize => 1,
1625 align => -1, 1878 align => -1,
1626 valign => -1, 1879 valign => -1,
1627 padding_x => 2, 1880 padding_x => 2,
1628 padding_y => 2, 1881 padding_y => 2,
1629 can_events => 0, 1882 can_events => 0,
1630 %arg 1883 %arg
1631 ); 1884 );
1632 1885
1633 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1634 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1635 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1636 $self->{template} = $layout; 1889 $self->{template} = $layout;
1637 } 1890 }
1638 1891
1639 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1777 }; 2030 };
1778 2031
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2032# unless ($self->{list}) {
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList;
2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
1781 2040
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
1784 2051
1785############################################################################# 2052#############################################################################
1786 2053
1787package CFClient::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
1788 2055
1789our @ISA = CFClient::UI::Label::; 2056our @ISA = CFPlus::UI::Label::;
1790 2057
1791use CFClient::OpenGL; 2058use CFPlus::OpenGL;
1792 2059
1793sub new { 2060sub new {
1794 my $class = shift; 2061 my $class = shift;
1795 2062
1796 $class->SUPER::new ( 2063 $class->SUPER::new (
… …
1800 active_fg => [0, 0, 0], 2067 active_fg => [0, 0, 0],
1801 can_hover => 1, 2068 can_hover => 1,
1802 can_focus => 1, 2069 can_focus => 1,
1803 valign => 0, 2070 valign => 0,
1804 can_events => 1, 2071 can_events => 1,
2072 ellipsise => 0,
1805 #text => ... 2073 #text => ...
1806 #hidden => "*", 2074 #hidden => "*",
1807 @_ 2075 @_
1808 ) 2076 )
1809} 2077}
… …
1854 my $sym = $ev->{sym}; 2122 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2123 my $uni = $ev->{unicode};
1856 2124
1857 my $text = $self->get_text; 2125 my $text = $self->get_text;
1858 2126
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128
1859 if ($uni == 8) { 2129 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2131 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2132 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFClient::SDLK_LEFT) { 2133 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2134 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFClient::SDLK_RIGHT) { 2135 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2136 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFClient::SDLK_HOME) { 2137 } elsif ($sym == CFPlus::SDLK_HOME) {
2138 # what a hack
2139 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1
2142 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) {
2144 # uh, again
2145 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1
2148 : length $self->{text};
2149 } elsif ($uni == 21) { # ctrl-u
2150 $text = "";
1868 $self->{cursor} = 0; 2151 $self->{cursor} = 0;
1869 } elsif ($sym == CFClient::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2152 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2153 $self->emit ('escape');
1873 } elsif ($uni) { 2154 } elsif ($uni == 0x0d) {
2155 substr $text, $self->{cursor}++, 0, "\012";
2156 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2157 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2158 } else {
1876 return 0; 2159 return 0;
1877 } 2160 }
1878 2161
1879 $self->_set_text ($text); 2162 $self->_set_text ($text);
1880 2163
1881 $self->realloc; 2164 $self->realloc;
2165 $self->update;
1882 2166
1883 1 2167 1
1884} 2168}
1885 2169
1886sub invoke_focus_in { 2170sub invoke_focus_in {
… …
1948 utf8::encode $text; 2232 utf8::encode $text;
1949 2233
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951 } 2235 }
1952 2236
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 2237 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 2240 glEnd;
1958 } 2241 }
1959} 2242}
1960 2243
2244#############################################################################
2245
1961package CFClient::UI::Entry; 2246package CFPlus::UI::Entry;
1962 2247
1963our @ISA = CFClient::UI::EntryBase::; 2248our @ISA = CFPlus::UI::EntryBase::;
1964 2249
1965use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1966 2251
1967sub invoke_key_down { 2252sub invoke_key_down {
1968 my ($self, $ev) = @_; 2253 my ($self, $ev) = @_;
1969 2254
1970 my $sym = $ev->{sym}; 2255 my $sym = $ev->{sym};
1971 2256
1972 if ($sym == 13) { 2257 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2258 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2259 my $txt = $self->get_text;
1975 2260
1976 $self->{history_pointer} = -1; 2261 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2262 $self->{history_saveback} = '';
1978 $self->emit (activate => $txt); 2263 $self->emit (activate => $txt);
1979 $self->update; 2264 $self->update;
1980 2265
1981 } elsif ($sym == CFClient::SDLK_UP) { 2266 } elsif ($sym == CFPlus::SDLK_UP) {
1982 if ($self->{history_pointer} < 0) { 2267 if ($self->{history_pointer} < 0) {
1983 $self->{history_saveback} = $self->get_text; 2268 $self->{history_saveback} = $self->get_text;
1984 } 2269 }
1985 if (@{$self->{history} || []} > 0) { 2270 if (@{$self->{history} || []} > 0) {
1986 $self->{history_pointer}++; 2271 $self->{history_pointer}++;
… …
1988 $self->{history_pointer} = @{$self->{history} || []} - 1; 2273 $self->{history_pointer} = @{$self->{history} || []} - 1;
1989 } 2274 }
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2275 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1991 } 2276 }
1992 2277
1993 } elsif ($sym == CFClient::SDLK_DOWN) { 2278 } elsif ($sym == CFPlus::SDLK_DOWN) {
1994 $self->{history_pointer}--; 2279 $self->{history_pointer}--;
1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996 2281
1997 if ($self->{history_pointer} >= 0) { 2282 if ($self->{history_pointer} >= 0) {
1998 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2283 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2007 1 2292 1
2008} 2293}
2009 2294
2010############################################################################# 2295#############################################################################
2011 2296
2297package CFPlus::UI::TextEdit;
2298
2299our @ISA = CFPlus::UI::EntryBase::;
2300
2301use CFPlus::OpenGL;
2302
2303sub move_cursor_ver {
2304 my ($self, $dy) = @_;
2305
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307
2308 $y += $dy;
2309
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2311 $self->{cursor} = $index;
2312 delete $self->{cur_h};
2313 $self->update;
2314 return;
2315 }
2316}
2317
2318sub invoke_key_down {
2319 my ($self, $ev) = @_;
2320
2321 my $sym = $ev->{sym};
2322
2323 if ($sym == CFPlus::SDLK_UP) {
2324 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1);
2327 } else {
2328 return $self->SUPER::invoke_key_down ($ev)
2329 }
2330
2331 1
2332}
2333
2334#############################################################################
2335
2012package CFClient::UI::Button; 2336package CFPlus::UI::Button;
2013 2337
2014our @ISA = CFClient::UI::Label::; 2338our @ISA = CFPlus::UI::Label::;
2015 2339
2016use CFClient::OpenGL; 2340use CFPlus::OpenGL;
2017 2341
2018my @tex = 2342my @tex =
2019 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
2021 2345
2022sub new { 2346sub new {
2023 my $class = shift; 2347 my $class = shift;
2024 2348
2025 $class->SUPER::new ( 2349 $class->SUPER::new (
2026 padding_x => 4, 2350 padding_x => 4,
2027 padding_y => 4, 2351 padding_y => 4,
2028 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
2029 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
2030 can_hover => 1, 2354 can_hover => 1,
2031 align => 0, 2355 align => 0,
2032 valign => 0, 2356 valign => 0,
2033 can_events => 1, 2357 can_events => 1,
2034 @_ 2358 @_
… …
2052 2376
2053 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
2056 2380
2381 my $tex = $tex[$GRAB == $self];
2057 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058 2383
2059 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
2060 2385
2061 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
2062} 2387}
2063 2388
2064############################################################################# 2389#############################################################################
2065 2390
2066package CFClient::UI::CheckBox; 2391package CFPlus::UI::CheckBox;
2067 2392
2068our @ISA = CFClient::UI::DrawBG::; 2393our @ISA = CFPlus::UI::DrawBG::;
2069 2394
2070my @tex = 2395my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2397 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073 2398
2074use CFClient::OpenGL; 2399use CFPlus::OpenGL;
2075 2400
2076sub new { 2401sub new {
2077 my $class = shift; 2402 my $class = shift;
2078 2403
2079 $class->SUPER::new ( 2404 $class->SUPER::new (
… …
2136 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2137} 2462}
2138 2463
2139############################################################################# 2464#############################################################################
2140 2465
2141package CFClient::UI::Image; 2466package CFPlus::UI::Image;
2142 2467
2143our @ISA = CFClient::UI::Base::; 2468our @ISA = CFPlus::UI::Base::;
2144 2469
2145use CFClient::OpenGL; 2470use CFPlus::OpenGL;
2146 2471
2147our %texture_cache; 2472our %texture_cache;
2148 2473
2149sub new { 2474sub new {
2150 my $class = shift; 2475 my $class = shift;
… …
2156 2481
2157 $self->{path} || $self->{tex} 2482 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required"; 2483 or Carp::croak "'path' or 'tex' attributes required";
2159 2484
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2485 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2487
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2488 CFPlus::weaken $texture_cache{$self->{path}};
2164 2489
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2491
2167 $self 2492 $self
2168} 2493}
2169 2494
2170sub STORABLE_freeze { 2495sub STORABLE_freeze {
2171 my ($self, $cloning) = @_; 2496 my ($self, $cloning) = @_;
2172 2497
2173 $self->{path} 2498 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175 2500
2176 $self->{path} 2501 $self->{path}
2177} 2502}
2178 2503
2179sub STORABLE_attach { 2504sub STORABLE_attach {
… …
2210 glDisable GL_TEXTURE_2D; 2535 glDisable GL_TEXTURE_2D;
2211} 2536}
2212 2537
2213############################################################################# 2538#############################################################################
2214 2539
2215package CFClient::UI::ImageButton; 2540package CFPlus::UI::ImageButton;
2216 2541
2217our @ISA = CFClient::UI::Image::; 2542our @ISA = CFPlus::UI::Image::;
2218 2543
2219use CFClient::OpenGL; 2544use CFPlus::OpenGL;
2220 2545
2221my %textures; 2546my %textures;
2222 2547
2223sub new { 2548sub new {
2224 my $class = shift; 2549 my $class = shift;
… …
2246 1 2571 1
2247} 2572}
2248 2573
2249############################################################################# 2574#############################################################################
2250 2575
2251package CFClient::UI::VGauge; 2576package CFPlus::UI::VGauge;
2252 2577
2253our @ISA = CFClient::UI::Base::; 2578our @ISA = CFPlus::UI::Base::;
2254 2579
2255use List::Util qw(min max); 2580use List::Util qw(min max);
2256 2581
2257use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2258 2583
2259my %tex = ( 2584my %tex = (
2260 food => [ 2585 food => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263 ], 2588 ],
2264 grace => [ 2589 grace => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2590 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267 ], 2592 ],
2268 hp => [ 2593 hp => [
2269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271 ], 2596 ],
2272 mana => [ 2597 mana => [
2273 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2598 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275 ], 2600 ],
2276); 2601);
2277 2602
2278# eg. VGauge->new (gauge => 'food'), default gauge: food 2603# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2381 glDisable GL_TEXTURE_2D; 2706 glDisable GL_TEXTURE_2D;
2382} 2707}
2383 2708
2384############################################################################# 2709#############################################################################
2385 2710
2386package CFClient::UI::Gauge; 2711package CFPlus::UI::Gauge;
2387 2712
2388our @ISA = CFClient::UI::VBox::; 2713our @ISA = CFPlus::UI::VBox::;
2389 2714
2390sub new { 2715sub new {
2391 my ($class, %arg) = @_; 2716 my ($class, %arg) = @_;
2392 2717
2393 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
… …
2395 can_hover => 1, 2720 can_hover => 1,
2396 can_events => 1, 2721 can_events => 1,
2397 %arg, 2722 %arg,
2398 ); 2723 );
2399 2724
2400 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2725 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2401 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2726 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2402 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403 2728
2404 $self 2729 $self
2405} 2730}
2406 2731
2407sub set_fontsize { 2732sub set_fontsize {
… …
2428 $self->{value}->set_text ($val); 2753 $self->{value}->set_text ($val);
2429} 2754}
2430 2755
2431############################################################################# 2756#############################################################################
2432 2757
2433package CFClient::UI::Slider; 2758package CFPlus::UI::Slider;
2434 2759
2435use strict; 2760use strict;
2436 2761
2437use CFClient::OpenGL; 2762use CFPlus::OpenGL;
2438 2763
2439our @ISA = CFClient::UI::DrawBG::; 2764our @ISA = CFPlus::UI::DrawBG::;
2440 2765
2441my @tex = 2766my @tex =
2442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443 qw(s1_slider.png s1_slider_bg.png); 2768 qw(s1_slider.png s1_slider_bg.png);
2444 2769
2445sub new { 2770sub new {
2446 my $class = shift; 2771 my $class = shift;
2447 2772
… …
2541sub invoke_mouse_wheel { 2866sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2867 my ($self, $ev) = @_;
2543 2868
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2870
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2872
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2874
2548 ! ! $delta 2875 ! ! $delta
2549} 2876}
2550 2877
2551sub update { 2878sub update {
… …
2602 glDisable GL_TEXTURE_2D; 2929 glDisable GL_TEXTURE_2D;
2603} 2930}
2604 2931
2605############################################################################# 2932#############################################################################
2606 2933
2607package CFClient::UI::ValSlider; 2934package CFPlus::UI::ValSlider;
2608 2935
2609our @ISA = CFClient::UI::HBox::; 2936our @ISA = CFPlus::UI::HBox::;
2610 2937
2611sub new { 2938sub new {
2612 my ($class, %arg) = @_; 2939 my ($class, %arg) = @_;
2613 2940
2614 my $range = delete $arg{range}; 2941 my $range = delete $arg{range};
2615 2942
2616 my $self = $class->SUPER::new ( 2943 my $self = $class->SUPER::new (
2617 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619 to_value => sub { shift }, 2946 to_value => sub { shift },
2620 from_value => sub { shift }, 2947 from_value => sub { shift },
2621 %arg, 2948 %arg,
2622 ); 2949 );
2623 2950
… …
2643sub set_range { shift->{slider}->set_range (@_) } 2970sub set_range { shift->{slider}->set_range (@_) }
2644sub set_value { shift->{slider}->set_value (@_) } 2971sub set_value { shift->{slider}->set_value (@_) }
2645 2972
2646############################################################################# 2973#############################################################################
2647 2974
2648package CFClient::UI::TextScroller; 2975package CFPlus::UI::TextScroller;
2649 2976
2650our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2651 2978
2652use CFClient::OpenGL; 2979use CFPlus::OpenGL;
2653 2980
2654sub new { 2981sub new {
2655 my $class = shift; 2982 my $class = shift;
2656 2983
2657 my $self = $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
… …
2659 can_events => 1, 2986 can_events => 1,
2660 indent => 0, 2987 indent => 0,
2661 #font => default_font 2988 #font => default_font
2662 @_, 2989 @_,
2663 2990
2664 layout => (new CFClient::Layout), 2991 layout => (new CFPlus::Layout),
2665 par => [], 2992 par => [],
2993 max_par => 0,
2666 height => 0, 2994 height => 0,
2667 children => [ 2995 children => [
2668 (new CFClient::UI::Empty expand => 1), 2996 (new CFPlus::UI::Empty expand => 1),
2669 (new CFClient::UI::Slider vertical => 1), 2997 (new CFPlus::UI::Slider vertical => 1),
2670 ], 2998 ],
2671 ); 2999 );
2672 3000
2673 $self->{children}[1]->connect (changed => sub { $self->update }); 3001 $self->{children}[1]->connect (changed => sub { $self->update });
2674 3002
… …
2749sub set_offset { 3077sub set_offset {
2750 my ($self, $offset) = @_; 3078 my ($self, $offset) = @_;
2751 3079
2752 # todo: base offset on lines or so, not on pixels 3080 # todo: base offset on lines or so, not on pixels
2753 $self->{children}[1]->set_value ($offset); 3081 $self->{children}[1]->set_value ($offset);
3082}
3083
3084sub current_paragraph {
3085 my ($self) = @_;
3086
3087 $self->{top_paragraph} - 1
3088}
3089
3090sub scroll_to {
3091 my ($self, $para) = @_;
3092
3093 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3094
3095 $self->{scroll_to} = $para;
3096 $self->update;
2754} 3097}
2755 3098
2756sub clear { 3099sub clear {
2757 my ($self) = @_; 3100 my ($self) = @_;
2758 3101
… …
2780 3123
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3124 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3125 push @{$self->{par}}, $para;
2783 } 3126 }
2784 3127
3128 if (my $max = $self->{max_par}) {
3129 shift @{$self->{par}} while @{$self->{par}} > $max;
3130 }
3131
2785 $self->{need_reflow}++; 3132 $self->{need_reflow}++;
2786 $self->update; 3133 $self->update;
2787} 3134}
2788 3135
2789sub scroll_to_bottom { 3136sub scroll_to_bottom {
2790 my ($self) = @_; 3137 my ($self) = @_;
2791 3138
2792 $self->{scroll_to_bottom} = 1; 3139 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3140 $self->update;
2794} 3141}
2795 3142
3143sub force_uptodate {
3144 my ($self) = @_;
3145
3146 if (delete $self->{need_reflow}) {
3147 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3148
3149 my $height = 0;
3150
3151 for my $para (@{$self->{par}}) {
3152 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3153 my $layout = $self->get_layout ($para);
3154 my ($w, $h) = $layout->size;
3155
3156 $para->{w} = $w + $para->{indent};
3157 $para->{h} = $h;
3158 $para->{wrapped} = $layout->has_wrapped;
3159 }
3160
3161 $para->{y} = $height;
3162 $height += $para->{h};
3163 }
3164
3165 $self->{height} = $height;
3166 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3167
3168 delete $self->{texture};
3169 }
3170
3171 if (my $paridx = delete $self->{scroll_to}) {
3172 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3173 }
3174}
3175
2796sub update { 3176sub update {
2797 my ($self) = @_; 3177 my ($self) = @_;
2798 3178
2799 $self->SUPER::update; 3179 $self->SUPER::update;
2800 3180
2801 return unless $self->{h} > 0; 3181 return unless $self->{h} > 0;
2802 3182
2803 delete $self->{texture}; 3183 delete $self->{texture};
2804 3184
2805 $ROOT->on_post_alloc ($self => sub { 3185 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate;
3187
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807 3189
2808 if (delete $self->{need_reflow}) {
2809 my $height = 0;
2810
2811 for my $para (@{$self->{par}}) {
2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813 my $layout = $self->get_layout ($para);
2814 my ($w, $h) = $layout->size;
2815
2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2819 }
2820
2821 $height += $para->{h};
2822 }
2823
2824 $self->{height} = $height;
2825
2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2835 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3191 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3192 glClear GL_COLOR_BUFFER_BIT;
2838 3193
3194 package CFPlus::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h});
3197
3198 my $top = int $self->{children}[1]{range}[0];
3199
3200 my $paridx = 0;
3201 my $top_paragraph;
2839 my $top = int $self->{children}[1]{range}[0]; 3202 my $top = int $self->{children}[1]{range}[0];
2840 3203
2841 my $y0 = $top; 3204 my $y0 = $top;
2842 my $y1 = $top + $H; 3205 my $y1 = $top + $H;
2843 3206
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3207 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3208 my $h = $para->{h};
3209 my $y = $para->{y};
2848 3210
2849 if ($y0 < $y + $h && $y < $y1) { 3211 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3212 my $layout = $self->get_layout ($para);
2852 3213
2853 $layout->render ($para->{indent}, $y - $y0); 3214 $layout->render ($para->{indent}, $y - $y0);
2854 3215
2855 if (my @w = @{ $para->{widget} }) { 3216 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3225 $_->draw;
2865 } 3226 }
2866 } 3227 }
2867 } 3228 }
2868 3229
2869 $y += $h; 3230 $paridx++;
3231 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3232 }
3233
3234 $self->{top_paragraph} = $top_paragraph;
2871 }; 3235 };
2872 }); 3236 });
2873} 3237}
2874 3238
2875sub reconfigure { 3239sub reconfigure {
… …
2893 $self->{children}[1]->draw; 3257 $self->{children}[1]->draw;
2894} 3258}
2895 3259
2896############################################################################# 3260#############################################################################
2897 3261
2898package CFClient::UI::Animator; 3262package CFPlus::UI::Animator;
2899 3263
2900use CFClient::OpenGL; 3264use CFPlus::OpenGL;
2901 3265
2902our @ISA = CFClient::UI::Bin::; 3266our @ISA = CFPlus::UI::Bin::;
2903 3267
2904sub moveto { 3268sub moveto {
2905 my ($self, $x, $y) = @_; 3269 my ($self, $x, $y) = @_;
2906 3270
2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2935 glPopMatrix; 3299 glPopMatrix;
2936} 3300}
2937 3301
2938############################################################################# 3302#############################################################################
2939 3303
2940package CFClient::UI::Flopper; 3304package CFPlus::UI::Flopper;
2941 3305
2942our @ISA = CFClient::UI::Button::; 3306our @ISA = CFPlus::UI::Button::;
2943 3307
2944sub new { 3308sub new {
2945 my $class = shift; 3309 my $class = shift;
2946 3310
2947 my $self = $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
… …
2959 $self->{other}->toggle_visibility; 3323 $self->{other}->toggle_visibility;
2960} 3324}
2961 3325
2962############################################################################# 3326#############################################################################
2963 3327
2964package CFClient::UI::Tooltip; 3328package CFPlus::UI::Tooltip;
2965 3329
2966our @ISA = CFClient::UI::Bin::; 3330our @ISA = CFPlus::UI::Bin::;
2967 3331
2968use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2969 3333
2970sub new { 3334sub new {
2971 my $class = shift; 3335 my $class = shift;
2972 3336
2973 $class->SUPER::new ( 3337 $class->SUPER::new (
… …
2976 ) 3340 )
2977} 3341}
2978 3342
2979sub set_tooltip_from { 3343sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3344 my ($self, $widget) = @_;
3345
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
2981 3348
2982 my $tooltip = $widget->{tooltip}; 3349 my $tooltip = $widget->{tooltip};
2983 3350
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3351 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3352 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2989 } 3356 }
2990 3357
2991 $tooltip =~ s/^\n+//; 3358 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//; 3359 $tooltip =~ s/\n+$//;
2993 3360
2994 $self->add (new CFClient::UI::Label 3361 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3362 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3364 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3365 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3366 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3367 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3368 );
3002} 3369}
3003 3370
… …
3065 $self->SUPER::_draw; 3432 $self->SUPER::_draw;
3066} 3433}
3067 3434
3068############################################################################# 3435#############################################################################
3069 3436
3070package CFClient::UI::Face; 3437package CFPlus::UI::Face;
3071 3438
3072our @ISA = CFClient::UI::DrawBG::; 3439our @ISA = CFPlus::UI::DrawBG::;
3073 3440
3074use CFClient::OpenGL; 3441use CFPlus::OpenGL;
3075 3442
3076sub new { 3443sub new {
3077 my $class = shift; 3444 my $class = shift;
3078 3445
3079 my $self = $class->SUPER::new ( 3446 my $self = $class->SUPER::new (
3447 size_w => 32,
3448 size_h => 8,
3080 aspect => 1, 3449 aspect => 1,
3081 can_events => 0, 3450 can_events => 0,
3082 @_, 3451 @_,
3083 ); 3452 );
3084 3453
3085 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
3087 3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3088 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3460 parked => 1,
3091 interval => $self->{animspeed},
3092 cb => sub { 3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
3093 ++$widget->{frame}; 3464 ++$widget->{frame};
3465 $widget->update_face;
3094 $widget->update; 3466 $widget->update;
3467
3468 $widget->update_timer;
3095 }, 3469 },
3096 ); 3470 );
3471
3472 $self->update_face;
3473 $self->update_timer;
3097 } 3474 }
3098 3475
3099 $self 3476 $self
3100} 3477}
3101 3478
3479sub update_timer {
3480 my ($self) = @_;
3481
3482 return unless $self->{timer};
3483
3484 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start;
3491 } else {
3492 $self->{timer}->stop;
3493 }
3494}
3495
3496sub update_face {
3497 my ($self) = @_;
3498
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
3102sub size_request { 3510sub size_request {
3103 (32, 8) 3511 my ($self) = @_;
3512
3513 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex;
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3520 $self->realloc;
3521 });
3522 }
3523 }
3524 }
3525
3526 ($self->{size_w} || 8, $self->{size_h} || 8)
3104} 3527}
3105 3528
3106sub update { 3529sub update {
3107 my ($self) = @_; 3530 my ($self) = @_;
3108 3531
3109 return unless $self->{visible}; 3532 return unless $self->{visible};
3110 3533
3111 $self->SUPER::update; 3534 $self->SUPER::update;
3112} 3535}
3113 3536
3537sub invoke_visibility_change {
3538 my ($self) = @_;
3539
3540 $self->update_timer;
3541
3542 0
3543}
3544
3114sub _draw { 3545sub _draw {
3115 my ($self) = @_; 3546 my ($self) = @_;
3116 3547
3117 return unless $::CONN;
3118
3119 $self->SUPER::_draw; 3548 $self->SUPER::_draw;
3120 3549
3121 my $face; 3550 if (my $tex = $self->{tex}) {
3122
3123 if ($self->{frame}) {
3124 my $anim = $::CONN->{anim}[$self->{anim}];
3125
3126 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim;
3128 }
3129
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3131
3132 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3551 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3553 glColor 0, 0, 0, 1;
3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3554 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3137 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
… …
3139} 3557}
3140 3558
3141sub destroy { 3559sub destroy {
3142 my ($self) = @_; 3560 my ($self) = @_;
3143 3561
3144 $self->{timer}->cancel 3562 (delete $self->{timer})->cancel
3145 if $self->{timer}; 3563 if $self->{timer};
3146 3564
3147 $self->SUPER::destroy; 3565 $self->SUPER::destroy;
3148} 3566}
3149 3567
3150############################################################################# 3568#############################################################################
3151 3569
3152package CFClient::UI::Buttonbar; 3570package CFPlus::UI::Buttonbar;
3153 3571
3154our @ISA = CFClient::UI::HBox::; 3572our @ISA = CFPlus::UI::HBox::;
3155 3573
3156# TODO: should actualyl wrap buttons and other goodies. 3574# TODO: should actually wrap buttons and other goodies.
3157 3575
3158############################################################################# 3576#############################################################################
3159 3577
3160package CFClient::UI::Menu; 3578package CFPlus::UI::Menu;
3161 3579
3162our @ISA = CFClient::UI::FancyFrame::; 3580our @ISA = CFPlus::UI::Toplevel::;
3163 3581
3164use CFClient::OpenGL; 3582use CFPlus::OpenGL;
3165 3583
3166sub new { 3584sub new {
3167 my $class = shift; 3585 my $class = shift;
3168 3586
3169 my $self = $class->SUPER::new ( 3587 my $self = $class->SUPER::new (
3170 items => [], 3588 items => [],
3171 z => 100, 3589 z => 100,
3172 @_, 3590 @_,
3173 ); 3591 );
3174 3592
3175 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176 3594
3177 for my $item (@{ $self->{items} }) { 3595 for my $item (@{ $self->{items} }) {
3178 my ($widget, $cb, $tooltip) = @$item; 3596 my ($widget, $cb, $tooltip) = @$item;
3179 3597
3180 # handle various types of items, only text for now 3598 # handle various types of items, only text for now
3181 if (!ref $widget) { 3599 if (!ref $widget) {
3182 if ($widget =~ /\t/) { 3600 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2; 3601 my ($left, $right) = split /\t/, $widget, 2;
3184 3602
3185 $widget = new CFClient::UI::HBox 3603 $widget = new CFPlus::UI::HBox
3186 can_hover => 1, 3604 can_hover => 1,
3187 can_events => 1, 3605 can_events => 1,
3188 tooltip => $tooltip, 3606 tooltip => $tooltip,
3189 children => [ 3607 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1), 3608 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1), 3609 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ], 3610 ],
3193 ; 3611 ;
3194 3612
3195 } else { 3613 } else {
3196 $widget = new CFClient::UI::Label 3614 $widget = new CFPlus::UI::Label
3197 can_hover => 1, 3615 can_hover => 1,
3198 can_events => 1, 3616 can_events => 1,
3199 markup => $widget, 3617 markup => $widget,
3200 tooltip => $tooltip; 3618 tooltip => $tooltip;
3201 } 3619 }
… …
3249 1 3667 1
3250} 3668}
3251 3669
3252############################################################################# 3670#############################################################################
3253 3671
3254package CFClient::UI::Multiplexer; 3672package CFPlus::UI::Multiplexer;
3255 3673
3256our @ISA = CFClient::UI::Container::; 3674our @ISA = CFPlus::UI::Container::;
3257 3675
3258sub new { 3676sub new {
3259 my $class = shift; 3677 my $class = shift;
3260 3678
3261 my $self = $class->SUPER::new ( 3679 my $self = $class->SUPER::new (
… …
3322 $self->{current}->draw; 3740 $self->{current}->draw;
3323} 3741}
3324 3742
3325############################################################################# 3743#############################################################################
3326 3744
3327package CFClient::UI::Notebook; 3745package CFPlus::UI::Notebook;
3328 3746
3329our @ISA = CFClient::UI::VBox::; 3747our @ISA = CFPlus::UI::VBox::;
3330 3748
3331sub new { 3749sub new {
3332 my $class = shift; 3750 my $class = shift;
3333 3751
3334 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
3335 buttonbar => (new CFClient::UI::Buttonbar), 3753 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self 3755 # filter => # will be put between multiplexer and $self
3338 @_, 3756 @_,
3339 ); 3757 );
3340 3758
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3345} 3763}
3346 3764
3347sub add { 3765sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3349 3767
3350 Scalar::Util::weaken $self; 3768 CFPlus::weaken $self;
3351 3769
3352 $self->{buttonbar}->add (new CFClient::UI::Button 3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3353 markup => $title, 3772 markup => $title,
3354 tooltip => $tooltip, 3773 tooltip => $tooltip,
3774 );
3775 }
3776
3355 on_activate => sub { $self->set_current_page ($widget) }, 3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3356 ); 3778 $self->{buttonbar}->add ($title);
3357 3779
3358 $self->{multiplexer}->add ($widget); 3780 $self->{multiplexer}->add ($widget);
3359} 3781}
3360 3782
3361sub get_current_page { 3783sub get_current_page {
… …
3371 $self->emit (page_changed => $self->{multiplexer}{current}); 3793 $self->emit (page_changed => $self->{multiplexer}{current});
3372} 3794}
3373 3795
3374############################################################################# 3796#############################################################################
3375 3797
3376package CFClient::UI::Selector; 3798package CFPlus::UI::Selector;
3377 3799
3378use utf8; 3800use utf8;
3379 3801
3380our @ISA = CFClient::UI::Button::; 3802our @ISA = CFPlus::UI::Button::;
3381 3803
3382sub new { 3804sub new {
3383 my $class = shift; 3805 my $class = shift;
3384 3806
3385 my $self = $class->SUPER::new ( 3807 my $self = $class->SUPER::new (
… …
3402 my ($value, $title, $tooltip) = @$_; 3824 my ($value, $title, $tooltip) = @$_;
3403 3825
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3826 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 } 3827 }
3406 3828
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3829 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408} 3830}
3409 3831
3410sub _set_value { 3832sub _set_value {
3411 my ($self, $value) = @_; 3833 my ($self, $value) = @_;
3412 3834
… …
3427 $self->emit (changed => $value); 3849 $self->emit (changed => $value);
3428} 3850}
3429 3851
3430############################################################################# 3852#############################################################################
3431 3853
3432package CFClient::UI::Statusbox; 3854package CFPlus::UI::Statusbox;
3433 3855
3434our @ISA = CFClient::UI::VBox::; 3856our @ISA = CFPlus::UI::VBox::;
3435 3857
3436sub new { 3858sub new {
3437 my $class = shift; 3859 my $class = shift;
3438 3860
3439 my $self = $class->SUPER::new ( 3861 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3862 fontsize => 0.8,
3441 @_, 3863 @_,
3442 ); 3864 );
3443 3865
3444 Scalar::Util::weaken (my $this = $self); 3866 CFPlus::weaken (my $this = $self);
3445 3867
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3868 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447 3869
3448 $self 3870 $self
3449} 3871}
… …
3451sub reorder { 3873sub reorder {
3452 my ($self) = @_; 3874 my ($self) = @_;
3453 my $NOW = Time::HiRes::time; 3875 my $NOW = Time::HiRes::time;
3454 3876
3455 # freeze display when hovering over any label 3877 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner} 3878 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3879 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} }; 3880 values %{ $self->{item} };
3459 3881
3460 while (my ($k, $v) = each %{ $self->{item} }) { 3882 while (my ($k, $v) = each %{ $self->{item} }) {
3461 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3883 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462 } 3884 }
… …
3483 for ($short) { 3905 for ($short) {
3484 s/^\s+//; 3906 s/^\s+//;
3485 s/\s+/ /g; 3907 s/\s+/ /g;
3486 } 3908 }
3487 3909
3488 new CFClient::UI::Label 3910 new CFPlus::UI::Label
3489 markup => $short, 3911 markup => $short,
3490 tooltip => $item->{tooltip}, 3912 tooltip => $item->{tooltip},
3491 tooltip_font => $::FONT_PROP, 3913 tooltip_font => $::FONT_PROP,
3492 tooltip_width => 0.67, 3914 tooltip_width => 0.67,
3493 fontsize => $item->{fontsize} || $self->{fontsize}, 3915 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3572 $self->SUPER::destroy; 3994 $self->SUPER::destroy;
3573} 3995}
3574 3996
3575############################################################################# 3997#############################################################################
3576 3998
3577package CFClient::UI::Inventory;
3578
3579our @ISA = CFClient::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFClient::UI::SpellList;
3640
3641our @ISA = CFClient::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFClient::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFClient::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFClient::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFClient::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
3761package CFClient::UI::Root; 3999package CFPlus::UI::Root;
3762 4000
3763our @ISA = CFClient::UI::Container::; 4001our @ISA = CFPlus::UI::Container::;
3764 4002
3765use List::Util qw(min max); 4003use List::Util qw(min max);
3766 4004
3767use CFClient::OpenGL; 4005use CFPlus::OpenGL;
3768 4006
3769sub new { 4007sub new {
3770 my $class = shift; 4008 my $class = shift;
3771 4009
3772 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3773 visible => 1, 4011 visible => 1,
3774 @_, 4012 @_,
3775 ); 4013 );
3776 4014
3777 Scalar::Util::weaken ($self->{root} = $self); 4015 CFPlus::weaken ($self->{root} = $self);
3778 4016
3779 $self 4017 $self
3780} 4018}
3781 4019
3782sub size_request { 4020sub size_request {
… …
3877 while ($self->{refresh_hook}) { 4115 while ($self->{refresh_hook}) {
3878 $_->() 4116 $_->()
3879 for values %{delete $self->{refresh_hook}}; 4117 for values %{delete $self->{refresh_hook}};
3880 } 4118 }
3881 4119
3882 if ($self->{realloc}) { 4120 while ($self->{realloc}) {
3883 my %queue; 4121 my %queue;
3884 my @queue; 4122 my @queue;
3885 my $widget; 4123 my $widget;
3886 4124
3887 outer: 4125 outer:
… …
3934 } 4172 }
3935 } 4173 }
3936 4174
3937 delete $self->{realloc}{$widget+0}; 4175 delete $self->{realloc}{$widget+0};
3938 } 4176 }
3939 }
3940 4177
3941 while (my $size_alloc = delete $self->{size_alloc}) { 4178 while (my $size_alloc = delete $self->{size_alloc}) {
3942 my @queue = sort { $b->{visible} <=> $a->{visible} } 4179 my @queue = sort { $a->{visible} <=> $b->{visible} }
3943 values %$size_alloc; 4180 values %$size_alloc;
3944 4181
3945 while () { 4182 while () {
3946 my $widget = pop @queue || last; 4183 my $widget = pop @queue || last;
3947 4184
3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3949 4186
3950 $w = 0 if $w < 0;
3951 $h = 0 if $h < 0;
3952
3953 $w = max $widget->{min_w}, $w; 4187 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h; 4188 $h = max $widget->{min_h}, $h;
3955 4189
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4190# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4191# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958 4192
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4193 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4194 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961 4195
3962 $w = int $w + 0.5; 4196 $w = int $w + 0.5;
3963 $h = int $h + 0.5; 4197 $h = int $h + 0.5;
3964 4198
3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4199 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966 $widget->{old_w} = $widget->{w}; 4200 $widget->{old_w} = $widget->{w};
3967 $widget->{old_h} = $widget->{h}; 4201 $widget->{old_h} = $widget->{h};
3968 4202
3969 $widget->{w} = $w; 4203 $widget->{w} = $w;
3970 $widget->{h} = $h; 4204 $widget->{h} = $h;
3971 4205
3972 $widget->emit (size_allocate => $w, $h); 4206 $widget->emit (size_allocate => $w, $h);
4207 }
3973 } 4208 }
3974 } 4209 }
3975 } 4210 }
3976 4211
3977 while ($self->{post_alloc_hook}) { 4212 while ($self->{post_alloc_hook}) {
3978 $_->() 4213 $_->()
3979 for values %{delete $self->{post_alloc_hook}}; 4214 for values %{delete $self->{post_alloc_hook}};
3980 } 4215 }
3981
3982 4216
3983 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4217 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4218 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985 glClear GL_COLOR_BUFFER_BIT; 4219 glClear GL_COLOR_BUFFER_BIT;
3986 4220
… …
3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4223 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990 glMatrixMode GL_MODELVIEW; 4224 glMatrixMode GL_MODELVIEW;
3991 glLoadIdentity; 4225 glLoadIdentity;
3992 4226
3993 { 4227 {
3994 package CFClient::UI::Base; 4228 package CFPlus::UI::Base;
3995 4229
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4231 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4232
4000 $self->_draw; 4233 $self->_draw;
4234 }
4001} 4235}
4002 4236
4003############################################################################# 4237#############################################################################
4004 4238
4005package CFClient::UI; 4239package CFPlus::UI;
4006 4240
4007$ROOT = new CFClient::UI::Root; 4241$ROOT = new CFPlus::UI::Root;
4008$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4242$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009 4243
40101 42441
4011 4245

Diff Legend

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