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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
96 99
97sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
98 my ($ev) = @_; 101 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
100 103
101 unless ($BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
103 108
104 $GRAB = $widget; 109 $GRAB = $widget;
105 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
106 111
107 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
108 } 113 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
207 reconfigure_widgets; 214 reconfigure_widgets;
208} 215}
209 216
210############################################################################# 217#############################################################################
211 218
212package CFClient::UI::Event; 219package CFPlus::UI::Event;
213 220
214sub xy { 221sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 223}
217 224
218############################################################################# 225#############################################################################
219 226
220package CFClient::UI::Base; 227package CFPlus::UI::Base;
221 228
222use strict; 229use strict;
223 230
224use CFClient::OpenGL; 231use CFPlus::OpenGL;
225 232
226sub new { 233sub new {
227 my $class = shift; 234 my $class = shift;
228 235
229 my $self = bless { 236 my $self = bless {
… …
234 h => undef, 241 h => undef,
235 can_events => 1, 242 can_events => 1,
236 @_ 243 @_
237 }, $class; 244 }, $class;
238 245
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 247
241 for (keys %$self) { 248 for (keys %$self) {
242 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
244 } 251 }
245 } 252 }
246 253
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 259
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 262
256 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
261 268
262sub destroy { 269sub destroy {
263 my ($self) = @_; 270 my ($self) = @_;
264 271
265 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
266 %$self = (); 274 %$self = ();
267} 275}
268 276
277sub TO_JSON {
278 { __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) = @_;
… …
619 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
622 glEnd; 636 glEnd;
623 glPopMatrix; 637 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 } 639 }
626 640
627 $self->_draw; 641 $self->_draw;
628 glPopMatrix; 642 glPopMatrix;
629} 643}
… …
635} 649}
636 650
637sub DESTROY { 651sub DESTROY {
638 my ($self) = @_; 652 my ($self) = @_;
639 653
640 return if CFClient::in_destruct; 654 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 655
644 eval { $self->destroy }; 656 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658
659 delete $WIDGET{$self+0};
646} 660}
647 661
648############################################################################# 662#############################################################################
649 663
650package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
651 665
652our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
653 667
654use strict; 668use strict;
655use CFClient::OpenGL; 669use CFPlus::OpenGL;
656 670
657sub new { 671sub new {
658 my $class = shift; 672 my $class = shift;
659 673
660 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
691 } 705 }
692} 706}
693 707
694############################################################################# 708#############################################################################
695 709
696package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
697 711
698our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
699 713
700sub new { 714sub new {
701 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
703} 717}
… …
710 724
711sub draw { } 725sub draw { }
712 726
713############################################################################# 727#############################################################################
714 728
715package CFClient::UI::Container; 729package CFPlus::UI::Container;
716 730
717our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
718 732
719sub new { 733sub new {
720 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
721 735
722 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
726 can_events => 0, 740 can_events => 0,
727 %arg, 741 %arg,
728 ); 742 );
729 743
730 $self->add (@$children) 744 $self->add (@$children)
731 if $children; 745 if $children && @$children;
732 746
733 $self 747 $self
734} 748}
735 749
736sub realloc { 750sub realloc {
… …
745 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
746 760
747 $_->set_parent ($self) 761 $_->set_parent ($self)
748 for @widgets; 762 for @widgets;
749 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 765 use sort 'stable';
751 766
752 $self->{children} = [ 767 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
755 ]; 770 ];
756 771
757 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
758} 775}
759 776
760sub children { 777sub children {
761 @{ $_[0]{children} } 778 @{ $_[0]{children} }
762} 779}
… …
773} 790}
774 791
775sub clear { 792sub clear {
776 my ($self) = @_; 793 my ($self) = @_;
777 794
778 my $children = delete $self->{children}; 795 my $children = $self->{children};
779 $self->{children} = []; 796 $self->{children} = [];
780 797
781 for (@$children) { 798 for (@$children) {
782 delete $_->{parent}; 799 delete $_->{parent};
783 $_->hide; 800 $_->hide;
… …
808 $_->draw for @{$self->{children}}; 825 $_->draw for @{$self->{children}};
809} 826}
810 827
811############################################################################# 828#############################################################################
812 829
813package CFClient::UI::Bin; 830package CFPlus::UI::Bin;
814 831
815our @ISA = CFClient::UI::Container::; 832our @ISA = CFPlus::UI::Container::;
816 833
817sub new { 834sub new {
818 my ($class, %arg) = @_; 835 my ($class, %arg) = @_;
819 836
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 837 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 838
822 $class->SUPER::new (children => [$child], %arg) 839 $class->SUPER::new (children => [$child], %arg)
823} 840}
824 841
825sub add { 842sub add {
… …
832sub remove { 849sub remove {
833 my ($self, $widget) = @_; 850 my ($self, $widget) = @_;
834 851
835 $self->SUPER::remove ($widget); 852 $self->SUPER::remove ($widget);
836 853
837 $self->{children} = [new CFClient::UI::Empty] 854 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 855 unless @{$self->{children}};
839} 856}
840 857
841sub child { $_[0]->{children}[0] } 858sub child { $_[0]->{children}[0] }
842 859
… …
854 871
855############################################################################# 872#############################################################################
856 873
857# back-buffered drawing area 874# back-buffered drawing area
858 875
859package CFClient::UI::Window; 876package CFPlus::UI::Window;
860 877
861our @ISA = CFClient::UI::Bin::; 878our @ISA = CFPlus::UI::Bin::;
862 879
863use CFClient::OpenGL; 880use CFPlus::OpenGL;
864 881
865sub new { 882sub new {
866 my ($class, %arg) = @_; 883 my ($class, %arg) = @_;
867 884
868 my $self = $class->SUPER::new (%arg); 885 my $self = $class->SUPER::new (%arg);
… …
890} 907}
891 908
892sub render_child { 909sub render_child {
893 my ($self) = @_; 910 my ($self) = @_;
894 911
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 912 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 913 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 914 glClear GL_COLOR_BUFFER_BIT;
898 915
899 { 916 {
900 package CFClient::UI::Base; 917 package CFPlus::UI::Base;
901 918
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 919 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 920 (0, 0, $self->{w}, $self->{h});
921
922 $self->_render;
904 } 923 }
905
906 $self->_render;
907 }; 924 };
908} 925}
909 926
910sub _draw { 927sub _draw {
911 my ($self) = @_; 928 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 929
915 my $tex = $self->{texture} 930 my $tex = $self->{texture}
916 or return; 931 or return;
917 932
918 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 935 glColor 0, 0, 0, 1;
921 936
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
923 938
924 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
925} 940}
926 941
927############################################################################# 942#############################################################################
928 943
929package CFClient::UI::ViewPort; 944package CFPlus::UI::ViewPort;
930 945
946use List::Util qw(min max);
947
931our @ISA = CFClient::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
932 949
933sub new { 950sub new {
934 my $class = shift; 951 my $class = shift;
935 952
936 $class->SUPER::new ( 953 $class->SUPER::new (
… …
943sub size_request { 960sub size_request {
944 my ($self) = @_; 961 my ($self) = @_;
945 962
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 964
948 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
950 967
951 ($w, $h) 968 ($w, $h)
952} 969}
953 970
954sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
966} 983}
967 984
968sub set_offset { 985sub set_offset {
969 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
970 987
988 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
973 994
995 $self->emit (changed => $x, $y);
974 $self->update; 996 $self->update;
997 }
975} 998}
976 999
977# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 1001sub coord2local {
979 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
995 1018
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1021 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1023 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1025 }
1003} 1026}
1004 1027
1005sub _render { 1028sub _render {
1006 my ($self) = @_; 1029 my ($self) = @_;
1007 1030
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1031 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}; 1032 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1033
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1035
1013 $self->SUPER::_render; 1036 $self->SUPER::_render;
1014} 1037}
1015 1038
1016############################################################################# 1039#############################################################################
1017 1040
1018package CFClient::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
1019 1042
1020our @ISA = CFClient::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
1021 1044
1022sub new { 1045sub new {
1023 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1024 1047
1025 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1026 1049
1027 my $self; 1050 my $self;
1028 1051
1029 my $slider = new CFClient::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub {
1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 },
1061 ;
1062
1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
1030 vertical => 1, 1066 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1068 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1071 },
1035 ; 1072 ;
1036 1073
1037 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1039 can_events => 1, 1077 can_events => 1,
1040 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1041 %arg, 1082 %arg,
1042 ); 1083 );
1043 1084
1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1088 expand => 1,
1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1104 ;
1105
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
1045 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1046 1109
1047 $self 1110 $self
1048} 1111}
1049
1050#TODO# update range on size_allocate depending on child
1051 1112
1052sub add { 1113sub add {
1053 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1054 1115
1055 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1056} 1117}
1057 1118
1119sub update_slider {
1120 my ($self) = @_;
1121
1122 my $child = ($self->{vp} or return)->child;
1123
1124 if ($self->{scroll_x}) {
1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1127
1128 my $visible = $w1 > $w2;
1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1131 $visible ? $self->SUPER::add ($self->{hslider})
1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1134 }
1135
1136 if ($self->{scroll_y}) {
1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1139
1140 my $visible = $h1 > $h2;
1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1143 $visible ? $self->SUPER::add ($self->{vslider})
1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1146 }
1147}
1148
1149sub start_dragging {
1150 my ($self, $ev) = @_;
1151
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x};
1155 my $oy = $self->{vp}{view_y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1164 };
1165}
1166
1058sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1060 1169
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1172
1065 1 1173 1
1066} 1174}
1067 1175
1068sub update_slider { 1176sub invoke_button_down {
1069 my ($self) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1070 1178
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1179 if ($ev->{button} == 2) {
1072} 1180 $self->start_dragging ($ev);
1181 return 1;
1182 }
1073 1183
1074sub update { 1184 0
1075 my ($self) = @_; 1185}
1076 1186
1077 $self->SUPER::update; 1187sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_;
1078 1189
1079 $self->update_slider; 1190 if (delete $self->{motion}) {
1191 return 1;
1192 }
1193
1194 0
1195}
1196
1197sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_;
1199
1200 if ($self->{motion}) {
1201 $self->{motion}->($ev, $x, $y);
1202 return 1;
1203 }
1204
1205 0
1080} 1206}
1081 1207
1082sub invoke_size_allocate { 1208sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1084 1210
1085 $self->update_slider; 1211 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1212 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1213}
1089 1214
1090############################################################################# 1215#############################################################################
1091 1216
1092package CFClient::UI::Frame; 1217package CFPlus::UI::Frame;
1093 1218
1094our @ISA = CFClient::UI::Bin::; 1219our @ISA = CFPlus::UI::Bin::;
1095 1220
1096use CFClient::OpenGL; 1221use CFPlus::OpenGL;
1097 1222
1098sub new { 1223sub new {
1099 my $class = shift; 1224 my $class = shift;
1100 1225
1101 $class->SUPER::new ( 1226 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1252 $self->SUPER::_draw;
1128} 1253}
1129 1254
1130############################################################################# 1255#############################################################################
1131 1256
1132package CFClient::UI::FancyFrame; 1257package CFPlus::UI::FancyFrame;
1133 1258
1134our @ISA = CFClient::UI::Bin::; 1259our @ISA = CFPlus::UI::Bin::;
1135 1260
1136use CFClient::OpenGL; 1261use CFPlus::OpenGL;
1262
1263sub new {
1264 my ($class, %arg) = @_;
1265
1266 if ((exists $arg{label}) && !ref $arg{label}) {
1267 $arg{label} = new CFPlus::UI::Label
1268 align => 1,
1269 valign => 0,
1270 text => $arg{label},
1271 fontsize => ($arg{border} || 0.8) * 0.75;
1272 }
1273
1274 my $self = $class->SUPER::new (
1275 # label => "",
1276 fg => [0.6, 0.3, 0.1],
1277 border => 0.8,
1278 style => 'single',
1279 %arg,
1280 );
1281
1282 $self
1283}
1284
1285sub add {
1286 my ($self, @widgets) = @_;
1287
1288 $self->SUPER::add (@widgets);
1289 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1290}
1291
1292sub border {
1293 int $_[0]{border} * $::FONTSIZE
1294}
1295
1296sub size_request {
1297 my ($self) = @_;
1298
1299 ($self->{label_w}, undef) = $self->{label}->size_request
1300 if $self->{label};
1301
1302 my ($w, $h) = $self->SUPER::size_request;
1303
1304 (
1305 $w + $self->border * 2,
1306 $h + $self->border * 2,
1307 )
1308}
1309
1310sub invoke_size_allocate {
1311 my ($self, $w, $h) = @_;
1312
1313 my $border = $self->border;
1314
1315 $w -= List::Util::max 0, $border * 2;
1316 $h -= List::Util::max 0, $border * 2;
1317
1318 if (my $label = $self->{label}) {
1319 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1320 $label->{h} = List::Util::min $h, $border;
1321 $label->invoke_size_allocate ($label->{w}, $label->{h});
1322 }
1323
1324 $self->child->configure ($border, $border, $w, $h);
1325
1326 1
1327}
1328
1329sub _draw {
1330 my ($self) = @_;
1331
1332 my $child = $self->{children}[0];
1333
1334 my $border = $self->border;
1335 my ($w, $h) = ($self->{w}, $self->{h});
1336
1337 $child->draw;
1338
1339 glColor @{$self->{fg}};
1340 glBegin GL_LINE_STRIP;
1341 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1342 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1343 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1344 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1345 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1346 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1347 glEnd;
1348
1349 if ($self->{label}) {
1350 glTranslate $border * 2, 0;
1351 $self->{label}->_draw;
1352 }
1353}
1354
1355#############################################################################
1356
1357package CFPlus::UI::Toplevel;
1358
1359our @ISA = CFPlus::UI::Bin::;
1360
1361use CFPlus::OpenGL;
1137 1362
1138my $bg = 1363my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1365 mipmap => 1, wrap => 1;
1141 1366
1142my @border = 1367my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1368 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); 1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1145 1374
1146sub new { 1375sub new {
1147 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1148 1377
1149 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1383 min_w => 64,
1155 min_h => 32, 1384 min_h => 32,
1156 %arg, 1385 %arg,
1157 ); 1386 );
1158 1387
1159 $self->{title_widget} = new CFClient::UI::Label 1388 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1389 align => 0,
1161 valign => 1, 1390 valign => 1,
1162 text => $self->{title}, 1391 text => $self->{title},
1163 fontsize => $self->{border}, 1392 fontsize => $self->{border},
1164 if exists $self->{title}; 1393 if exists $self->{title};
1165 1394
1166 if ($self->{has_close_button}) { 1395 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1396 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1397 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1398 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1399 on_activate => sub { $self->emit ("delete") };
1171 1400
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1401 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1402 }
1174 1403
1175 $self 1404 $self
1176} 1405}
1177 1406
1178sub add { 1407sub add {
1179 my ($self, @widgets) = @_; 1408 my ($self, @widgets) = @_;
1180 1409
1181 $self->SUPER::add (@widgets); 1410 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1411 $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}; 1412 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1413}
1185 1414
1186sub border { 1415sub border {
1187 int $_[0]{border} * $::FONTSIZE 1416 int $_[0]{border} * $::FONTSIZE
1188} 1417}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1525 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1526
1298 ! ! $self->{motion} 1527 ! ! $self->{motion}
1299} 1528}
1300 1529
1530sub invoke_visibility_change {
1531 my ($self, $visible) = @_;
1532
1533 delete $self->{motion} unless $visible;
1534
1535 0
1536}
1537
1301sub _draw { 1538sub _draw {
1302 my ($self) = @_; 1539 my ($self) = @_;
1303 1540
1304 my $child = $self->{children}[0]; 1541 my $child = $self->{children}[0];
1305 1542
… …
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1548
1312 my $border = $self->border; 1549 my $border = $self->border;
1313 1550
1314 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319 1570
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1322 1573
1323 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1593 if $self->{close_button};
1343} 1594}
1344 1595
1345############################################################################# 1596#############################################################################
1346 1597
1347package CFClient::UI::Table; 1598package CFPlus::UI::Table;
1348 1599
1349our @ISA = CFClient::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1350 1601
1351use List::Util qw(max sum); 1602use List::Util qw(max sum);
1352 1603
1353use CFClient::OpenGL; 1604use CFPlus::OpenGL;
1354 1605
1355sub new { 1606sub new {
1356 my $class = shift; 1607 my $class = shift;
1357 1608
1358 $class->SUPER::new ( 1609 $class->SUPER::new (
1359 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1360 @_, 1612 @_,
1361 ) 1613 )
1362} 1614}
1363 1615
1364sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366}
1367
1368sub add { 1616sub add {
1617 my ($self, @widgets) = @_;
1618
1619 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1623
1624 $self->SUPER::add (@widgets);
1625}
1626
1627sub add_at {
1369 my ($self) = shift; 1628 my $self = shift;
1629
1630 my @widgets;
1370 1631
1371 while (@_) { 1632 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child;
1375 }
1376 1634
1377 $self->{force_realloc} = 1; 1635 $child->{row} = $row;
1378 $self->{force_size_alloc} = 1; 1636 $child->{col} = $col;
1379 $self->realloc;
1380}
1381 1637
1382sub remove { 1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1383 my ($self, $child) = @_; 1645 my ($self) = @_;
1384 1646
1385 # TODO: not yet implemented 1647 my (@w, @h);
1386}
1387
1388# TODO: move to container class maybe? send children a signal on removal?
1389sub clear {
1390 my ($self) = @_;
1391 1648
1392 my @children = $self->children; 1649 my @children = $self->children;
1393 delete $self->{children}; 1650
1651 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1654
1655 my $sw = sum @w[$c .. $c + $cs - 1];
1656
1657 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 }
1394 1660 }
1395 for (@children) {
1396 delete $_->{parent};
1397 $_->hide;
1398 }
1399 1661
1400 $self->realloc; 1662 # second pass, rows
1401} 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1402
1403sub get_wh {
1404 my ($self) = @_;
1405
1406 my (@w, @h);
1407
1408 for my $y (0 .. $#{$self->{children}}) {
1409 my $row = $self->{children}[$y]
1410 or next;
1411
1412 for my $x (0 .. $#$row) {
1413 my $widget = $row->[$x]
1414 or next;
1415 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1416 1665
1417 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1418 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419 } 1670 }
1420 } 1671 }
1421 1672
1422 (\@w, \@h) 1673 (\@w, \@h)
1423} 1674}
… …
1439 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1440 1691
1441 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1443 1694
1444 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1445 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1448 1699
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1701
1453 CFClient::UI::harmonize $ws; 1702 CFPlus::UI::harmonize $ws;
1703
1704 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1;
1707
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709
1454 CFClient::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1455 1711
1456 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457 1714
1458 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1459 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1460 or next;
1461 1717
1462 my $x = 0; 1718 $widget->configure (
1463 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464 1721 );
1465 for my $c (0 .. $#$row) { 1722 }
1466 my $col_w = $ws->[$c];
1467 1723
1468 if (my $widget = $row->[$c]) { 1724 1
1469 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1470 }
1471 1726
1472 $x += $col_w; 1727#############################################################################
1728
1729package CFPlus::UI::Fixed;
1730
1731use List::Util qw(min max);
1732
1733our @ISA = CFPlus::UI::Container::;
1734
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) {
1743 my ($mode, $val, $max) = @_;
1744
1745 $mode eq "abs" ? $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748}
1749
1750sub size_request {
1751 my ($self) = @_;
1752
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754
1755 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1758
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1473 } 1765 }
1766 }
1474 1767
1475 $y += $row_h; 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 # now layout remaining widgets
1772 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1774
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1783 }
1784 }
1785
1786 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1;
1788
1789 ($W, $H)
1790}
1791
1792sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_;
1794
1795 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1797
1798 $x = _scale $pos, $x, $W;
1799 $y = _scale $pos, $x, $H;
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1802
1803 $child->configure ($x, $y, $w, $h);
1476 } 1804 }
1477 1805
1478 1 1806 1
1479} 1807}
1480 1808
1481sub find_widget {
1482 my ($self, $x, $y) = @_;
1483
1484 $x -= $self->{x};
1485 $y -= $self->{y};
1486
1487 my $res;
1488
1489 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490 $res = $_->find_widget ($x, $y)
1491 and return $res;
1492 }
1493
1494 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495}
1496
1497sub _draw {
1498 my ($self) = @_;
1499
1500 for (grep $_, @{$self->{children}}) {
1501 $_->draw for grep $_, @$_;
1502 }
1503}
1504
1505############################################################################# 1809#############################################################################
1506 1810
1507package CFClient::UI::Box; 1811package CFPlus::UI::Box;
1508 1812
1509our @ISA = CFClient::UI::Container::; 1813our @ISA = CFPlus::UI::Container::;
1510 1814
1511sub size_request { 1815sub size_request {
1512 my ($self) = @_; 1816 my ($self) = @_;
1513 1817
1514 $self->{vertical} 1818 $self->{vertical}
… …
1547 $req[$_] += $space * $children[$_]{expand} 1851 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1852 for 0 .. $#children;
1549 } 1853 }
1550 } 1854 }
1551 1855
1552 CFClient::UI::harmonize \@req; 1856 CFPlus::UI::harmonize \@req;
1553 1857
1554 my $pos = 0; 1858 my $pos = 0;
1555 for (0 .. $#children) { 1859 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1860 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1861 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1866 1
1563} 1867}
1564 1868
1565############################################################################# 1869#############################################################################
1566 1870
1567package CFClient::UI::HBox; 1871package CFPlus::UI::HBox;
1568 1872
1569our @ISA = CFClient::UI::Box::; 1873our @ISA = CFPlus::UI::Box::;
1570 1874
1571sub new { 1875sub new {
1572 my $class = shift; 1876 my $class = shift;
1573 1877
1574 $class->SUPER::new ( 1878 $class->SUPER::new (
… …
1577 ) 1881 )
1578} 1882}
1579 1883
1580############################################################################# 1884#############################################################################
1581 1885
1582package CFClient::UI::VBox; 1886package CFPlus::UI::VBox;
1583 1887
1584our @ISA = CFClient::UI::Box::; 1888our @ISA = CFPlus::UI::Box::;
1585 1889
1586sub new { 1890sub new {
1587 my $class = shift; 1891 my $class = shift;
1588 1892
1589 $class->SUPER::new ( 1893 $class->SUPER::new (
… …
1592 ) 1896 )
1593} 1897}
1594 1898
1595############################################################################# 1899#############################################################################
1596 1900
1597package CFClient::UI::Label; 1901package CFPlus::UI::Label;
1598 1902
1599our @ISA = CFClient::UI::DrawBG::; 1903our @ISA = CFPlus::UI::DrawBG::;
1600 1904
1601use CFClient::OpenGL; 1905use CFPlus::OpenGL;
1602 1906
1603sub new { 1907sub new {
1604 my ($class, %arg) = @_; 1908 my ($class, %arg) = @_;
1605 1909
1606 my $self = $class->SUPER::new ( 1910 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1913 #active_bg => none
1610 #font => default_font 1914 #font => default_font
1611 #text => initial text 1915 #text => initial text
1612 #markup => initial narkup 1916 #markup => initial narkup
1613 #max_w => maximum pixel width 1917 #max_w => maximum pixel width
1918 #style => 0, # render flags
1614 ellipsise => 3, # end 1919 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1920 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1921 fontsize => 1,
1617 align => -1, 1922 align => -1,
1618 valign => -1, 1923 valign => -1,
1619 padding_x => 2, 1924 padding_x => 2,
1620 padding_y => 2, 1925 padding_y => 2,
1621 can_events => 0, 1926 can_events => 0,
1622 %arg 1927 %arg
1623 ); 1928 );
1624 1929
1625 if (exists $self->{template}) { 1930 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1931 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1932 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1933 $self->{template} = $layout;
1629 } 1934 }
1630 1935
1631 if (exists $self->{markup}) { 1936 if (exists $self->{markup}) {
… …
1769 }; 2074 };
1770 2075
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2076 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2077 my $h = List::Util::min $self->{h} + 2, $size->[1];
1773 2078
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2080}
1776 2081
1777############################################################################# 2082#############################################################################
1778 2083
1779package CFClient::UI::EntryBase; 2084package CFPlus::UI::EntryBase;
1780 2085
1781our @ISA = CFClient::UI::Label::; 2086our @ISA = CFPlus::UI::Label::;
1782 2087
1783use CFClient::OpenGL; 2088use CFPlus::OpenGL;
1784 2089
1785sub new { 2090sub new {
1786 my $class = shift; 2091 my $class = shift;
1787 2092
1788 $class->SUPER::new ( 2093 $class->SUPER::new (
… …
1792 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1793 can_hover => 1, 2098 can_hover => 1,
1794 can_focus => 1, 2099 can_focus => 1,
1795 valign => 0, 2100 valign => 0,
1796 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
1797 #text => ... 2103 #text => ...
1798 #hidden => "*", 2104 #hidden => "*",
1799 @_ 2105 @_
1800 ) 2106 )
1801} 2107}
… …
1846 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1848 2154
1849 my $text = $self->get_text; 2155 my $text = $self->get_text;
1850 2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2158
1851 if ($uni == 8) { 2159 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2167 } elsif ($sym == CFPlus::SDLK_HOME) {
2168 # what a hack
2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
2173 } elsif ($sym == CFPlus::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
2179 } elsif ($uni == 21) { # ctrl-u
2180 $text = "";
1860 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2183 $self->emit ('escape');
1865 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2188 } else {
1868 return 0; 2189 return 0;
1869 } 2190 }
1870 2191
1871 $self->_set_text ($text); 2192 $self->_set_text ($text);
1872 2193
1873 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1874 2196
1875 1 2197 1
1876} 2198}
1877 2199
1878sub invoke_focus_in { 2200sub invoke_focus_in {
… …
1940 utf8::encode $text; 2262 utf8::encode $text;
1941 2263
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943 } 2265 }
1944 2266
1945 glColor @{$self->{fg}};
1946 glBegin GL_LINES; 2267 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2270 glEnd;
1950 } 2271 }
1951} 2272}
1952 2273
2274#############################################################################
2275
1953package CFClient::UI::Entry; 2276package CFPlus::UI::Entry;
1954 2277
1955our @ISA = CFClient::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
1956 2279
1957use CFClient::OpenGL; 2280use CFPlus::OpenGL;
1958 2281
1959sub invoke_key_down { 2282sub invoke_key_down {
1960 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
1961 2284
1962 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
1963 2286
1964 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
1967 2290
1968 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2293 $self->emit (activate => $txt);
1971 $self->update; 2294 $self->update;
1972 2295
1973 } elsif ($sym == CFClient::SDLK_UP) { 2296 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2297 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2298 $self->{history_saveback} = $self->get_text;
1976 } 2299 }
1977 if (@{$self->{history} || []} > 0) { 2300 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2301 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2303 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2304 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2306 }
1984 2307
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2309 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2311
1989 if ($self->{history_pointer} >= 0) { 2312 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2322 1
2000} 2323}
2001 2324
2002############################################################################# 2325#############################################################################
2003 2326
2327package CFPlus::UI::TextEdit;
2328
2329our @ISA = CFPlus::UI::EntryBase::;
2330
2331use CFPlus::OpenGL;
2332
2333sub move_cursor_ver {
2334 my ($self, $dy) = @_;
2335
2336 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2337
2338 $y += $dy;
2339
2340 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2341 $self->{cursor} = $index;
2342 delete $self->{cur_h};
2343 $self->update;
2344 return;
2345 }
2346}
2347
2348sub invoke_key_down {
2349 my ($self, $ev) = @_;
2350
2351 my $sym = $ev->{sym};
2352
2353 if ($sym == CFPlus::SDLK_UP) {
2354 $self->move_cursor_ver (-1);
2355 } elsif ($sym == CFPlus::SDLK_DOWN) {
2356 $self->move_cursor_ver (+1);
2357 } else {
2358 return $self->SUPER::invoke_key_down ($ev)
2359 }
2360
2361 1
2362}
2363
2364#############################################################################
2365
2004package CFClient::UI::Button; 2366package CFPlus::UI::Button;
2005 2367
2006our @ISA = CFClient::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
2007 2369
2008use CFClient::OpenGL; 2370use CFPlus::OpenGL;
2009 2371
2010my @tex = 2372my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
2013 2375
2014sub new { 2376sub new {
2015 my $class = shift; 2377 my $class = shift;
2016 2378
2017 $class->SUPER::new ( 2379 $class->SUPER::new (
2018 padding_x => 4, 2380 padding_x => 4,
2019 padding_y => 4, 2381 padding_y => 4,
2020 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
2021 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
2022 can_hover => 1, 2384 can_hover => 1,
2023 align => 0, 2385 align => 0,
2024 valign => 0, 2386 valign => 0,
2025 can_events => 1, 2387 can_events => 1,
2026 @_ 2388 @_
… …
2044 2406
2045 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2048 2410
2411 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2413
2051 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2052 2415
2053 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2054} 2417}
2055 2418
2056############################################################################# 2419#############################################################################
2057 2420
2058package CFClient::UI::CheckBox; 2421package CFPlus::UI::CheckBox;
2059 2422
2060our @ISA = CFClient::UI::DrawBG::; 2423our @ISA = CFPlus::UI::DrawBG::;
2061 2424
2062my @tex = 2425my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2427 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2428
2066use CFClient::OpenGL; 2429use CFPlus::OpenGL;
2067 2430
2068sub new { 2431sub new {
2069 my $class = shift; 2432 my $class = shift;
2070 2433
2071 $class->SUPER::new ( 2434 $class->SUPER::new (
… …
2128 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
2129} 2492}
2130 2493
2131############################################################################# 2494#############################################################################
2132 2495
2133package CFClient::UI::Image; 2496package CFPlus::UI::Image;
2134 2497
2135our @ISA = CFClient::UI::Base::; 2498our @ISA = CFPlus::UI::Base::;
2136 2499
2137use CFClient::OpenGL; 2500use CFPlus::OpenGL;
2138 2501
2139our %texture_cache; 2502our %texture_cache;
2140 2503
2141sub new { 2504sub new {
2142 my $class = shift; 2505 my $class = shift;
… …
2148 2511
2149 $self->{path} || $self->{tex} 2512 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2513 or Carp::croak "'path' or 'tex' attributes required";
2151 2514
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154 2517
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
2156 2519
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2521
2159 $self 2522 $self
2160} 2523}
2161 2524
2162sub STORABLE_freeze { 2525sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2526 my ($self, $cloning) = @_;
2164 2527
2165 $self->{path} 2528 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2529 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167 2530
2168 $self->{path} 2531 $self->{path}
2169} 2532}
2170 2533
2171sub STORABLE_attach { 2534sub STORABLE_attach {
… …
2202 glDisable GL_TEXTURE_2D; 2565 glDisable GL_TEXTURE_2D;
2203} 2566}
2204 2567
2205############################################################################# 2568#############################################################################
2206 2569
2207package CFClient::UI::ImageButton; 2570package CFPlus::UI::ImageButton;
2208 2571
2209our @ISA = CFClient::UI::Image::; 2572our @ISA = CFPlus::UI::Image::;
2210 2573
2211use CFClient::OpenGL; 2574use CFPlus::OpenGL;
2212 2575
2213my %textures; 2576my %textures;
2214 2577
2215sub new { 2578sub new {
2216 my $class = shift; 2579 my $class = shift;
… …
2238 1 2601 1
2239} 2602}
2240 2603
2241############################################################################# 2604#############################################################################
2242 2605
2243package CFClient::UI::VGauge; 2606package CFPlus::UI::VGauge;
2244 2607
2245our @ISA = CFClient::UI::Base::; 2608our @ISA = CFPlus::UI::Base::;
2246 2609
2247use List::Util qw(min max); 2610use List::Util qw(min max);
2248 2611
2249use CFClient::OpenGL; 2612use CFPlus::OpenGL;
2250 2613
2251my %tex = ( 2614my %tex = (
2252 food => [ 2615 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2618 ],
2256 grace => [ 2619 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2621 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2622 ],
2260 hp => [ 2623 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2626 ],
2264 mana => [ 2627 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2629 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2630 ],
2268); 2631);
2269 2632
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2633# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2736 glDisable GL_TEXTURE_2D;
2374} 2737}
2375 2738
2376############################################################################# 2739#############################################################################
2377 2740
2378package CFClient::UI::Gauge; 2741package CFPlus::UI::Gauge;
2379 2742
2380our @ISA = CFClient::UI::VBox::; 2743our @ISA = CFPlus::UI::VBox::;
2381 2744
2382sub new { 2745sub new {
2383 my ($class, %arg) = @_; 2746 my ($class, %arg) = @_;
2384 2747
2385 my $self = $class->SUPER::new ( 2748 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2750 can_hover => 1,
2388 can_events => 1, 2751 can_events => 1,
2389 %arg, 2752 %arg,
2390 ); 2753 );
2391 2754
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2755 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2756 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2757 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2758
2396 $self 2759 $self
2397} 2760}
2398 2761
2399sub set_fontsize { 2762sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2783 $self->{value}->set_text ($val);
2421} 2784}
2422 2785
2423############################################################################# 2786#############################################################################
2424 2787
2425package CFClient::UI::Slider; 2788package CFPlus::UI::Slider;
2426 2789
2427use strict; 2790use strict;
2428 2791
2429use CFClient::OpenGL; 2792use CFPlus::OpenGL;
2430 2793
2431our @ISA = CFClient::UI::DrawBG::; 2794our @ISA = CFPlus::UI::DrawBG::;
2432 2795
2433my @tex = 2796my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2798 qw(s1_slider.png s1_slider_bg.png);
2436 2799
2437sub new { 2800sub new {
2438 my $class = shift; 2801 my $class = shift;
2439 2802
… …
2533sub invoke_mouse_wheel { 2896sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2535 2898
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 2900
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 2904
2540 ! ! $delta 2905 ! ! $delta
2541} 2906}
2542 2907
2543sub update { 2908sub update {
… …
2594 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2595} 2960}
2596 2961
2597############################################################################# 2962#############################################################################
2598 2963
2599package CFClient::UI::ValSlider; 2964package CFPlus::UI::ValSlider;
2600 2965
2601our @ISA = CFClient::UI::HBox::; 2966our @ISA = CFPlus::UI::HBox::;
2602 2967
2603sub new { 2968sub new {
2604 my ($class, %arg) = @_; 2969 my ($class, %arg) = @_;
2605 2970
2606 my $range = delete $arg{range}; 2971 my $range = delete $arg{range};
2607 2972
2608 my $self = $class->SUPER::new ( 2973 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2974 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2975 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 2976 to_value => sub { shift },
2612 from_value => sub { shift }, 2977 from_value => sub { shift },
2613 %arg, 2978 %arg,
2614 ); 2979 );
2615 2980
… …
2635sub set_range { shift->{slider}->set_range (@_) } 3000sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 3001sub set_value { shift->{slider}->set_value (@_) }
2637 3002
2638############################################################################# 3003#############################################################################
2639 3004
2640package CFClient::UI::TextScroller; 3005package CFPlus::UI::TextScroller;
2641 3006
2642our @ISA = CFClient::UI::HBox::; 3007our @ISA = CFPlus::UI::HBox::;
2643 3008
2644use CFClient::OpenGL; 3009use CFPlus::OpenGL;
2645 3010
2646sub new { 3011sub new {
2647 my $class = shift; 3012 my $class = shift;
2648 3013
2649 my $self = $class->SUPER::new ( 3014 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3016 can_events => 1,
2652 indent => 0, 3017 indent => 0,
2653 #font => default_font 3018 #font => default_font
2654 @_, 3019 @_,
2655 3020
2656 layout => (new CFClient::Layout), 3021 layout => (new CFPlus::Layout),
2657 par => [], 3022 par => [],
3023 max_par => 0,
2658 height => 0, 3024 height => 0,
2659 children => [ 3025 children => [
2660 (new CFClient::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2662 ], 3028 ],
2663 ); 3029 );
2664 3030
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3031 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3032
… …
2743 3109
2744 # todo: base offset on lines or so, not on pixels 3110 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3111 $self->{children}[1]->set_value ($offset);
2746} 3112}
2747 3113
3114sub current_paragraph {
3115 my ($self) = @_;
3116
3117 $self->{top_paragraph} - 1
3118}
3119
3120sub scroll_to {
3121 my ($self, $para) = @_;
3122
3123 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3124
3125 $self->{scroll_to} = $para;
3126 $self->update;
3127}
3128
2748sub clear { 3129sub clear {
2749 my ($self) = @_; 3130 my ($self) = @_;
2750 3131
2751 my (undef, undef, @other) = @{ $self->{children} }; 3132 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other; 3133 $self->remove ($_) for @other;
… …
2755 $self->{height} = 0; 3136 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3137 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 3138}
2758 3139
2759sub add_paragraph { 3140sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 3141 my $self = shift;
2761 3142
2762 my ($text, @w) = ref $para ? @$para : $para; 3143 for my $para (@_) {
2763
2764 $para = { 3144 $para = {
3145 fg => [1, 1, 1, 1],
3146 indent => 0,
3147 markup => "",
3148 widget => [],
3149 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 3150 w => 1e10,
2766 wrapped => 1, 3151 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 3152 };
2772 3153
2773 $self->add (@w) if @w; 3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3155 push @{$self->{par}}, $para;
3156 }
3157
3158 if (my $max = $self->{max_par}) {
3159 shift @{$self->{par}} while @{$self->{par}} > $max;
3160 }
2775 3161
2776 $self->{need_reflow}++; 3162 $self->{need_reflow}++;
2777 $self->update; 3163 $self->update;
2778} 3164}
2779 3165
2780sub scroll_to_bottom { 3166sub scroll_to_bottom {
2781 my ($self) = @_; 3167 my ($self) = @_;
2782 3168
2783 $self->{scroll_to_bottom} = 1; 3169 $self->{scroll_to} = $#{$self->{par}};
2784 $self->update; 3170 $self->update;
2785} 3171}
2786 3172
3173sub force_uptodate {
3174 my ($self) = @_;
3175
3176 if (delete $self->{need_reflow}) {
3177 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3178
3179 my $height = 0;
3180
3181 for my $para (@{$self->{par}}) {
3182 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3183 my $layout = $self->get_layout ($para);
3184 my ($w, $h) = $layout->size;
3185
3186 $para->{w} = $w + $para->{indent};
3187 $para->{h} = $h;
3188 $para->{wrapped} = $layout->has_wrapped;
3189 }
3190
3191 $para->{y} = $height;
3192 $height += $para->{h};
3193 }
3194
3195 $self->{height} = $height;
3196 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3197
3198 delete $self->{texture};
3199 }
3200
3201 if (my $paridx = delete $self->{scroll_to}) {
3202 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3203 }
3204}
3205
2787sub update { 3206sub update {
2788 my ($self) = @_; 3207 my ($self) = @_;
2789 3208
2790 $self->SUPER::update; 3209 $self->SUPER::update;
2791 3210
2792 return unless $self->{h} > 0; 3211 return unless $self->{h} > 0;
2793 3212
2794 delete $self->{texture}; 3213 delete $self->{texture};
2795 3214
2796 $ROOT->on_post_alloc ($self => sub { 3215 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate;
3217
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798 3219
2799 if (delete $self->{need_reflow}) {
2800 my $height = 0;
2801
2802 for my $para (@{$self->{par}}) {
2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804 my $layout = $self->get_layout ($para);
2805 my ($w, $h) = $layout->size;
2806
2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2810 }
2811
2812 $height += $para->{h};
2813 }
2814
2815 $self->{height} = $height;
2816
2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819 delete $self->{texture};
2820 }
2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827 glClearColor 0, 0, 0, 0; 3221 glClearColor 0, 0, 0, 0;
2828 glClear GL_COLOR_BUFFER_BIT; 3222 glClear GL_COLOR_BUFFER_BIT;
2829 3223
3224 package CFPlus::UI::Base;
3225 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226 (0, 0, $self->{w}, $self->{h});
3227
3228 my $top = int $self->{children}[1]{range}[0];
3229
3230 my $paridx = 0;
3231 my $top_paragraph;
2830 my $top = int $self->{children}[1]{range}[0]; 3232 my $top = int $self->{children}[1]{range}[0];
2831 3233
2832 my $y0 = $top; 3234 my $y0 = $top;
2833 my $y1 = $top + $H; 3235 my $y1 = $top + $H;
2834 3236
2835 my $y = 0;
2836
2837 for my $para (@{$self->{par}}) { 3237 for my $para (@{$self->{par}}) {
2838 my $h = $para->{h}; 3238 my $h = $para->{h};
3239 my $y = $para->{y};
2839 3240
2840 if ($y0 < $y + $h && $y < $y1) { 3241 if ($y0 < $y + $h && $y < $y1) {
2841
2842 my $layout = $self->get_layout ($para); 3242 my $layout = $self->get_layout ($para);
2843 3243
2844 $layout->render ($para->{indent}, $y - $y0); 3244 $layout->render ($para->{indent}, $y - $y0);
2845 3245
2846 if (my @w = @{ $para->{widget} }) { 3246 if (my @w = @{ $para->{widget} }) {
… …
2855 $_->draw; 3255 $_->draw;
2856 } 3256 }
2857 } 3257 }
2858 } 3258 }
2859 3259
2860 $y += $h; 3260 $paridx++;
3261 $top_paragraph ||= $paridx if $y >= $top;
2861 } 3262 }
3263
3264 $self->{top_paragraph} = $top_paragraph;
2862 }; 3265 };
2863 }); 3266 });
2864} 3267}
2865 3268
2866sub reconfigure { 3269sub reconfigure {
… …
2884 $self->{children}[1]->draw; 3287 $self->{children}[1]->draw;
2885} 3288}
2886 3289
2887############################################################################# 3290#############################################################################
2888 3291
2889package CFClient::UI::Animator; 3292package CFPlus::UI::Animator;
2890 3293
2891use CFClient::OpenGL; 3294use CFPlus::OpenGL;
2892 3295
2893our @ISA = CFClient::UI::Bin::; 3296our @ISA = CFPlus::UI::Bin::;
2894 3297
2895sub moveto { 3298sub moveto {
2896 my ($self, $x, $y) = @_; 3299 my ($self, $x, $y) = @_;
2897 3300
2898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2926 glPopMatrix; 3329 glPopMatrix;
2927} 3330}
2928 3331
2929############################################################################# 3332#############################################################################
2930 3333
2931package CFClient::UI::Flopper; 3334package CFPlus::UI::Flopper;
2932 3335
2933our @ISA = CFClient::UI::Button::; 3336our @ISA = CFPlus::UI::Button::;
2934 3337
2935sub new { 3338sub new {
2936 my $class = shift; 3339 my $class = shift;
2937 3340
2938 my $self = $class->SUPER::new ( 3341 my $self = $class->SUPER::new (
… …
2950 $self->{other}->toggle_visibility; 3353 $self->{other}->toggle_visibility;
2951} 3354}
2952 3355
2953############################################################################# 3356#############################################################################
2954 3357
2955package CFClient::UI::Tooltip; 3358package CFPlus::UI::Tooltip;
2956 3359
2957our @ISA = CFClient::UI::Bin::; 3360our @ISA = CFPlus::UI::Bin::;
2958 3361
2959use CFClient::OpenGL; 3362use CFPlus::OpenGL;
2960 3363
2961sub new { 3364sub new {
2962 my $class = shift; 3365 my $class = shift;
2963 3366
2964 $class->SUPER::new ( 3367 $class->SUPER::new (
… …
2967 ) 3370 )
2968} 3371}
2969 3372
2970sub set_tooltip_from { 3373sub set_tooltip_from {
2971 my ($self, $widget) = @_; 3374 my ($self, $widget) = @_;
3375
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
2972 3378
2973 my $tooltip = $widget->{tooltip}; 3379 my $tooltip = $widget->{tooltip};
2974 3380
2975 if ($ENV{CFPLUS_DEBUG} & 2) { 3381 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n" 3382 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2980 } 3386 }
2981 3387
2982 $tooltip =~ s/^\n+//; 3388 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//; 3389 $tooltip =~ s/\n+$//;
2984 3390
2985 $self->add (new CFClient::UI::Label 3391 $self->add (new CFPlus::UI::Label
2986 markup => $tooltip, 3392 markup => $tooltip,
2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988 fontsize => 0.8, 3394 fontsize => 0.8,
2989 fg => [0, 0, 0, 1], 3395 style => 1, # FLAG_INVERSE
2990 ellipsise => 0, 3396 ellipsise => 0,
2991 font => ($widget->{tooltip_font} || $::FONT_PROP), 3397 font => ($widget->{tooltip_font} || $::FONT_PROP),
2992 ); 3398 );
2993} 3399}
2994 3400
… …
3056 $self->SUPER::_draw; 3462 $self->SUPER::_draw;
3057} 3463}
3058 3464
3059############################################################################# 3465#############################################################################
3060 3466
3061package CFClient::UI::Face; 3467package CFPlus::UI::Face;
3062 3468
3063our @ISA = CFClient::UI::DrawBG::; 3469our @ISA = CFPlus::UI::DrawBG::;
3064 3470
3065use CFClient::OpenGL; 3471use CFPlus::OpenGL;
3066 3472
3067sub new { 3473sub new {
3068 my $class = shift; 3474 my $class = shift;
3069 3475
3070 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
3071 aspect => 1, 3479 aspect => 1,
3072 can_events => 0, 3480 can_events => 0,
3073 @_, 3481 @_,
3074 ); 3482 );
3075 3483
3076 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
3077 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
3078 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3079 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
3080 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081 hard => 1, 3490 parked => 1,
3082 interval => $self->{animspeed},
3083 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
3084 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
3085 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
3086 }, 3499 },
3087 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
3088 } 3504 }
3089 3505
3090 $self 3506 $self
3091} 3507}
3092 3508
3509sub update_timer {
3510 my ($self) = @_;
3511
3512 return unless $self->{timer};
3513
3514 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start;
3521 } else {
3522 $self->{timer}->stop;
3523 }
3524}
3525
3526sub update_face {
3527 my ($self) = @_;
3528
3529 return unless $::CONN;
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3536 }
3537 }
3538}
3539
3093sub size_request { 3540sub size_request {
3094 (32, 8) 3541 my ($self) = @_;
3542
3543 if ($::CONN) {
3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3545 if (my $tex = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex;
3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3548 } else {
3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3550 $self->realloc;
3551 });
3552 }
3553 }
3554 }
3555
3556 ($self->{size_w} || 8, $self->{size_h} || 8)
3095} 3557}
3096 3558
3097sub update { 3559sub update {
3098 my ($self) = @_; 3560 my ($self) = @_;
3099 3561
3100 return unless $self->{visible}; 3562 return unless $self->{visible};
3101 3563
3102 $self->SUPER::update; 3564 $self->SUPER::update;
3103} 3565}
3104 3566
3567sub invoke_visibility_change {
3568 my ($self) = @_;
3569
3570 $self->update_timer;
3571
3572 0
3573}
3574
3105sub _draw { 3575sub _draw {
3106 my ($self) = @_; 3576 my ($self) = @_;
3107 3577
3108 return unless $::CONN;
3109
3110 $self->SUPER::_draw; 3578 $self->SUPER::_draw;
3111 3579
3112 my $face; 3580 if (my $tex = $self->{tex}) {
3113
3114 if ($self->{frame}) {
3115 my $anim = $::CONN->{anim}[$self->{anim}];
3116
3117 $face = $anim->[ $self->{frame} % @$anim ]
3118 if $anim && @$anim;
3119 }
3120
3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3122
3123 if ($tex) {
3124 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
3127 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3128 glDisable GL_TEXTURE_2D; 3585 glDisable GL_TEXTURE_2D;
… …
3130} 3587}
3131 3588
3132sub destroy { 3589sub destroy {
3133 my ($self) = @_; 3590 my ($self) = @_;
3134 3591
3135 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3136 if $self->{timer}; 3593 if $self->{timer};
3137 3594
3138 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3139} 3596}
3140 3597
3141############################################################################# 3598#############################################################################
3142 3599
3143package CFClient::UI::Buttonbar; 3600package CFPlus::UI::Buttonbar;
3144 3601
3145our @ISA = CFClient::UI::HBox::; 3602our @ISA = CFPlus::UI::HBox::;
3146 3603
3147# TODO: should actualyl wrap buttons and other goodies. 3604# TODO: should actually wrap buttons and other goodies.
3148 3605
3149############################################################################# 3606#############################################################################
3150 3607
3151package CFClient::UI::Menu; 3608package CFPlus::UI::Menu;
3152 3609
3153our @ISA = CFClient::UI::FancyFrame::; 3610our @ISA = CFPlus::UI::Toplevel::;
3154 3611
3155use CFClient::OpenGL; 3612use CFPlus::OpenGL;
3156 3613
3157sub new { 3614sub new {
3158 my $class = shift; 3615 my $class = shift;
3159 3616
3160 my $self = $class->SUPER::new ( 3617 my $self = $class->SUPER::new (
3161 items => [], 3618 items => [],
3162 z => 100, 3619 z => 100,
3163 @_, 3620 @_,
3164 ); 3621 );
3165 3622
3166 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3623 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167 3624
3168 for my $item (@{ $self->{items} }) { 3625 for my $item (@{ $self->{items} }) {
3169 my ($widget, $cb, $tooltip) = @$item; 3626 my ($widget, $cb, $tooltip) = @$item;
3170 3627
3171 # handle various types of items, only text for now 3628 # handle various types of items, only text for now
3172 if (!ref $widget) { 3629 if (!ref $widget) {
3173 if ($widget =~ /\t/) { 3630 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2; 3631 my ($left, $right) = split /\t/, $widget, 2;
3175 3632
3176 $widget = new CFClient::UI::HBox 3633 $widget = new CFPlus::UI::HBox
3177 can_hover => 1, 3634 can_hover => 1,
3178 can_events => 1, 3635 can_events => 1,
3179 tooltip => $tooltip, 3636 tooltip => $tooltip,
3180 children => [ 3637 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1), 3638 (new CFPlus::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1), 3639 (new CFPlus::UI::Label markup => $right, align => +1),
3183 ], 3640 ],
3184 ; 3641 ;
3185 3642
3186 } else { 3643 } else {
3187 $widget = new CFClient::UI::Label 3644 $widget = new CFPlus::UI::Label
3188 can_hover => 1, 3645 can_hover => 1,
3189 can_events => 1, 3646 can_events => 1,
3190 markup => $widget, 3647 markup => $widget,
3191 tooltip => $tooltip; 3648 tooltip => $tooltip;
3192 } 3649 }
… …
3240 1 3697 1
3241} 3698}
3242 3699
3243############################################################################# 3700#############################################################################
3244 3701
3245package CFClient::UI::Multiplexer; 3702package CFPlus::UI::Multiplexer;
3246 3703
3247our @ISA = CFClient::UI::Container::; 3704our @ISA = CFPlus::UI::Container::;
3248 3705
3249sub new { 3706sub new {
3250 my $class = shift; 3707 my $class = shift;
3251 3708
3252 my $self = $class->SUPER::new ( 3709 my $self = $class->SUPER::new (
… …
3313 $self->{current}->draw; 3770 $self->{current}->draw;
3314} 3771}
3315 3772
3316############################################################################# 3773#############################################################################
3317 3774
3318package CFClient::UI::Notebook; 3775package CFPlus::UI::Notebook;
3319 3776
3320our @ISA = CFClient::UI::VBox::; 3777our @ISA = CFPlus::UI::VBox::;
3321 3778
3322sub new { 3779sub new {
3323 my $class = shift; 3780 my $class = shift;
3324 3781
3325 my $self = $class->SUPER::new ( 3782 my $self = $class->SUPER::new (
3326 buttonbar => (new CFClient::UI::Buttonbar), 3783 buttonbar => (new CFPlus::UI::Buttonbar),
3327 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328 # filter => # will be put between multiplexer and $self 3785 # filter => # will be put between multiplexer and $self
3329 @_, 3786 @_,
3330 ); 3787 );
3331 3788
3332 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3336} 3793}
3337 3794
3338sub add { 3795sub add {
3339 my ($self, $title, $widget, $tooltip) = @_; 3796 my ($self, $title, $widget, $tooltip) = @_;
3340 3797
3341 Scalar::Util::weaken $self; 3798 CFPlus::weaken $self;
3342 3799
3343 $self->{buttonbar}->add (new CFClient::UI::Button 3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3344 markup => $title, 3801 markup => $title,
3345 tooltip => $tooltip, 3802 tooltip => $tooltip,
3346 on_activate => sub { $self->set_current_page ($widget) }, 3803 on_activate => sub { $self->set_current_page ($widget) },
3347 ); 3804 );
3348 3805
… …
3362 $self->emit (page_changed => $self->{multiplexer}{current}); 3819 $self->emit (page_changed => $self->{multiplexer}{current});
3363} 3820}
3364 3821
3365############################################################################# 3822#############################################################################
3366 3823
3367package CFClient::UI::Selector; 3824package CFPlus::UI::Selector;
3368 3825
3369use utf8; 3826use utf8;
3370 3827
3371our @ISA = CFClient::UI::Button::; 3828our @ISA = CFPlus::UI::Button::;
3372 3829
3373sub new { 3830sub new {
3374 my $class = shift; 3831 my $class = shift;
3375 3832
3376 my $self = $class->SUPER::new ( 3833 my $self = $class->SUPER::new (
… …
3393 my ($value, $title, $tooltip) = @$_; 3850 my ($value, $title, $tooltip) = @$_;
3394 3851
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3852 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 } 3853 }
3397 3854
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3855 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399} 3856}
3400 3857
3401sub _set_value { 3858sub _set_value {
3402 my ($self, $value) = @_; 3859 my ($self, $value) = @_;
3403 3860
… …
3418 $self->emit (changed => $value); 3875 $self->emit (changed => $value);
3419} 3876}
3420 3877
3421############################################################################# 3878#############################################################################
3422 3879
3423package CFClient::UI::Statusbox; 3880package CFPlus::UI::Statusbox;
3424 3881
3425our @ISA = CFClient::UI::VBox::; 3882our @ISA = CFPlus::UI::VBox::;
3426 3883
3427sub new { 3884sub new {
3428 my $class = shift; 3885 my $class = shift;
3429 3886
3430 my $self = $class->SUPER::new ( 3887 my $self = $class->SUPER::new (
3431 fontsize => 0.8, 3888 fontsize => 0.8,
3432 @_, 3889 @_,
3433 ); 3890 );
3434 3891
3435 Scalar::Util::weaken (my $this = $self); 3892 CFPlus::weaken (my $this = $self);
3436 3893
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438 3895
3439 $self 3896 $self
3440} 3897}
… …
3442sub reorder { 3899sub reorder {
3443 my ($self) = @_; 3900 my ($self) = @_;
3444 my $NOW = Time::HiRes::time; 3901 my $NOW = Time::HiRes::time;
3445 3902
3446 # freeze display when hovering over any label 3903 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner} 3904 return if $CFPlus::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3905 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} }; 3906 values %{ $self->{item} };
3450 3907
3451 while (my ($k, $v) = each %{ $self->{item} }) { 3908 while (my ($k, $v) = each %{ $self->{item} }) {
3452 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3909 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453 } 3910 }
… …
3474 for ($short) { 3931 for ($short) {
3475 s/^\s+//; 3932 s/^\s+//;
3476 s/\s+/ /g; 3933 s/\s+/ /g;
3477 } 3934 }
3478 3935
3479 new CFClient::UI::Label 3936 new CFPlus::UI::Label
3480 markup => $short, 3937 markup => $short,
3481 tooltip => $item->{tooltip}, 3938 tooltip => $item->{tooltip},
3482 tooltip_font => $::FONT_PROP, 3939 tooltip_font => $::FONT_PROP,
3483 tooltip_width => 0.67, 3940 tooltip_width => 0.67,
3484 fontsize => $item->{fontsize} || $self->{fontsize}, 3941 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3563 $self->SUPER::destroy; 4020 $self->SUPER::destroy;
3564} 4021}
3565 4022
3566############################################################################# 4023#############################################################################
3567 4024
3568package CFClient::UI::Inventory;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 col_expand => [0, 1, 0],
3577 items => [],
3578 @_,
3579 );
3580
3581 $self->set_sort_order (undef);
3582
3583 $self
3584}
3585
3586sub update_items {
3587 my ($self) = @_;
3588
3589 $self->clear;
3590
3591 my @item = $self->{sort}->(@{ $self->{items} });
3592
3593 my @adds;
3594 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item;
3597
3598 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget};
3601
3602 $row++;
3603 }
3604
3605 $self->add (@adds);
3606}
3607
3608sub set_sort_order {
3609 my ($self, $order) = @_;
3610
3611 $self->{sort} = $order ||= sub {
3612 sort {
3613 $a->{type} <=> $b->{type}
3614 or $a->{name} cmp $b->{name}
3615 } @_
3616 };
3617
3618 $self->update_items;
3619}
3620
3621sub set_items {
3622 my ($self, $items) = @_;
3623
3624 $self->{items} = [$items ? values %$items : ()];
3625 $self->update_items;
3626}
3627
3628#############################################################################
3629
3630package CFClient::UI::SpellList;
3631
3632our @ISA = CFClient::UI::Table::;
3633
3634sub new {
3635 my $class = shift;
3636
3637 my $self = $class->SUPER::new (
3638 binding => [],
3639 commands => [],
3640 @_,
3641 )
3642}
3643
3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657sub rebuild_spell_list {
3658 my ($self) = @_;
3659
3660 $CFClient::UI::ROOT->on_refresh ($self => sub {
3661 $self->clear;
3662
3663 return unless $::CONN;
3664
3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671 my $row = 0;
3672
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_};
3675
3676 $row++;
3677
3678 my $spell_cb = sub {
3679 my ($widget, $ev) = @_;
3680
3681 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu
3687 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ],
3691 )->popup ($ev);
3692 } else {
3693 return 0;
3694 }
3695
3696 1
3697 };
3698
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704 $self->add (0, $row, new CFClient::UI::Face
3705 face => $spell->{face},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (1, $row, new CFClient::UI::Label
3713 expand => 1,
3714 text => $spell->{name},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725 }
3726 });
3727}
3728
3729sub add_spell {
3730 my ($self, $spell) = @_;
3731
3732 $self->{spell}->{$spell->{name}} = $spell;
3733 $self->rebuild_spell_list;
3734}
3735
3736sub remove_spell {
3737 my ($self, $spell) = @_;
3738
3739 delete $self->{spell}->{$spell->{name}};
3740 $self->rebuild_spell_list;
3741}
3742
3743sub clear_spells {
3744 my ($self) = @_;
3745
3746 $self->{spell} = {};
3747 $self->rebuild_spell_list;
3748}
3749
3750#############################################################################
3751
3752package CFClient::UI::Root; 4025package CFPlus::UI::Root;
3753 4026
3754our @ISA = CFClient::UI::Container::; 4027our @ISA = CFPlus::UI::Container::;
3755 4028
3756use List::Util qw(min max); 4029use List::Util qw(min max);
3757 4030
3758use CFClient::OpenGL; 4031use CFPlus::OpenGL;
3759 4032
3760sub new { 4033sub new {
3761 my $class = shift; 4034 my $class = shift;
3762 4035
3763 my $self = $class->SUPER::new ( 4036 my $self = $class->SUPER::new (
3764 visible => 1, 4037 visible => 1,
3765 @_, 4038 @_,
3766 ); 4039 );
3767 4040
3768 Scalar::Util::weaken ($self->{root} = $self); 4041 CFPlus::weaken ($self->{root} = $self);
3769 4042
3770 $self 4043 $self
3771} 4044}
3772 4045
3773sub size_request { 4046sub size_request {
… …
3868 while ($self->{refresh_hook}) { 4141 while ($self->{refresh_hook}) {
3869 $_->() 4142 $_->()
3870 for values %{delete $self->{refresh_hook}}; 4143 for values %{delete $self->{refresh_hook}};
3871 } 4144 }
3872 4145
3873 if ($self->{realloc}) { 4146 while ($self->{realloc}) {
3874 my %queue; 4147 my %queue;
3875 my @queue; 4148 my @queue;
3876 my $widget; 4149 my $widget;
3877 4150
3878 outer: 4151 outer:
… …
3925 } 4198 }
3926 } 4199 }
3927 4200
3928 delete $self->{realloc}{$widget+0}; 4201 delete $self->{realloc}{$widget+0};
3929 } 4202 }
3930 }
3931 4203
3932 while (my $size_alloc = delete $self->{size_alloc}) { 4204 while (my $size_alloc = delete $self->{size_alloc}) {
3933 my @queue = sort { $b->{visible} <=> $a->{visible} } 4205 my @queue = sort { $a->{visible} <=> $b->{visible} }
3934 values %$size_alloc; 4206 values %$size_alloc;
3935 4207
3936 while () { 4208 while () {
3937 my $widget = pop @queue || last; 4209 my $widget = pop @queue || last;
3938 4210
3939 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4211 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3940 4212
3941 $w = 0 if $w < 0;
3942 $h = 0 if $h < 0;
3943
3944 $w = max $widget->{min_w}, $w; 4213 $w = max $widget->{min_w}, $w;
3945 $h = max $widget->{min_h}, $h; 4214 $h = max $widget->{min_h}, $h;
3946 4215
3947# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3948# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3949 4218
3950 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3951 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3952 4221
3953 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
3954 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
3955 4224
3956 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3957 $widget->{old_w} = $widget->{w}; 4226 $widget->{old_w} = $widget->{w};
3958 $widget->{old_h} = $widget->{h}; 4227 $widget->{old_h} = $widget->{h};
3959 4228
3960 $widget->{w} = $w; 4229 $widget->{w} = $w;
3961 $widget->{h} = $h; 4230 $widget->{h} = $h;
3962 4231
3963 $widget->emit (size_allocate => $w, $h); 4232 $widget->emit (size_allocate => $w, $h);
4233 }
3964 } 4234 }
3965 } 4235 }
3966 } 4236 }
3967 4237
3968 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
3969 $_->() 4239 $_->()
3970 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
3971 } 4241 }
3972
3973 4242
3974 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3975 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3976 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
3977 4246
… …
3980 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981 glMatrixMode GL_MODELVIEW; 4250 glMatrixMode GL_MODELVIEW;
3982 glLoadIdentity; 4251 glLoadIdentity;
3983 4252
3984 { 4253 {
3985 package CFClient::UI::Base; 4254 package CFPlus::UI::Base;
3986 4255
3987 ($draw_x, $draw_y, $draw_w, $draw_h) = 4256 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988 (0, 0, $self->{w}, $self->{h}); 4257 (0, 0, $self->{w}, $self->{h});
3989 }
3990 4258
3991 $self->_draw; 4259 $self->_draw;
4260 }
3992} 4261}
3993 4262
3994############################################################################# 4263#############################################################################
3995 4264
3996package CFClient::UI; 4265package CFPlus::UI;
3997 4266
3998$ROOT = new CFClient::UI::Root; 4267$ROOT = new CFPlus::UI::Root;
3999$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000 4269
40011 42701
4002 4271

Diff Legend

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