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.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 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; 118 $ev->{dx} = 0;
… …
207 reconfigure_widgets; 210 reconfigure_widgets;
208} 211}
209 212
210############################################################################# 213#############################################################################
211 214
212package CFClient::UI::Event; 215package CFPlus::UI::Event;
213 216
214sub xy { 217sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 219}
217 220
218############################################################################# 221#############################################################################
219 222
220package CFClient::UI::Base; 223package CFPlus::UI::Base;
221 224
222use strict; 225use strict;
223 226
224use CFClient::OpenGL; 227use CFPlus::OpenGL;
225 228
226sub new { 229sub new {
227 my $class = shift; 230 my $class = shift;
228 231
229 my $self = bless { 232 my $self = bless {
… …
234 h => undef, 237 h => undef,
235 can_events => 1, 238 can_events => 1,
236 @_ 239 @_
237 }, $class; 240 }, $class;
238 241
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 243
241 for (keys %$self) { 244 for (keys %$self) {
242 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
244 } 247 }
245 } 248 }
246 249
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 255
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 258
256 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
261 264
262sub destroy { 265sub destroy {
263 my ($self) = @_; 266 my ($self) = @_;
264 267
265 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
266 %$self = (); 270 %$self = ();
267} 271}
268 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
269sub show { 277sub show {
270 my ($self) = @_; 278 my ($self) = @_;
271 279
272 return if $self->{parent}; 280 return if $self->{parent};
273 281
274 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
275} 283}
276 284
277sub set_visible { 285sub set_visible {
278 my ($self) = @_; 286 my ($self) = @_;
279 287
… …
300 delete $self->{root}; 308 delete $self->{root};
301 309
302 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
304 312
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
307 315
308 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
310} 318}
… …
312sub set_visibility { 320sub set_visibility {
313 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
314 322
315 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
316 324
317 $visible ? $self->hide 325 $visible ? $self->show
318 : $self->show; 326 : $self->hide;
319} 327}
320 328
321sub toggle_visibility { 329sub toggle_visibility {
322 my ($self) = @_; 330 my ($self) = @_;
323 331
… …
367 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
368 376
369 if ($self->{aspect}) { 377 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
371 379
372 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 382
375 # use alignment to adjust x, y 383 # use alignment to adjust x, y
376 384
377 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
419 427
420 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
421 429
422 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
423 431
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 435 }
428} 436}
429 437
430# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
431sub coord2local { 439sub coord2local {
432 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
433 441
442 Carp::confess unless $self->{parent};#d#
443
434 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435} 445}
436 446
437# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
438sub coord2global { 448sub coord2global {
439 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
450
451 Carp::confess unless $self->{parent};#d#
440 452
441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442} 454}
443 455
444sub invoke_focus_in { 456sub invoke_focus_in {
… …
492 504
493sub connect { 505sub connect {
494 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
495 507
496 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
497} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
498 528
499sub emit { 529sub emit {
500 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
501 531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
502 my @append 534 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event") 535 = $has_coords{$signal}
504 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
505 : (); 537 : ();
506 538
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508 540
509 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
513} 550}
514 551
515sub find_widget { 552#sub find_widget {
516 my ($self, $x, $y) = @_; 553# in .xs
517
518 return () unless $self->{can_events};
519
520 return $self
521 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
522 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
523
524 ()
525}
526 554
527sub set_parent { 555sub set_parent {
528 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
529 557
530 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
531 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
532} 560}
533 561
534sub realloc { 562sub realloc {
535 my ($self) = @_; 563 my ($self) = @_;
… …
601 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
602 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
603 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
604 glEnd; 632 glEnd;
605 glPopMatrix; 633 glPopMatrix;
606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
607 } 635 }
608 636
609 $self->_draw; 637 $self->_draw;
610 glPopMatrix; 638 glPopMatrix;
611} 639}
… …
614 my ($self) = @_; 642 my ($self) = @_;
615 643
616 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
617} 645}
618 646
647my $cntx;#d#
619sub DESTROY { 648sub DESTROY {
620 my ($self) = @_; 649 my ($self) = @_;
621 650
622 return if CFClient::in_destruct; 651 return if CFPlus::in_destruct;
623
624 delete $WIDGET{$self+0};
625 652
626 eval { $self->destroy }; 653 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
656 delete $WIDGET{$self+0};
628} 657}
629 658
630############################################################################# 659#############################################################################
631 660
632package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
633 662
634our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
635 664
636use strict; 665use strict;
637use CFClient::OpenGL; 666use CFPlus::OpenGL;
638 667
639sub new { 668sub new {
640 my $class = shift; 669 my $class = shift;
641 670
642 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
673 } 702 }
674} 703}
675 704
676############################################################################# 705#############################################################################
677 706
678package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
679 708
680our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
681 710
682sub new { 711sub new {
683 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
684 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
685} 714}
… …
692 721
693sub draw { } 722sub draw { }
694 723
695############################################################################# 724#############################################################################
696 725
697package CFClient::UI::Container; 726package CFPlus::UI::Container;
698 727
699our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
700 729
701sub new { 730sub new {
702 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
703 732
704 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
713 if $children; 742 if $children;
714 743
715 $self 744 $self
716} 745}
717 746
747sub realloc {
748 my ($self) = @_;
749
750 $self->{force_realloc} = 1;
751 $self->{force_size_alloc} = 1;
752 $self->SUPER::realloc;
753}
754
718sub add { 755sub add {
719 my ($self, @widgets) = @_; 756 my ($self, @widgets) = @_;
720 757
721 $_->set_parent ($self) 758 $_->set_parent ($self)
722 for @widgets; 759 for @widgets;
… …
782 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
783} 820}
784 821
785############################################################################# 822#############################################################################
786 823
787package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
788 825
789our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
790 827
791sub new { 828sub new {
792 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
793 830
794 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795 832
796 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
797} 834}
798 835
799sub add { 836sub add {
… …
806sub remove { 843sub remove {
807 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
808 845
809 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
810 847
811 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
812 unless @{$self->{children}}; 849 unless @{$self->{children}};
813} 850}
814 851
815sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
816 853
… …
828 865
829############################################################################# 866#############################################################################
830 867
831# back-buffered drawing area 868# back-buffered drawing area
832 869
833package CFClient::UI::Window; 870package CFPlus::UI::Window;
834 871
835our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
836 873
837use CFClient::OpenGL; 874use CFPlus::OpenGL;
838 875
839sub new { 876sub new {
840 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
841 878
842 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
864} 901}
865 902
866sub render_child { 903sub render_child {
867 my ($self) = @_; 904 my ($self) = @_;
868 905
869 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
870 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
871 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
872 909
873 { 910 {
874 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
875 912
876 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
878 } 917 }
879
880 $self->_render;
881 }; 918 };
882} 919}
883 920
884sub _draw { 921sub _draw {
885 my ($self) = @_; 922 my ($self) = @_;
886
887 my ($w, $h) = @$self{qw(w h)};
888 923
889 my $tex = $self->{texture} 924 my $tex = $self->{texture}
890 or return; 925 or return;
891 926
892 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
895 930
896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
897 932
898 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
899} 934}
900 935
901############################################################################# 936#############################################################################
902 937
903package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
904 939
940use List::Util qw(min max);
941
905our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
906 943
907sub new { 944sub new {
908 my $class = shift; 945 my $class = shift;
909 946
910 $class->SUPER::new ( 947 $class->SUPER::new (
… …
940} 977}
941 978
942sub set_offset { 979sub set_offset {
943 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
944 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
945 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
946 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
947 988
989 $self->emit (changed => $x, $y);
948 $self->update; 990 $self->update;
991 }
949} 992}
950 993
951# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
952sub coord2local { 995sub coord2local {
953 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
968 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
969 1012
970 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
972 ) { 1015 ) {
973 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974 } else { 1017 } else {
975 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
976 } 1019 }
977} 1020}
978 1021
979sub _render { 1022sub _render {
980 my ($self) = @_; 1023 my ($self) = @_;
981 1024
982 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1025 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
983 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984 1027
985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986 1029
987 $self->SUPER::_render; 1030 $self->SUPER::_render;
988} 1031}
989 1032
990############################################################################# 1033#############################################################################
991 1034
992package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
993 1036
994our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
995 1038
996sub new { 1039sub new {
997 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
998 1041
999 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
1000 1043
1001 my $self; 1044 my $self;
1002 1045
1003 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
1004 vertical => 1, 1056 vertical => 1,
1005 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1006 on_changed => sub { 1058 on_changed => sub {
1007 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008 }, 1061 },
1009 ; 1062 ;
1010 1063
1011 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
1012 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1013 can_events => 1, 1067 can_events => 1,
1014 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1015 %arg, 1072 %arg,
1016 ); 1073 );
1017 1074
1018 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
1019 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
1020 1092
1021 $self 1093 $self
1022} 1094}
1023 1095
… …
1027 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
1028 1100
1029 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
1030} 1102}
1031 1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
1128sub update {
1129 my ($self) = @_;
1130
1131 $self->update_slider;
1132 $self->SUPER::update;
1133}
1134
1032sub invoke_mouse_wheel { 1135sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_; 1136 my ($self, $ev) = @_;
1034 1137
1035 return 0 unless $ev->{dy}; # only vertical movements 1138 return 0 unless $ev->{dy}; # only vertical movements for now
1036 1139
1037 $self->{slider}->emit (mouse_wheel => $ev); 1140 $self->{vslider}->emit (mouse_wheel => $ev);
1038 1141
1039 1 1142 1
1040} 1143}
1041 1144
1042sub update_slider { 1145sub invoke_button_down {
1043 my ($self) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1044 1147
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1148 if ($ev->{button} == 2) {
1046} 1149 $self->grab_focus;
1047 1150
1048sub update { 1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1049 my ($self) = @_; 1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1050 1156
1051 $self->SUPER::update; 1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1052 1160
1053 $self->update_slider; 1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1054} 1186}
1055 1187
1056sub invoke_size_allocate { 1188sub invoke_size_allocate {
1057 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1058 1190
1059 $self->update_slider; 1191 $self->update_slider;
1060
1061 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1062} 1193}
1063 1194
1064############################################################################# 1195#############################################################################
1065 1196
1066package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1067 1198
1068our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1069 1200
1070use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1071 1202
1072sub new { 1203sub new {
1073 my $class = shift; 1204 my $class = shift;
1074 1205
1075 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1101 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1102} 1233}
1103 1234
1104############################################################################# 1235#############################################################################
1105 1236
1106package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1107 1238
1108our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1109 1240
1110use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1242
1243sub new {
1244 my ($class, %arg) = @_;
1245
1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1111 1342
1112my $bg = 1343my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1115 1346
1116my @border = 1347my @border =
1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1119 1354
1120sub new { 1355sub new {
1121 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1122 1357
1123 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
… …
1128 min_w => 64, 1363 min_w => 64,
1129 min_h => 32, 1364 min_h => 32,
1130 %arg, 1365 %arg,
1131 ); 1366 );
1132 1367
1133 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1134 align => 0, 1369 align => 0,
1135 valign => 1, 1370 valign => 1,
1136 text => $self->{title}, 1371 text => $self->{title},
1137 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1138 if exists $self->{title}; 1373 if exists $self->{title};
1139 1374
1140 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1141 $self->{close_button} = 1376 $self->{close_button} =
1142 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1143 path => 'x1_close.png', 1378 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") }; 1379 on_activate => sub { $self->emit ("delete") };
1145 1380
1146 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1147 } 1382 }
1148 1383
1149 $self 1384 $self
1150} 1385}
1151 1386
1152sub add { 1387sub add {
1153 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1154 1389
1155 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158} 1393}
1159 1394
1160sub border { 1395sub border {
1161 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1162} 1397}
… …
1270 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271 1506
1272 ! ! $self->{motion} 1507 ! ! $self->{motion}
1273} 1508}
1274 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1275sub _draw { 1518sub _draw {
1276 my ($self) = @_; 1519 my ($self) = @_;
1277 1520
1278 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1279 1522
… …
1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1285 1528
1286 my $border = $self->border; 1529 my $border = $self->border;
1287 1530
1288 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1289 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1292 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1293 1550
1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1295 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1296 1553
1297 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1316 if $self->{close_button}; 1573 if $self->{close_button};
1317} 1574}
1318 1575
1319############################################################################# 1576#############################################################################
1320 1577
1321package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1322 1579
1323our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1324 1581
1325use List::Util qw(max sum); 1582use List::Util qw(max sum);
1326 1583
1327use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1328 1585
1329sub new { 1586sub new {
1330 my $class = shift; 1587 my $class = shift;
1331 1588
1332 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1333 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1334 @_, 1593 @_,
1335 ) 1594 )
1336} 1595}
1337 1596
1338sub children { 1597sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340} 1599}
1341 1600
1601# TODO: store row/col info in child widget and use standard add/del
1342sub add { 1602sub add {
1343 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1344 1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1611
1612 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1345 $child->set_parent ($self); 1615 $child->set_parent ($self);
1346 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1347 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1348 $self->realloc; 1621 $self->realloc;
1349} 1622}
1350 1623
1351sub remove { 1624sub remove {
1352 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1353 1626
1354 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1355} 1632}
1356 1633
1357# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1358sub clear { 1635sub clear {
1359 my ($self) = @_; 1636 my ($self) = @_;
… …
1408 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1409 1686
1410 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1411 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1412 1689
1413 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1414 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1415 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1416 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1417 1694
1418 # linearly scale sizes
1419 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421 1696
1422 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1423 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1424 1706
1425 my $y; 1707 my $y;
1426 1708
1427 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1428 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1471 } 1753 }
1472} 1754}
1473 1755
1474############################################################################# 1756#############################################################################
1475 1757
1476package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1477 1759
1760use List::Util qw(min max);
1761
1478our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1479 1843
1480sub size_request { 1844sub size_request {
1481 my ($self) = @_; 1845 my ($self) = @_;
1482 1846
1483 $self->{vertical} 1847 $self->{vertical}
… …
1516 $req[$_] += $space * $children[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1517 for 0 .. $#children; 1881 for 0 .. $#children;
1518 } 1882 }
1519 } 1883 }
1520 1884
1521 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1522 1886
1523 my $pos = 0; 1887 my $pos = 0;
1524 for (0 .. $#children) { 1888 for (0 .. $#children) {
1525 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1531 1 1895 1
1532} 1896}
1533 1897
1534############################################################################# 1898#############################################################################
1535 1899
1536package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1537 1901
1538our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1539 1903
1540sub new { 1904sub new {
1541 my $class = shift; 1905 my $class = shift;
1542 1906
1543 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1546 ) 1910 )
1547} 1911}
1548 1912
1549############################################################################# 1913#############################################################################
1550 1914
1551package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1552 1916
1553our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1554 1918
1555sub new { 1919sub new {
1556 my $class = shift; 1920 my $class = shift;
1557 1921
1558 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1561 ) 1925 )
1562} 1926}
1563 1927
1564############################################################################# 1928#############################################################################
1565 1929
1566package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1567 1931
1568our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1569 1933
1570use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1571 1935
1572sub new { 1936sub new {
1573 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1574 1938
1575 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1578 #active_bg => none 1942 #active_bg => none
1579 #font => default_font 1943 #font => default_font
1580 #text => initial text 1944 #text => initial text
1581 #markup => initial narkup 1945 #markup => initial narkup
1582 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1583 ellipsise => 3, # end 1948 ellipsise => 3, # end
1584 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1585 fontsize => 1, 1950 fontsize => 1,
1586 align => -1, 1951 align => -1,
1587 valign => -1, 1952 valign => -1,
1588 padding_x => 2, 1953 padding_x => 2,
1589 padding_y => 2, 1954 padding_y => 2,
1590 can_events => 0, 1955 can_events => 0,
1591 %arg 1956 %arg
1592 ); 1957 );
1593 1958
1594 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1595 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1596 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1597 $self->{template} = $layout; 1962 $self->{template} = $layout;
1598 } 1963 }
1599 1964
1600 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1602 } else { 1967 } else {
1603 $self->set_text (delete $self->{text}); 1968 $self->set_text (delete $self->{text});
1604 } 1969 }
1605 1970
1606 $self 1971 $self
1607}
1608
1609sub escape($) {
1610 local $_ = $_[0];
1611
1612 s/&/&amp;/g;
1613 s/>/&gt;/g;
1614 s/</&lt;/g;
1615
1616 $_
1617} 1972}
1618 1973
1619sub update { 1974sub update {
1620 my ($self) = @_; 1975 my ($self) = @_;
1621 1976
… …
1748 }; 2103 };
1749 2104
1750 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1751 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1752 2107
1753 $self->{layout}->render ($self->{ox}, $self->{oy}); 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754} 2109}
1755 2110
1756############################################################################# 2111#############################################################################
1757 2112
1758package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1759 2114
1760our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1761 2116
1762use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1763 2118
1764sub new { 2119sub new {
1765 my $class = shift; 2120 my $class = shift;
1766 2121
1767 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1771 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1772 can_hover => 1, 2127 can_hover => 1,
1773 can_focus => 1, 2128 can_focus => 1,
1774 valign => 0, 2129 valign => 0,
1775 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1776 #text => ... 2132 #text => ...
1777 #hidden => "*", 2133 #hidden => "*",
1778 @_ 2134 @_
1779 ) 2135 )
1780} 2136}
… …
1825 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1826 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1827 2183
1828 my $text = $self->get_text; 2184 my $text = $self->get_text;
1829 2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2187
1830 if ($uni == 8) { 2188 if ($uni == 8) {
1831 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1833 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1834 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1835 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1836 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1837 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1838 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1839 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1840 } elsif ($sym == CFClient::SDLK_END) {
1841 $self->{cursor} = length $text;
1842 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1843 $self->emit ('escape'); 2212 $self->emit ('escape');
1844 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1845 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else { 2217 } else {
1847 return 0; 2218 return 0;
1848 } 2219 }
1849 2220
1850 $self->_set_text ($text); 2221 $self->_set_text ($text);
1851 2222
1852 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1853 2225
1854 1 2226 1
1855} 2227}
1856 2228
1857sub invoke_focus_in { 2229sub invoke_focus_in {
… …
1919 utf8::encode $text; 2291 utf8::encode $text;
1920 2292
1921 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922 } 2294 }
1923 2295
1924 glColor @{$self->{fg}};
1925 glBegin GL_LINES; 2296 glBegin GL_LINES;
1926 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928 glEnd; 2299 glEnd;
1929 } 2300 }
1930} 2301}
1931 2302
2303#############################################################################
2304
1932package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1933 2306
1934our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1935 2308
1936use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1937 2310
1938sub invoke_key_down { 2311sub invoke_key_down {
1939 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1940 2313
1941 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1942 2315
1943 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1944 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1945 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
1946 2319
1947 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1948 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1949 $self->emit (activate => $txt); 2322 $self->emit (activate => $txt);
1950 $self->update; 2323 $self->update;
1951 2324
1952 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1953 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1954 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1955 } 2328 }
1956 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1957 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1959 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1960 } 2333 }
1961 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1962 } 2335 }
1963 2336
1964 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1965 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1966 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967 2340
1968 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1969 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1978 1 2351 1
1979} 2352}
1980 2353
1981############################################################################# 2354#############################################################################
1982 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
1983package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1984 2396
1985our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1986 2398
1987use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1988 2400
1989my @tex = 2401my @tex =
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1992 2404
1993sub new { 2405sub new {
1994 my $class = shift; 2406 my $class = shift;
1995 2407
1996 $class->SUPER::new ( 2408 $class->SUPER::new (
1997 padding_x => 4, 2409 padding_x => 4,
1998 padding_y => 4, 2410 padding_y => 4,
1999 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
2000 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
2001 can_hover => 1, 2413 can_hover => 1,
2002 align => 0, 2414 align => 0,
2003 valign => 0, 2415 valign => 0,
2004 can_events => 1, 2416 can_events => 1,
2005 @_ 2417 @_
… …
2023 2435
2024 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
2027 2439
2440 my $tex = $tex[$GRAB == $self];
2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2029 2442
2030 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2031 2444
2032 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
2033} 2446}
2034 2447
2035############################################################################# 2448#############################################################################
2036 2449
2450package CFPlus::UI::CheckBox;
2451
2452our @ISA = CFPlus::UI::DrawBG::;
2453
2454my @tex =
2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2457
2458use CFPlus::OpenGL;
2459
2460sub new {
2461 my $class = shift;
2462
2463 $class->SUPER::new (
2464 padding_x => 2,
2465 padding_y => 2,
2466 fg => [1, 1, 1],
2467 active_fg => [1, 1, 0],
2468 bg => [0, 0, 0, 0.2],
2469 active_bg => [1, 1, 1, 0.5],
2470 state => 0,
2471 can_hover => 1,
2472 @_
2473 )
2474}
2475
2476sub size_request {
2477 my ($self) = @_;
2478
2479 (6) x 2
2480}
2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
2490sub invoke_button_down {
2491 my ($self, $ev, $x, $y) = @_;
2492
2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2495 $self->toggle;
2496 } else {
2497 return 0
2498 }
2499
2500 1
2501}
2502
2503sub _draw {
2504 my ($self) = @_;
2505
2506 $self->SUPER::_draw;
2507
2508 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2509
2510 my ($w, $h) = @$self{qw(w h)};
2511
2512 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2513
2514 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2515
2516 my $tex = $self->{state} ? $tex[1] : $tex[0];
2517
2518 glEnable GL_TEXTURE_2D;
2519 $tex->draw_quad_alpha (0, 0, $s, $s);
2520 glDisable GL_TEXTURE_2D;
2521}
2522
2523#############################################################################
2524
2525package CFPlus::UI::Image;
2526
2527our @ISA = CFPlus::UI::Base::;
2528
2529use CFPlus::OpenGL;
2530
2531our %texture_cache;
2532
2533sub new {
2534 my $class = shift;
2535
2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
2540
2541 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required";
2543
2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2546
2547 CFPlus::weaken $texture_cache{$self->{path}};
2548
2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2550
2551 $self
2552}
2553
2554sub STORABLE_freeze {
2555 my ($self, $cloning) = @_;
2556
2557 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2559
2560 $self->{path}
2561}
2562
2563sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_;
2565
2566 $self->new (path => $path)
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571
2572 ($self->{tex}{w}, $self->{tex}{h})
2573}
2574
2575sub _draw {
2576 my ($self) = @_;
2577
2578 my $tex = $self->{tex};
2579
2580 my ($w, $h) = ($self->{w}, $self->{h});
2581
2582 if ($self->{rot90}) {
2583 glRotate 90, 0, 0, 1;
2584 glTranslate 0, -$self->{w}, 0;
2585
2586 ($w, $h) = ($h, $w);
2587 }
2588
2589 glEnable GL_TEXTURE_2D;
2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2591
2592 $tex->draw_quad (0, 0, $w, $h);
2593
2594 glDisable GL_TEXTURE_2D;
2595}
2596
2597#############################################################################
2598
2037package CFClient::UI::ImageButton; 2599package CFPlus::UI::ImageButton;
2038 2600
2039our @ISA = CFClient::UI::Image::; 2601our @ISA = CFPlus::UI::Image::;
2040 2602
2041use CFClient::OpenGL; 2603use CFPlus::OpenGL;
2042 2604
2043my %textures; 2605my %textures;
2044 2606
2045sub new { 2607sub new {
2046 my $class = shift; 2608 my $class = shift;
… …
2068 1 2630 1
2069} 2631}
2070 2632
2071############################################################################# 2633#############################################################################
2072 2634
2073package CFClient::UI::CheckBox;
2074
2075our @ISA = CFClient::UI::DrawBG::;
2076
2077my @tex =
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081use CFClient::OpenGL;
2082
2083sub new {
2084 my $class = shift;
2085
2086 $class->SUPER::new (
2087 padding_x => 2,
2088 padding_y => 2,
2089 fg => [1, 1, 1],
2090 active_fg => [1, 1, 0],
2091 bg => [0, 0, 0, 0.2],
2092 active_bg => [1, 1, 1, 0.5],
2093 state => 0,
2094 can_hover => 1,
2095 @_
2096 )
2097}
2098
2099sub size_request {
2100 my ($self) = @_;
2101
2102 (6) x 2
2103}
2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2113sub invoke_button_down {
2114 my ($self, $ev, $x, $y) = @_;
2115
2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118 $self->toggle;
2119 } else {
2120 return 0
2121 }
2122
2123 1
2124}
2125
2126sub _draw {
2127 my ($self) = @_;
2128
2129 $self->SUPER::_draw;
2130
2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133 my ($w, $h) = @$self{qw(w h)};
2134
2135 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141 glEnable GL_TEXTURE_2D;
2142 $tex->draw_quad_alpha (0, 0, $s, $s);
2143 glDisable GL_TEXTURE_2D;
2144}
2145
2146#############################################################################
2147
2148package CFClient::UI::Image; 2635package CFPlus::UI::VGauge;
2149 2636
2150our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2151
2152use CFClient::OpenGL;
2153
2154our %texture_cache;
2155
2156sub new {
2157 my $class = shift;
2158
2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2163
2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2166
2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174 $self
2175}
2176
2177sub size_request {
2178 my ($self) = @_;
2179
2180 ($self->{tex}{w}, $self->{tex}{h})
2181}
2182
2183sub _draw {
2184 my ($self) = @_;
2185
2186 my $tex = $self->{tex};
2187
2188 my ($w, $h) = ($self->{w}, $self->{h});
2189
2190 if ($self->{rot90}) {
2191 glRotate 90, 0, 0, 1;
2192 glTranslate 0, -$self->{w}, 0;
2193
2194 ($w, $h) = ($h, $w);
2195 }
2196
2197 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200 $tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::VGauge;
2208
2209our @ISA = CFClient::UI::Base::;
2210 2638
2211use List::Util qw(min max); 2639use List::Util qw(min max);
2212 2640
2213use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2214 2642
2215my %tex = ( 2643my %tex = (
2216 food => [ 2644 food => [
2217 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219 ], 2647 ],
2220 grace => [ 2648 grace => [
2221 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223 ], 2651 ],
2224 hp => [ 2652 hp => [
2225 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227 ], 2655 ],
2228 mana => [ 2656 mana => [
2229 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231 ], 2659 ],
2232); 2660);
2233 2661
2234# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2337 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2338} 2766}
2339 2767
2340############################################################################# 2768#############################################################################
2341 2769
2342package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2343 2771
2344our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2345 2773
2346sub new { 2774sub new {
2347 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2348 2776
2349 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2351 can_hover => 1, 2779 can_hover => 1,
2352 can_events => 1, 2780 can_events => 1,
2353 %arg, 2781 %arg,
2354 ); 2782 );
2355 2783
2356 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2785 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359 2787
2360 $self 2788 $self
2361} 2789}
2362 2790
2363sub set_fontsize { 2791sub set_fontsize {
… …
2384 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2385} 2813}
2386 2814
2387############################################################################# 2815#############################################################################
2388 2816
2389package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2390 2818
2391use strict; 2819use strict;
2392 2820
2393use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2394 2822
2395our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2396 2824
2397my @tex = 2825my @tex =
2398 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2400 2828
2401sub new { 2829sub new {
2402 my $class = shift; 2830 my $class = shift;
2403 2831
… …
2497sub invoke_mouse_wheel { 2925sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2499 2927
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501 2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503 2933
2504 ! ! $delta 2934 ! ! $delta
2505} 2935}
2506 2936
2507sub update { 2937sub update {
… …
2558 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2559} 2989}
2560 2990
2561############################################################################# 2991#############################################################################
2562 2992
2563package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2564 2994
2565our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2566 2996
2567sub new { 2997sub new {
2568 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2569 2999
2570 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2571 3001
2572 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2573 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575 to_value => sub { shift }, 3005 to_value => sub { shift },
2576 from_value => sub { shift }, 3006 from_value => sub { shift },
2577 %arg, 3007 %arg,
2578 ); 3008 );
2579 3009
… …
2599sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2600sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2601 3031
2602############################################################################# 3032#############################################################################
2603 3033
2604package CFClient::UI::TextScroller; 3034package CFPlus::UI::TextScroller;
2605 3035
2606our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2607 3037
2608use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2609 3039
2610sub new { 3040sub new {
2611 my $class = shift; 3041 my $class = shift;
2612 3042
2613 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
… …
2615 can_events => 1, 3045 can_events => 1,
2616 indent => 0, 3046 indent => 0,
2617 #font => default_font 3047 #font => default_font
2618 @_, 3048 @_,
2619 3049
2620 layout => (new CFClient::Layout), 3050 layout => (new CFPlus::Layout),
2621 par => [], 3051 par => [],
3052 max_par => 0,
2622 height => 0, 3053 height => 0,
2623 children => [ 3054 children => [
2624 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2625 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2626 ], 3057 ],
2627 ); 3058 );
2628 3059
2629 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2630 3061
… …
2707 3138
2708 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2709 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2710} 3141}
2711 3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
3156}
3157
2712sub clear { 3158sub clear {
2713 my ($self) = @_; 3159 my ($self) = @_;
2714 3160
2715 my (undef, undef, @other) = @{ $self->{children} }; 3161 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other; 3162 $self->remove ($_) for @other;
… …
2719 $self->{height} = 0; 3165 $self->{height} = 0;
2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721} 3167}
2722 3168
2723sub add_paragraph { 3169sub add_paragraph {
2724 my ($self, $color, $para, $indent) = @_; 3170 my $self = shift;
2725 3171
2726 my ($text, @w) = ref $para ? @$para : $para; 3172 for my $para (@_) {
2727
2728 $para = { 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
2729 w => 1e10, 3179 w => 1e10,
2730 wrapped => 1, 3180 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2735 }; 3181 };
2736 3182
2737 $self->add (@w) if @w; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738 push @{$self->{par}}, $para; 3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
2739 3190
2740 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2741 $self->update; 3192 $self->update;
2742} 3193}
2743 3194
2744sub scroll_to_bottom { 3195sub scroll_to_bottom {
2745 my ($self) = @_; 3196 my ($self) = @_;
2746 3197
2747 $self->{scroll_to_bottom} = 1; 3198 $self->{scroll_to} = $#{$self->{par}};
2748 $self->update; 3199 $self->update;
2749} 3200}
2750 3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
3224 $self->{height} = $height;
3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3226
3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
3233}
3234
2751sub update { 3235sub update {
2752 my ($self) = @_; 3236 my ($self) = @_;
2753 3237
2754 $self->SUPER::update; 3238 $self->SUPER::update;
2755 3239
2756 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2757 3241
2758 delete $self->{texture}; 3242 delete $self->{texture};
2759 3243
2760 $ROOT->on_post_alloc ($self => sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762 3248
2763 if (delete $self->{need_reflow}) {
2764 my $height = 0;
2765
2766 for my $para (@{$self->{par}}) {
2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768 my $layout = $self->get_layout ($para);
2769 my ($w, $h) = $layout->size;
2770
2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2774 }
2775
2776 $height += $para->{h};
2777 }
2778
2779 $self->{height} = $height;
2780
2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2792 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2793 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2794 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2795 3262
2796 my $y0 = $top; 3263 my $y0 = $top;
2797 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2798 3265
2799 my $y = 0;
2800
2801 for my $para (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2802 my $h = $para->{h}; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2803 3269
2804 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2805
2806 my $layout = $self->get_layout ($para); 3271 my $layout = $self->get_layout ($para);
2807 3272
2808 $layout->render ($para->{indent}, $y - $y0); 3273 $layout->render ($para->{indent}, $y - $y0);
2809 3274
2810 if (my @w = @{ $para->{widget} }) { 3275 if (my @w = @{ $para->{widget} }) {
… …
2819 $_->draw; 3284 $_->draw;
2820 } 3285 }
2821 } 3286 }
2822 } 3287 }
2823 3288
2824 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2825 } 3291 }
3292
3293 $self->{top_paragraph} = $top_paragraph;
2826 }; 3294 };
2827 }); 3295 });
2828} 3296}
2829 3297
2830sub reconfigure { 3298sub reconfigure {
… …
2848 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2849} 3317}
2850 3318
2851############################################################################# 3319#############################################################################
2852 3320
2853package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2854 3322
2855use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2856 3324
2857our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2858 3326
2859sub moveto { 3327sub moveto {
2860 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2861 3329
2862 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2890 glPopMatrix; 3358 glPopMatrix;
2891} 3359}
2892 3360
2893############################################################################# 3361#############################################################################
2894 3362
2895package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2896 3364
2897our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2898 3366
2899sub new { 3367sub new {
2900 my $class = shift; 3368 my $class = shift;
2901 3369
2902 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2914 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2915} 3383}
2916 3384
2917############################################################################# 3385#############################################################################
2918 3386
2919package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2920 3388
2921our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2922 3390
2923use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2924 3392
2925sub new { 3393sub new {
2926 my $class = shift; 3394 my $class = shift;
2927 3395
2928 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2931 ) 3399 )
2932} 3400}
2933 3401
2934sub set_tooltip_from { 3402sub set_tooltip_from {
2935 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2936 3407
2937 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2938 3409
2939 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2944 } 3415 }
2945 3416
2946 $tooltip =~ s/^\n+//; 3417 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//; 3418 $tooltip =~ s/\n+$//;
2948 3419
2949 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2950 markup => $tooltip, 3421 markup => $tooltip,
2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952 fontsize => 0.8, 3423 fontsize => 0.8,
2953 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2954 ellipsise => 0, 3425 ellipsise => 0,
2955 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2956 ); 3427 );
2957} 3428}
2958 3429
… …
2977 3448
2978 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2979 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2980 or return; 3451 or return;
2981 3452
3453 if ($widget->{visible}) {
2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983 3455
2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985 if $x + $self->{w} > $self->{root}{w}; 3457 if $x + $self->{w} > $self->{root}{w};
2986 3458
2987 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2988 }); 3463 });
2989} 3464}
2990 3465
2991sub _draw { 3466sub _draw {
2992 my ($self) = @_; 3467 my ($self) = @_;
… …
3016 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
3017} 3492}
3018 3493
3019############################################################################# 3494#############################################################################
3020 3495
3021package CFClient::UI::Face; 3496package CFPlus::UI::Face;
3022 3497
3023our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
3024 3499
3025use CFClient::OpenGL; 3500use CFPlus::OpenGL;
3026 3501
3027sub new { 3502sub new {
3028 my $class = shift; 3503 my $class = shift;
3029 3504
3030 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
3031 aspect => 1, 3508 aspect => 1,
3032 can_events => 0, 3509 can_events => 0,
3033 @_, 3510 @_,
3034 ); 3511 );
3035 3512
3036 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
3037 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
3038 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3039 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
3040 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041 hard => 1, 3519 parked => 1,
3042 interval => $self->{animspeed},
3043 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
3044 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
3045 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
3046 }, 3528 },
3047 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
3048 } 3533 }
3049 3534
3050 $self 3535 $self
3051} 3536}
3052 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
3053sub size_request { 3568sub size_request {
3054 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
3055} 3584}
3056 3585
3057sub update { 3586sub update {
3058 my ($self) = @_; 3587 my ($self) = @_;
3059 3588
3060 return unless $self->{visible}; 3589 return unless $self->{visible};
3061 3590
3062 $self->SUPER::update; 3591 $self->SUPER::update;
3063} 3592}
3064 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3065sub _draw { 3602sub _draw {
3066 my ($self) = @_; 3603 my ($self) = @_;
3067 3604
3068 return unless $::CONN; 3605 return unless $::CONN;
3069 3606
3070 my $face; 3607 $self->SUPER::_draw;
3071 3608
3072 if ($self->{frame}) {
3073 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3074 3610 or return;
3075 $face = $anim->[ $self->{frame} % @$anim ]
3076 if $anim && @$anim;
3077 }
3078 3611
3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3080 3613
3081 if ($tex) { 3614 if ($tex) {
3082 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3088} 3621}
3089 3622
3090sub destroy { 3623sub destroy {
3091 my ($self) = @_; 3624 my ($self) = @_;
3092 3625
3093 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3094 if $self->{timer}; 3627 if $self->{timer};
3095 3628
3096 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3097} 3630}
3098 3631
3099############################################################################# 3632#############################################################################
3100 3633
3101package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
3102 3635
3103our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
3104 3637
3105# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
3106 3639
3107############################################################################# 3640#############################################################################
3108 3641
3109package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
3110 3643
3111our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
3112 3645
3113use CFClient::OpenGL; 3646use CFPlus::OpenGL;
3114 3647
3115sub new { 3648sub new {
3116 my $class = shift; 3649 my $class = shift;
3117 3650
3118 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3119 items => [], 3652 items => [],
3120 z => 100, 3653 z => 100,
3121 @_, 3654 @_,
3122 ); 3655 );
3123 3656
3124 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125 3658
3126 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
3127 my ($widget, $cb, $tooltip) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
3128 3661
3129 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
3130 if (!ref $widget) { 3663 if (!ref $widget) {
3131 if ($widget =~ /\t/) { 3664 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2; 3665 my ($left, $right) = split /\t/, $widget, 2;
3133 3666
3134 $widget = new CFClient::UI::HBox 3667 $widget = new CFPlus::UI::HBox
3135 can_hover => 1, 3668 can_hover => 1,
3136 can_events => 1, 3669 can_events => 1,
3137 tooltip => $tooltip, 3670 tooltip => $tooltip,
3138 children => [ 3671 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1), 3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1), 3673 (new CFPlus::UI::Label markup => $right, align => +1),
3141 ], 3674 ],
3142 ; 3675 ;
3143 3676
3144 } else { 3677 } else {
3145 $widget = new CFClient::UI::Label 3678 $widget = new CFPlus::UI::Label
3146 can_hover => 1, 3679 can_hover => 1,
3147 can_events => 1, 3680 can_events => 1,
3148 markup => $widget, 3681 markup => $widget,
3149 tooltip => $tooltip; 3682 tooltip => $tooltip;
3150 } 3683 }
… …
3198 1 3731 1
3199} 3732}
3200 3733
3201############################################################################# 3734#############################################################################
3202 3735
3203package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
3204 3737
3205our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
3206 3739
3207sub new { 3740sub new {
3208 my $class = shift; 3741 my $class = shift;
3209 3742
3210 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
3271 $self->{current}->draw; 3804 $self->{current}->draw;
3272} 3805}
3273 3806
3274############################################################################# 3807#############################################################################
3275 3808
3276package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3277 3810
3278our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3279 3812
3280sub new { 3813sub new {
3281 my $class = shift; 3814 my $class = shift;
3282 3815
3283 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3287 @_, 3820 @_,
3288 ); 3821 );
3289 3822
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3294} 3827}
3295 3828
3296sub add { 3829sub add {
3297 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3298 3831
3299 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3300 3833
3301 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3302 markup => $title, 3835 markup => $title,
3303 tooltip => $tooltip, 3836 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3305 ); 3838 );
3306 3839
… …
3320 $self->emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3321} 3854}
3322 3855
3323############################################################################# 3856#############################################################################
3324 3857
3325package CFClient::UI::Combobox; 3858package CFPlus::UI::Selector;
3326 3859
3327use utf8; 3860use utf8;
3328 3861
3329our @ISA = CFClient::UI::Button::; 3862our @ISA = CFPlus::UI::Button::;
3330 3863
3331sub new { 3864sub new {
3332 my $class = shift; 3865 my $class = shift;
3333 3866
3334 my $self = $class->SUPER::new ( 3867 my $self = $class->SUPER::new (
… …
3351 my ($value, $title, $tooltip) = @$_; 3884 my ($value, $title, $tooltip) = @$_;
3352 3885
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 } 3887 }
3355 3888
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357} 3890}
3358 3891
3359sub _set_value { 3892sub _set_value {
3360 my ($self, $value) = @_; 3893 my ($self, $value) = @_;
3361 3894
… …
3376 $self->emit (changed => $value); 3909 $self->emit (changed => $value);
3377} 3910}
3378 3911
3379############################################################################# 3912#############################################################################
3380 3913
3381package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3382 3915
3383our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3384 3917
3385sub new { 3918sub new {
3386 my $class = shift; 3919 my $class = shift;
3387 3920
3388 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3389 fontsize => 0.8, 3922 fontsize => 0.8,
3390 @_, 3923 @_,
3391 ); 3924 );
3392 3925
3393 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3394 3927
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396 3929
3397 $self 3930 $self
3398} 3931}
… …
3400sub reorder { 3933sub reorder {
3401 my ($self) = @_; 3934 my ($self) = @_;
3402 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3403 3936
3404 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3408 3941
3409 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3410 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411 } 3944 }
… …
3432 for ($short) { 3965 for ($short) {
3433 s/^\s+//; 3966 s/^\s+//;
3434 s/\s+/ /g; 3967 s/\s+/ /g;
3435 } 3968 }
3436 3969
3437 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3438 markup => $short, 3971 markup => $short,
3439 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3440 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3441 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3442 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3521 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3522} 4055}
3523 4056
3524############################################################################# 4057#############################################################################
3525 4058
3526package CFClient::UI::Inventory;
3527
3528our @ISA = CFClient::UI::Table::;
3529
3530sub new {
3531 my $class = shift;
3532
3533 my $self = $class->SUPER::new (
3534 col_expand => [0, 1, 0],
3535 @_,
3536 );
3537
3538 $self
3539}
3540
3541sub set_items {
3542 my ($self, $items) = @_;
3543
3544 $self->clear;
3545 return unless $items;
3546
3547 my @items = sort {
3548 ($a->{type} <=> $b->{type})
3549 or ($a->{name} cmp $b->{name})
3550 } values %$items;
3551
3552 $self->{real_items} = \@items;
3553
3554 my $row = 0;
3555 for my $item (@items) {
3556 CFClient::Item::update_widgets $item;
3557
3558 $self->add (0, $row, $item->{face_widget});
3559 $self->add (1, $row, $item->{desc_widget});
3560 $self->add (2, $row, $item->{weight_widget});
3561
3562 $row++;
3563 }
3564}
3565
3566#############################################################################
3567
3568package CFClient::UI::SpellList;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
3578 @_,
3579 )
3580}
3581
3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3667sub add_spell {
3668 my ($self, $spell) = @_;
3669
3670 $self->{spell}->{$spell->{name}} = $spell;
3671 $self->rebuild_spell_list;
3672}
3673
3674sub remove_spell {
3675 my ($self, $spell) = @_;
3676
3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3688#############################################################################
3689
3690package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3691 4060
3692our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3693 4062
3694use List::Util qw(min max); 4063use List::Util qw(min max);
3695 4064
3696use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3697 4066
3698sub new { 4067sub new {
3699 my $class = shift; 4068 my $class = shift;
3700 4069
3701 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3702 visible => 1, 4071 visible => 1,
3703 @_, 4072 @_,
3704 ); 4073 );
3705 4074
3706 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3707 4076
3708 $self 4077 $self
3709} 4078}
3710 4079
3711sub size_request { 4080sub size_request {
… …
3880 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3881 4250
3882 $w = max $widget->{min_w}, $w; 4251 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h; 4252 $h = max $widget->{min_h}, $h;
3884 4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887 4259
3888 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3889 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
… …
3902 4274
3903 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3904 $_->() 4276 $_->()
3905 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3906 } 4278 }
3907
3908 4279
3909 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3911 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3912 4283
… …
3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3917 glLoadIdentity; 4288 glLoadIdentity;
3918 4289
3919 { 4290 {
3920 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3921 4292
3922 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3924 }
3925 4295
3926 $self->_draw; 4296 $self->_draw;
4297 }
3927} 4298}
3928 4299
3929############################################################################# 4300#############################################################################
3930 4301
3931package CFClient::UI; 4302package CFPlus::UI;
3932 4303
3933$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3934$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935 4306
39361 43071
3937 4308

Diff Legend

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