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.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.373 by root, Sun Jul 15 22:39:30 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 {
… …
437} 445}
438 446
439# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
440sub coord2global { 448sub coord2global {
441 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
450
451 Carp::confess unless $self->{parent};#d#
442 452
443 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444} 454}
445 455
446sub invoke_focus_in { 456sub invoke_focus_in {
… …
494 504
495sub connect { 505sub connect {
496 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
497 507
498 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 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
499} 520}
500 521
501my %has_coords = ( 522my %has_coords = (
502 button_down => 1, 523 button_down => 1,
503 button_up => 1, 524 button_up => 1,
… …
506); 527);
507 528
508sub emit { 529sub emit {
509 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
510 531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
511 my @append 534 my @append
512 = $has_coords{$signal} 535 = $has_coords{$signal}
513 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
514 : (); 537 : ();
515 538
516 #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#
517 540
518 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
520 || ($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
521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
522} 550}
523 551
524sub find_widget { 552sub find_widget {
525 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
526 554
… …
534} 562}
535 563
536sub set_parent { 564sub set_parent {
537 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
538 566
539 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
540 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
541} 569}
542 570
543sub realloc { 571sub realloc {
544 my ($self) = @_; 572 my ($self) = @_;
… …
610 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
611 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
612 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
613 glEnd; 641 glEnd;
614 glPopMatrix; 642 glPopMatrix;
615 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
616 } 644 }
617 645
618 $self->_draw; 646 $self->_draw;
619 glPopMatrix; 647 glPopMatrix;
620} 648}
… …
623 my ($self) = @_; 651 my ($self) = @_;
624 652
625 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
626} 654}
627 655
656my $cntx;#d#
628sub DESTROY { 657sub DESTROY {
629 my ($self) = @_; 658 my ($self) = @_;
630 659
631 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
632
633 delete $WIDGET{$self+0};
634 661
635 eval { $self->destroy }; 662 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
637} 666}
638 667
639############################################################################# 668#############################################################################
640 669
641package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
642 671
643our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
644 673
645use strict; 674use strict;
646use CFClient::OpenGL; 675use CFPlus::OpenGL;
647 676
648sub new { 677sub new {
649 my $class = shift; 678 my $class = shift;
650 679
651 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
682 } 711 }
683} 712}
684 713
685############################################################################# 714#############################################################################
686 715
687package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
688 717
689our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
690 719
691sub new { 720sub new {
692 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
693 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
694} 723}
… …
701 730
702sub draw { } 731sub draw { }
703 732
704############################################################################# 733#############################################################################
705 734
706package CFClient::UI::Container; 735package CFPlus::UI::Container;
707 736
708our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
709 738
710sub new { 739sub new {
711 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
712 741
713 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
722 if $children; 751 if $children;
723 752
724 $self 753 $self
725} 754}
726 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
727sub add { 764sub add {
728 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
729 766
730 $_->set_parent ($self) 767 $_->set_parent ($self)
731 for @widgets; 768 for @widgets;
… …
791 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
792} 829}
793 830
794############################################################################# 831#############################################################################
795 832
796package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
797 834
798our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
799 836
800sub new { 837sub new {
801 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
802 839
803 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804 841
805 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
806} 843}
807 844
808sub add { 845sub add {
… …
815sub remove { 852sub remove {
816 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
817 854
818 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
819 856
820 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
821 unless @{$self->{children}}; 858 unless @{$self->{children}};
822} 859}
823 860
824sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
825 862
… …
837 874
838############################################################################# 875#############################################################################
839 876
840# back-buffered drawing area 877# back-buffered drawing area
841 878
842package CFClient::UI::Window; 879package CFPlus::UI::Window;
843 880
844our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
845 882
846use CFClient::OpenGL; 883use CFPlus::OpenGL;
847 884
848sub new { 885sub new {
849 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
850 887
851 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
873} 910}
874 911
875sub render_child { 912sub render_child {
876 my ($self) = @_; 913 my ($self) = @_;
877 914
878 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
879 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
880 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
881 918
882 { 919 {
883 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
884 921
885 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
886 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
887 } 926 }
888
889 $self->_render;
890 }; 927 };
891} 928}
892 929
893sub _draw { 930sub _draw {
894 my ($self) = @_; 931 my ($self) = @_;
895
896 my ($w, $h) = @$self{qw(w h)};
897 932
898 my $tex = $self->{texture} 933 my $tex = $self->{texture}
899 or return; 934 or return;
900 935
901 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
902 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
904 939
905 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
906 941
907 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
908} 943}
909 944
910############################################################################# 945#############################################################################
911 946
912package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
913 948
914our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
915 950
916sub new { 951sub new {
917 my $class = shift; 952 my $class = shift;
918 953
919 $class->SUPER::new ( 954 $class->SUPER::new (
… …
979 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
981 ) { 1016 ) {
982 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
983 } else { 1018 } else {
984 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
985 } 1020 }
986} 1021}
987 1022
988sub _render { 1023sub _render {
989 my ($self) = @_; 1024 my ($self) = @_;
990 1025
991 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
992 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
993 1028
994 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995 1030
996 $self->SUPER::_render; 1031 $self->SUPER::_render;
997} 1032}
998 1033
999############################################################################# 1034#############################################################################
1000 1035
1001package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1002 1037
1003our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1004 1039
1005sub new { 1040sub new {
1006 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1007 1042
1008 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1009 1044
1010 my $self; 1045 my $self;
1011 1046
1012 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
1013 vertical => 1, 1057 vertical => 1,
1014 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1015 on_changed => sub { 1059 on_changed => sub {
1016 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017 }, 1062 },
1018 ; 1063 ;
1019 1064
1020 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1021 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1022 can_events => 1, 1068 can_events => 1,
1023 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1024 %arg, 1073 %arg,
1025 ); 1074 );
1026 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
1027 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
1028 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
1029 1087
1030 $self 1088 $self
1031} 1089}
1032 1090
… …
1041sub invoke_mouse_wheel { 1099sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_; 1100 my ($self, $ev) = @_;
1043 1101
1044 return 0 unless $ev->{dy}; # only vertical movements 1102 return 0 unless $ev->{dy}; # only vertical movements
1045 1103
1046 $self->{slider}->emit (mouse_wheel => $ev); 1104 $self->{vslider}->emit (mouse_wheel => $ev);
1047 1105
1048 1 1106 1
1049} 1107}
1050 1108
1051sub update_slider { 1109sub update_slider {
1052 my ($self) = @_; 1110 my ($self) = @_;
1053 1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1055} 1121}
1056 1122
1057sub update { 1123sub update {
1058 my ($self) = @_; 1124 my ($self) = @_;
1059 1125
1060 $self->SUPER::update; 1126 $self->SUPER::update;
1061
1062 $self->update_slider; 1127 $self->update_slider;
1063} 1128}
1064 1129
1065sub invoke_size_allocate { 1130sub invoke_size_allocate {
1066 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1067 1132
1068 $self->update_slider; 1133 $self->update_slider;
1069
1070 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1071} 1135}
1072 1136
1073############################################################################# 1137#############################################################################
1074 1138
1075package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1076 1140
1077our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1078 1142
1079use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1080 1144
1081sub new { 1145sub new {
1082 my $class = shift; 1146 my $class = shift;
1083 1147
1084 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1110 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1111} 1175}
1112 1176
1113############################################################################# 1177#############################################################################
1114 1178
1115package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1116 1180
1117our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1118 1182
1119use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1120 1284
1121my $bg = 1285my $bg =
1122 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1124 1288
1125my @border = 1289my @border =
1126 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1128 1292
1129sub new { 1293sub new {
1130 my ($class, %arg) = @_; 1294 my ($class, %arg) = @_;
1131 1295
… …
1137 min_w => 64, 1301 min_w => 64,
1138 min_h => 32, 1302 min_h => 32,
1139 %arg, 1303 %arg,
1140 ); 1304 );
1141 1305
1142 $self->{title_widget} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1143 align => 0, 1307 align => 0,
1144 valign => 1, 1308 valign => 1,
1145 text => $self->{title}, 1309 text => $self->{title},
1146 fontsize => $self->{border}, 1310 fontsize => $self->{border},
1147 if exists $self->{title}; 1311 if exists $self->{title};
1148 1312
1149 if ($self->{has_close_button}) { 1313 if ($self->{has_close_button}) {
1150 $self->{close_button} = 1314 $self->{close_button} =
1151 new CFClient::UI::ImageButton 1315 new CFPlus::UI::ImageButton
1152 path => 'x1_close.png', 1316 path => 'x1_close.png',
1153 on_activate => sub { $self->emit ("delete") }; 1317 on_activate => sub { $self->emit ("delete") };
1154 1318
1155 $self->CFClient::UI::Container::add ($self->{close_button}); 1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1156 } 1320 }
1157 1321
1158 $self 1322 $self
1159} 1323}
1160 1324
1161sub add { 1325sub add {
1162 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1163 1327
1164 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1167} 1331}
1168 1332
1169sub border { 1333sub border {
1170 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1171} 1335}
… …
1279 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1280 1444
1281 ! ! $self->{motion} 1445 ! ! $self->{motion}
1282} 1446}
1283 1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1454}
1455
1284sub _draw { 1456sub _draw {
1285 my ($self) = @_; 1457 my ($self) = @_;
1286 1458
1287 my $child = $self->{children}[0]; 1459 my $child = $self->{children}[0];
1288 1460
… …
1325 if $self->{close_button}; 1497 if $self->{close_button};
1326} 1498}
1327 1499
1328############################################################################# 1500#############################################################################
1329 1501
1330package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1331 1503
1332our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1333 1505
1334use List::Util qw(max sum); 1506use List::Util qw(max sum);
1335 1507
1336use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1337 1509
1338sub new { 1510sub new {
1339 my $class = shift; 1511 my $class = shift;
1340 1512
1341 $class->SUPER::new ( 1513 $class->SUPER::new (
1342 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1343 @_, 1516 @_,
1344 ) 1517 )
1345} 1518}
1346 1519
1347sub children { 1520sub children {
1348 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349} 1522}
1350 1523
1351sub add { 1524sub add {
1352 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1353 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1354 $child->set_parent ($self); 1529 $child->set_parent ($self);
1355 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1356 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1357 $self->realloc; 1535 $self->realloc;
1358} 1536}
1359 1537
1360sub remove { 1538sub remove {
1361 my ($self, $child) = @_; 1539 my ($self, $child) = @_;
… …
1417 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1418 1596
1419 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1420 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1421 1599
1422 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1423 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1424 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1425 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1426 1604
1427 # linearly scale sizes
1428 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430 1606
1431 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1432 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1433 1616
1434 my $y; 1617 my $y;
1435 1618
1436 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1437 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1480 } 1663 }
1481} 1664}
1482 1665
1483############################################################################# 1666#############################################################################
1484 1667
1485package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1486 1669
1487our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1488 1671
1489sub size_request { 1672sub size_request {
1490 my ($self) = @_; 1673 my ($self) = @_;
1491 1674
1492 $self->{vertical} 1675 $self->{vertical}
… …
1525 $req[$_] += $space * $children[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1526 for 0 .. $#children; 1709 for 0 .. $#children;
1527 } 1710 }
1528 } 1711 }
1529 1712
1530 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1531 1714
1532 my $pos = 0; 1715 my $pos = 0;
1533 for (0 .. $#children) { 1716 for (0 .. $#children) {
1534 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1540 1 1723 1
1541} 1724}
1542 1725
1543############################################################################# 1726#############################################################################
1544 1727
1545package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1546 1729
1547our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1548 1731
1549sub new { 1732sub new {
1550 my $class = shift; 1733 my $class = shift;
1551 1734
1552 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1555 ) 1738 )
1556} 1739}
1557 1740
1558############################################################################# 1741#############################################################################
1559 1742
1560package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1561 1744
1562our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1563 1746
1564sub new { 1747sub new {
1565 my $class = shift; 1748 my $class = shift;
1566 1749
1567 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1570 ) 1753 )
1571} 1754}
1572 1755
1573############################################################################# 1756#############################################################################
1574 1757
1575package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1576 1759
1577our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1578 1761
1579use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1580 1763
1581sub new { 1764sub new {
1582 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1583 1766
1584 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1587 #active_bg => none 1770 #active_bg => none
1588 #font => default_font 1771 #font => default_font
1589 #text => initial text 1772 #text => initial text
1590 #markup => initial narkup 1773 #markup => initial narkup
1591 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1592 ellipsise => 3, # end 1776 ellipsise => 3, # end
1593 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1594 fontsize => 1, 1778 fontsize => 1,
1595 align => -1, 1779 align => -1,
1596 valign => -1, 1780 valign => -1,
1597 padding_x => 2, 1781 padding_x => 2,
1598 padding_y => 2, 1782 padding_y => 2,
1599 can_events => 0, 1783 can_events => 0,
1600 %arg 1784 %arg
1601 ); 1785 );
1602 1786
1603 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1604 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1605 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1606 $self->{template} = $layout; 1790 $self->{template} = $layout;
1607 } 1791 }
1608 1792
1609 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1611 } else { 1795 } else {
1612 $self->set_text (delete $self->{text}); 1796 $self->set_text (delete $self->{text});
1613 } 1797 }
1614 1798
1615 $self 1799 $self
1616}
1617
1618sub escape($) {
1619 local $_ = $_[0];
1620
1621 s/&/&amp;/g;
1622 s/>/&gt;/g;
1623 s/</&lt;/g;
1624
1625 $_
1626} 1800}
1627 1801
1628sub update { 1802sub update {
1629 my ($self) = @_; 1803 my ($self) = @_;
1630 1804
… …
1757 }; 1931 };
1758 1932
1759 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1760 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1761 1935
1762 $self->{layout}->render ($self->{ox}, $self->{oy}); 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763} 1937}
1764 1938
1765############################################################################# 1939#############################################################################
1766 1940
1767package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1768 1942
1769our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1770 1944
1771use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1772 1946
1773sub new { 1947sub new {
1774 my $class = shift; 1948 my $class = shift;
1775 1949
1776 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1780 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1781 can_hover => 1, 1955 can_hover => 1,
1782 can_focus => 1, 1956 can_focus => 1,
1783 valign => 0, 1957 valign => 0,
1784 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1785 #text => ... 1960 #text => ...
1786 #hidden => "*", 1961 #hidden => "*",
1787 @_ 1962 @_
1788 ) 1963 )
1789} 1964}
… …
1834 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1835 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1836 2011
1837 my $text = $self->get_text; 2012 my $text = $self->get_text;
1838 2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2015
1839 if ($uni == 8) { 2016 if ($uni == 8) {
1840 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1842 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1843 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1844 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1845 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1846 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1847 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1848 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1849 } elsif ($sym == CFClient::SDLK_END) {
1850 $self->{cursor} = length $text;
1851 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1852 $self->emit ('escape'); 2040 $self->emit ('escape');
1853 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1854 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1855 } else { 2045 } else {
1856 return 0; 2046 return 0;
1857 } 2047 }
1858 2048
1859 $self->_set_text ($text); 2049 $self->_set_text ($text);
1860 2050
1861 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1862 2053
1863 1 2054 1
1864} 2055}
1865 2056
1866sub invoke_focus_in { 2057sub invoke_focus_in {
… …
1928 utf8::encode $text; 2119 utf8::encode $text;
1929 2120
1930 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1931 } 2122 }
1932 2123
1933 glColor @{$self->{fg}};
1934 glBegin GL_LINES; 2124 glBegin GL_LINES;
1935 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1936 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1937 glEnd; 2127 glEnd;
1938 } 2128 }
1939} 2129}
1940 2130
2131#############################################################################
2132
1941package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1942 2134
1943our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1944 2136
1945use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1946 2138
1947sub invoke_key_down { 2139sub invoke_key_down {
1948 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1949 2141
1950 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1951 2143
1952 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1953 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1954 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
1955 2147
1956 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1957 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1958 $self->emit (activate => $txt); 2150 $self->emit (activate => $txt);
1959 $self->update; 2151 $self->update;
1960 2152
1961 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1962 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1963 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1964 } 2156 }
1965 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1966 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1968 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1969 } 2161 }
1970 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1971 } 2163 }
1972 2164
1973 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1974 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1975 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976 2168
1977 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1978 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1987 1 2179 1
1988} 2180}
1989 2181
1990############################################################################# 2182#############################################################################
1991 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1992package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1993 2224
1994our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1995 2226
1996use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1997 2228
1998my @tex = 2229my @tex =
1999 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
2001 2232
2002sub new { 2233sub new {
2003 my $class = shift; 2234 my $class = shift;
2004 2235
… …
2041 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
2042} 2273}
2043 2274
2044############################################################################# 2275#############################################################################
2045 2276
2277package CFPlus::UI::CheckBox;
2278
2279our @ISA = CFPlus::UI::DrawBG::;
2280
2281my @tex =
2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2284
2285use CFPlus::OpenGL;
2286
2287sub new {
2288 my $class = shift;
2289
2290 $class->SUPER::new (
2291 padding_x => 2,
2292 padding_y => 2,
2293 fg => [1, 1, 1],
2294 active_fg => [1, 1, 0],
2295 bg => [0, 0, 0, 0.2],
2296 active_bg => [1, 1, 1, 0.5],
2297 state => 0,
2298 can_hover => 1,
2299 @_
2300 )
2301}
2302
2303sub size_request {
2304 my ($self) = @_;
2305
2306 (6) x 2
2307}
2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
2317sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_;
2319
2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2322 $self->toggle;
2323 } else {
2324 return 0
2325 }
2326
2327 1
2328}
2329
2330sub _draw {
2331 my ($self) = @_;
2332
2333 $self->SUPER::_draw;
2334
2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2336
2337 my ($w, $h) = @$self{qw(w h)};
2338
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2340
2341 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2342
2343 my $tex = $self->{state} ? $tex[1] : $tex[0];
2344
2345 glEnable GL_TEXTURE_2D;
2346 $tex->draw_quad_alpha (0, 0, $s, $s);
2347 glDisable GL_TEXTURE_2D;
2348}
2349
2350#############################################################################
2351
2352package CFPlus::UI::Image;
2353
2354our @ISA = CFPlus::UI::Base::;
2355
2356use CFPlus::OpenGL;
2357
2358our %texture_cache;
2359
2360sub new {
2361 my $class = shift;
2362
2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2367
2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2370
2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2373
2374 CFPlus::weaken $texture_cache{$self->{path}};
2375
2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2377
2378 $self
2379}
2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2396sub size_request {
2397 my ($self) = @_;
2398
2399 ($self->{tex}{w}, $self->{tex}{h})
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 my $tex = $self->{tex};
2406
2407 my ($w, $h) = ($self->{w}, $self->{h});
2408
2409 if ($self->{rot90}) {
2410 glRotate 90, 0, 0, 1;
2411 glTranslate 0, -$self->{w}, 0;
2412
2413 ($w, $h) = ($h, $w);
2414 }
2415
2416 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418
2419 $tex->draw_quad (0, 0, $w, $h);
2420
2421 glDisable GL_TEXTURE_2D;
2422}
2423
2424#############################################################################
2425
2046package CFClient::UI::ImageButton; 2426package CFPlus::UI::ImageButton;
2047 2427
2048our @ISA = CFClient::UI::Image::; 2428our @ISA = CFPlus::UI::Image::;
2049 2429
2050use CFClient::OpenGL; 2430use CFPlus::OpenGL;
2051 2431
2052my %textures; 2432my %textures;
2053 2433
2054sub new { 2434sub new {
2055 my $class = shift; 2435 my $class = shift;
… …
2077 1 2457 1
2078} 2458}
2079 2459
2080############################################################################# 2460#############################################################################
2081 2461
2082package CFClient::UI::CheckBox;
2083
2084our @ISA = CFClient::UI::DrawBG::;
2085
2086my @tex =
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090use CFClient::OpenGL;
2091
2092sub new {
2093 my $class = shift;
2094
2095 $class->SUPER::new (
2096 padding_x => 2,
2097 padding_y => 2,
2098 fg => [1, 1, 1],
2099 active_fg => [1, 1, 0],
2100 bg => [0, 0, 0, 0.2],
2101 active_bg => [1, 1, 1, 0.5],
2102 state => 0,
2103 can_hover => 1,
2104 @_
2105 )
2106}
2107
2108sub size_request {
2109 my ($self) = @_;
2110
2111 (6) x 2
2112}
2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
2122sub invoke_button_down {
2123 my ($self, $ev, $x, $y) = @_;
2124
2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127 $self->toggle;
2128 } else {
2129 return 0
2130 }
2131
2132 1
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 $self->SUPER::_draw;
2139
2140 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142 my ($w, $h) = @$self{qw(w h)};
2143
2144 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148 my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150 glEnable GL_TEXTURE_2D;
2151 $tex->draw_quad_alpha (0, 0, $s, $s);
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::Image; 2462package CFPlus::UI::VGauge;
2158 2463
2159our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2160
2161use CFClient::OpenGL;
2162
2163our %texture_cache;
2164
2165sub new {
2166 my $class = shift;
2167
2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2172
2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
2175
2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183 $self
2184}
2185
2186sub size_request {
2187 my ($self) = @_;
2188
2189 ($self->{tex}{w}, $self->{tex}{h})
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194
2195 my $tex = $self->{tex};
2196
2197 my ($w, $h) = ($self->{w}, $self->{h});
2198
2199 if ($self->{rot90}) {
2200 glRotate 90, 0, 0, 1;
2201 glTranslate 0, -$self->{w}, 0;
2202
2203 ($w, $h) = ($h, $w);
2204 }
2205
2206 glEnable GL_TEXTURE_2D;
2207 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209 $tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211 glDisable GL_TEXTURE_2D;
2212}
2213
2214#############################################################################
2215
2216package CFClient::UI::VGauge;
2217
2218our @ISA = CFClient::UI::Base::;
2219 2465
2220use List::Util qw(min max); 2466use List::Util qw(min max);
2221 2467
2222use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2223 2469
2224my %tex = ( 2470my %tex = (
2225 food => [ 2471 food => [
2226 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228 ], 2474 ],
2229 grace => [ 2475 grace => [
2230 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232 ], 2478 ],
2233 hp => [ 2479 hp => [
2234 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236 ], 2482 ],
2237 mana => [ 2483 mana => [
2238 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240 ], 2486 ],
2241); 2487);
2242 2488
2243# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2346 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2347} 2593}
2348 2594
2349############################################################################# 2595#############################################################################
2350 2596
2351package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2352 2598
2353our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2354 2600
2355sub new { 2601sub new {
2356 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2357 2603
2358 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2360 can_hover => 1, 2606 can_hover => 1,
2361 can_events => 1, 2607 can_events => 1,
2362 %arg, 2608 %arg,
2363 ); 2609 );
2364 2610
2365 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2366 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2367 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368 2614
2369 $self 2615 $self
2370} 2616}
2371 2617
2372sub set_fontsize { 2618sub set_fontsize {
… …
2393 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2394} 2640}
2395 2641
2396############################################################################# 2642#############################################################################
2397 2643
2398package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2399 2645
2400use strict; 2646use strict;
2401 2647
2402use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2403 2649
2404our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2405 2651
2406my @tex = 2652my @tex =
2407 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2409 2655
2410sub new { 2656sub new {
2411 my $class = shift; 2657 my $class = shift;
2412 2658
… …
2506sub invoke_mouse_wheel { 2752sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_; 2753 my ($self, $ev) = @_;
2508 2754
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510 2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512 2760
2513 ! ! $delta 2761 ! ! $delta
2514} 2762}
2515 2763
2516sub update { 2764sub update {
… …
2567 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2568} 2816}
2569 2817
2570############################################################################# 2818#############################################################################
2571 2819
2572package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2573 2821
2574our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2575 2823
2576sub new { 2824sub new {
2577 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2578 2826
2579 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2580 2828
2581 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2582 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584 to_value => sub { shift }, 2832 to_value => sub { shift },
2585 from_value => sub { shift }, 2833 from_value => sub { shift },
2586 %arg, 2834 %arg,
2587 ); 2835 );
2588 2836
… …
2608sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2609sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2610 2858
2611############################################################################# 2859#############################################################################
2612 2860
2613package CFClient::UI::TextScroller; 2861package CFPlus::UI::TextScroller;
2614 2862
2615our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2616 2864
2617use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2618 2866
2619sub new { 2867sub new {
2620 my $class = shift; 2868 my $class = shift;
2621 2869
2622 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
… …
2624 can_events => 1, 2872 can_events => 1,
2625 indent => 0, 2873 indent => 0,
2626 #font => default_font 2874 #font => default_font
2627 @_, 2875 @_,
2628 2876
2629 layout => (new CFClient::Layout), 2877 layout => (new CFPlus::Layout),
2630 par => [], 2878 par => [],
2879 max_par => 0,
2631 height => 0, 2880 height => 0,
2632 children => [ 2881 children => [
2633 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2634 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2635 ], 2884 ],
2636 ); 2885 );
2637 2886
2638 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2639 2888
… …
2716 2965
2717 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2718 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2719} 2968}
2720 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2721sub clear { 2985sub clear {
2722 my ($self) = @_; 2986 my ($self) = @_;
2723 2987
2724 my (undef, undef, @other) = @{ $self->{children} }; 2988 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other; 2989 $self->remove ($_) for @other;
… …
2728 $self->{height} = 0; 2992 $self->{height} = 0;
2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730} 2994}
2731 2995
2732sub add_paragraph { 2996sub add_paragraph {
2733 my ($self, $color, $para, $indent) = @_; 2997 my $self = shift;
2734 2998
2735 my ($text, @w) = ref $para ? @$para : $para; 2999 for my $para (@_) {
2736
2737 $para = { 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
2738 w => 1e10, 3006 w => 1e10,
2739 wrapped => 1, 3007 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2744 }; 3008 };
2745 3009
2746 $self->add (@w) if @w; 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747 push @{$self->{par}}, $para; 3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
2748 3017
2749 $self->{need_reflow}++; 3018 $self->{need_reflow}++;
2750 $self->update; 3019 $self->update;
2751} 3020}
2752 3021
2753sub scroll_to_bottom { 3022sub scroll_to_bottom {
2754 my ($self) = @_; 3023 my ($self) = @_;
2755 3024
2756 $self->{scroll_to_bottom} = 1; 3025 $self->{scroll_to} = $#{$self->{par}};
2757 $self->update; 3026 $self->update;
2758} 3027}
2759 3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
3051 $self->{height} = $height;
3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3053
3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
3060}
3061
2760sub update { 3062sub update {
2761 my ($self) = @_; 3063 my ($self) = @_;
2762 3064
2763 $self->SUPER::update; 3065 $self->SUPER::update;
2764 3066
2765 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2766 3068
2767 delete $self->{texture}; 3069 delete $self->{texture};
2768 3070
2769 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771 3075
2772 if (delete $self->{need_reflow}) {
2773 my $height = 0;
2774
2775 for my $para (@{$self->{par}}) {
2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777 my $layout = $self->get_layout ($para);
2778 my ($w, $h) = $layout->size;
2779
2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2783 }
2784
2785 $height += $para->{h};
2786 }
2787
2788 $self->{height} = $height;
2789
2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792 delete $self->{texture};
2793 }
2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2797 }
2798
2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2801 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2802 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2803 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2804 3089
2805 my $y0 = $top; 3090 my $y0 = $top;
2806 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2807 3092
2808 my $y = 0;
2809
2810 for my $para (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2811 my $h = $para->{h}; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2812 3096
2813 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2814
2815 my $layout = $self->get_layout ($para); 3098 my $layout = $self->get_layout ($para);
2816 3099
2817 $layout->render ($para->{indent}, $y - $y0); 3100 $layout->render ($para->{indent}, $y - $y0);
2818 3101
2819 if (my @w = @{ $para->{widget} }) { 3102 if (my @w = @{ $para->{widget} }) {
… …
2828 $_->draw; 3111 $_->draw;
2829 } 3112 }
2830 } 3113 }
2831 } 3114 }
2832 3115
2833 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2834 } 3118 }
3119
3120 $self->{top_paragraph} = $top_paragraph;
2835 }; 3121 };
2836 }); 3122 });
2837} 3123}
2838 3124
2839sub reconfigure { 3125sub reconfigure {
… …
2857 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2858} 3144}
2859 3145
2860############################################################################# 3146#############################################################################
2861 3147
2862package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2863 3149
2864use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2865 3151
2866our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2867 3153
2868sub moveto { 3154sub moveto {
2869 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2870 3156
2871 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2899 glPopMatrix; 3185 glPopMatrix;
2900} 3186}
2901 3187
2902############################################################################# 3188#############################################################################
2903 3189
2904package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2905 3191
2906our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2907 3193
2908sub new { 3194sub new {
2909 my $class = shift; 3195 my $class = shift;
2910 3196
2911 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2923 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2924} 3210}
2925 3211
2926############################################################################# 3212#############################################################################
2927 3213
2928package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2929 3215
2930our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2931 3217
2932use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2933 3219
2934sub new { 3220sub new {
2935 my $class = shift; 3221 my $class = shift;
2936 3222
2937 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2940 ) 3226 )
2941} 3227}
2942 3228
2943sub set_tooltip_from { 3229sub set_tooltip_from {
2944 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2945 3234
2946 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2947 3236
2948 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2949 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2953 } 3242 }
2954 3243
2955 $tooltip =~ s/^\n+//; 3244 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//; 3245 $tooltip =~ s/\n+$//;
2957 3246
2958 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2959 markup => $tooltip, 3248 markup => $tooltip,
2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961 fontsize => 0.8, 3250 fontsize => 0.8,
2962 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2963 ellipsise => 0, 3252 ellipsise => 0,
2964 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2965 ); 3254 );
2966} 3255}
2967 3256
… …
2986 3275
2987 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2988 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2989 or return; 3278 or return;
2990 3279
3280 if ($widget->{visible}) {
2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992 3282
2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994 if $x + $self->{w} > $self->{root}{w}; 3284 if $x + $self->{w} > $self->{root}{w};
2995 3285
2996 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2997 }); 3290 });
2998} 3291}
2999 3292
3000sub _draw { 3293sub _draw {
3001 my ($self) = @_; 3294 my ($self) = @_;
… …
3025 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
3026} 3319}
3027 3320
3028############################################################################# 3321#############################################################################
3029 3322
3030package CFClient::UI::Face; 3323package CFPlus::UI::Face;
3031 3324
3032our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
3033 3326
3034use CFClient::OpenGL; 3327use CFPlus::OpenGL;
3035 3328
3036sub new { 3329sub new {
3037 my $class = shift; 3330 my $class = shift;
3038 3331
3039 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
3333 size_w => 32,
3334 size_h => 8,
3040 aspect => 1, 3335 aspect => 1,
3041 can_events => 0, 3336 can_events => 0,
3042 @_, 3337 @_,
3043 ); 3338 );
3044 3339
3045 if ($self->{anim} && $self->{animspeed}) { 3340 if ($self->{anim} && $self->{animspeed}) {
3046 Scalar::Util::weaken (my $widget = $self); 3341 CFPlus::weaken (my $widget = $self);
3047 3342
3048 $self->{timer} = Event->timer ( 3343 $self->{timer} = Event->timer (
3049 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050 hard => 1, 3345 hard => 1,
3051 interval => $self->{animspeed}, 3346 interval => $self->{animspeed},
3052 cb => sub { 3347 cb => sub {
3348 return unless $::CONN;
3349
3053 ++$widget->{frame}; 3350 ++$widget->{frame};
3351 $self->update_face;
3054 $widget->update; 3352 $self->update;
3055 }, 3353 },
3056 ); 3354 );
3355
3356 $self->update_face;
3057 } 3357 }
3058 3358
3059 $self 3359 $self
3060} 3360}
3061 3361
3362sub update_face {
3363 my ($self) = @_;
3364
3365 return unless $::CONN;
3366
3367 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3368 if ($anim && @$anim) {
3369 delete $self->{wait_face};
3370 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3371 }
3372 }
3373}
3374
3062sub size_request { 3375sub size_request {
3063 (32, 8) 3376 my ($self) = @_;
3377
3378 if ($::CONN) {
3379 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3380 if (my $tex = $::CONN->{texture}[$faceid]) {
3381 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3382 } else {
3383 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3384 $self->realloc;
3385 });
3386 }
3387 }
3388 }
3389
3390 ($self->{size_w} || 8, $self->{size_h} || 8)
3064} 3391}
3065 3392
3066sub update { 3393sub update {
3067 my ($self) = @_; 3394 my ($self) = @_;
3068 3395
… …
3074sub _draw { 3401sub _draw {
3075 my ($self) = @_; 3402 my ($self) = @_;
3076 3403
3077 return unless $::CONN; 3404 return unless $::CONN;
3078 3405
3079 my $face; 3406 $self->SUPER::_draw;
3080 3407
3081 if ($self->{frame}) {
3082 my $anim = $::CONN->{anim}[$self->{anim}]; 3408 my $faceid = $::CONN->{faceid}[$self->{face}]
3083 3409 or return;
3084 $face = $anim->[ $self->{frame} % @$anim ]
3085 if $anim && @$anim;
3086 }
3087 3410
3088 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3411 my $tex = $::CONN->{texture}[$faceid];
3089 3412
3090 if ($tex) { 3413 if ($tex) {
3091 glEnable GL_TEXTURE_2D; 3414 glEnable GL_TEXTURE_2D;
3092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3093 glColor 0, 0, 0, 1; 3416 glColor 0, 0, 0, 1;
… …
3105 $self->SUPER::destroy; 3428 $self->SUPER::destroy;
3106} 3429}
3107 3430
3108############################################################################# 3431#############################################################################
3109 3432
3110package CFClient::UI::Buttonbar; 3433package CFPlus::UI::Buttonbar;
3111 3434
3112our @ISA = CFClient::UI::HBox::; 3435our @ISA = CFPlus::UI::HBox::;
3113 3436
3114# TODO: should actualyl wrap buttons and other goodies. 3437# TODO: should actually wrap buttons and other goodies.
3115 3438
3116############################################################################# 3439#############################################################################
3117 3440
3118package CFClient::UI::Menu; 3441package CFPlus::UI::Menu;
3119 3442
3120our @ISA = CFClient::UI::FancyFrame::; 3443our @ISA = CFPlus::UI::Toplevel::;
3121 3444
3122use CFClient::OpenGL; 3445use CFPlus::OpenGL;
3123 3446
3124sub new { 3447sub new {
3125 my $class = shift; 3448 my $class = shift;
3126 3449
3127 my $self = $class->SUPER::new ( 3450 my $self = $class->SUPER::new (
3128 items => [], 3451 items => [],
3129 z => 100, 3452 z => 100,
3130 @_, 3453 @_,
3131 ); 3454 );
3132 3455
3133 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3456 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134 3457
3135 for my $item (@{ $self->{items} }) { 3458 for my $item (@{ $self->{items} }) {
3136 my ($widget, $cb, $tooltip) = @$item; 3459 my ($widget, $cb, $tooltip) = @$item;
3137 3460
3138 # handle various types of items, only text for now 3461 # handle various types of items, only text for now
3139 if (!ref $widget) { 3462 if (!ref $widget) {
3140 if ($widget =~ /\t/) { 3463 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2; 3464 my ($left, $right) = split /\t/, $widget, 2;
3142 3465
3143 $widget = new CFClient::UI::HBox 3466 $widget = new CFPlus::UI::HBox
3144 can_hover => 1, 3467 can_hover => 1,
3145 can_events => 1, 3468 can_events => 1,
3146 tooltip => $tooltip, 3469 tooltip => $tooltip,
3147 children => [ 3470 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1), 3471 (new CFPlus::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1), 3472 (new CFPlus::UI::Label markup => $right, align => +1),
3150 ], 3473 ],
3151 ; 3474 ;
3152 3475
3153 } else { 3476 } else {
3154 $widget = new CFClient::UI::Label 3477 $widget = new CFPlus::UI::Label
3155 can_hover => 1, 3478 can_hover => 1,
3156 can_events => 1, 3479 can_events => 1,
3157 markup => $widget, 3480 markup => $widget,
3158 tooltip => $tooltip; 3481 tooltip => $tooltip;
3159 } 3482 }
… …
3207 1 3530 1
3208} 3531}
3209 3532
3210############################################################################# 3533#############################################################################
3211 3534
3212package CFClient::UI::Multiplexer; 3535package CFPlus::UI::Multiplexer;
3213 3536
3214our @ISA = CFClient::UI::Container::; 3537our @ISA = CFPlus::UI::Container::;
3215 3538
3216sub new { 3539sub new {
3217 my $class = shift; 3540 my $class = shift;
3218 3541
3219 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
3280 $self->{current}->draw; 3603 $self->{current}->draw;
3281} 3604}
3282 3605
3283############################################################################# 3606#############################################################################
3284 3607
3285package CFClient::UI::Notebook; 3608package CFPlus::UI::Notebook;
3286 3609
3287our @ISA = CFClient::UI::VBox::; 3610our @ISA = CFPlus::UI::VBox::;
3288 3611
3289sub new { 3612sub new {
3290 my $class = shift; 3613 my $class = shift;
3291 3614
3292 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3293 buttonbar => (new CFClient::UI::Buttonbar), 3616 buttonbar => (new CFPlus::UI::Buttonbar),
3294 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3617 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295 # filter => # will be put between multiplexer and $self 3618 # filter => # will be put between multiplexer and $self
3296 @_, 3619 @_,
3297 ); 3620 );
3298 3621
3299 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3622 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3303} 3626}
3304 3627
3305sub add { 3628sub add {
3306 my ($self, $title, $widget, $tooltip) = @_; 3629 my ($self, $title, $widget, $tooltip) = @_;
3307 3630
3308 Scalar::Util::weaken $self; 3631 CFPlus::weaken $self;
3309 3632
3310 $self->{buttonbar}->add (new CFClient::UI::Button 3633 $self->{buttonbar}->add (new CFPlus::UI::Button
3311 markup => $title, 3634 markup => $title,
3312 tooltip => $tooltip, 3635 tooltip => $tooltip,
3313 on_activate => sub { $self->set_current_page ($widget) }, 3636 on_activate => sub { $self->set_current_page ($widget) },
3314 ); 3637 );
3315 3638
… …
3329 $self->emit (page_changed => $self->{multiplexer}{current}); 3652 $self->emit (page_changed => $self->{multiplexer}{current});
3330} 3653}
3331 3654
3332############################################################################# 3655#############################################################################
3333 3656
3334package CFClient::UI::Combobox; 3657package CFPlus::UI::Selector;
3335 3658
3336use utf8; 3659use utf8;
3337 3660
3338our @ISA = CFClient::UI::Button::; 3661our @ISA = CFPlus::UI::Button::;
3339 3662
3340sub new { 3663sub new {
3341 my $class = shift; 3664 my $class = shift;
3342 3665
3343 my $self = $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
… …
3360 my ($value, $title, $tooltip) = @$_; 3683 my ($value, $title, $tooltip) = @$_;
3361 3684
3362 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3685 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363 } 3686 }
3364 3687
3365 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3688 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366} 3689}
3367 3690
3368sub _set_value { 3691sub _set_value {
3369 my ($self, $value) = @_; 3692 my ($self, $value) = @_;
3370 3693
… …
3385 $self->emit (changed => $value); 3708 $self->emit (changed => $value);
3386} 3709}
3387 3710
3388############################################################################# 3711#############################################################################
3389 3712
3390package CFClient::UI::Statusbox; 3713package CFPlus::UI::Statusbox;
3391 3714
3392our @ISA = CFClient::UI::VBox::; 3715our @ISA = CFPlus::UI::VBox::;
3393 3716
3394sub new { 3717sub new {
3395 my $class = shift; 3718 my $class = shift;
3396 3719
3397 my $self = $class->SUPER::new ( 3720 my $self = $class->SUPER::new (
3398 fontsize => 0.8, 3721 fontsize => 0.8,
3399 @_, 3722 @_,
3400 ); 3723 );
3401 3724
3402 Scalar::Util::weaken (my $this = $self); 3725 CFPlus::weaken (my $this = $self);
3403 3726
3404 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3727 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405 3728
3406 $self 3729 $self
3407} 3730}
… …
3409sub reorder { 3732sub reorder {
3410 my ($self) = @_; 3733 my ($self) = @_;
3411 my $NOW = Time::HiRes::time; 3734 my $NOW = Time::HiRes::time;
3412 3735
3413 # freeze display when hovering over any label 3736 # freeze display when hovering over any label
3414 return if $CFClient::UI::TOOLTIP->{owner} 3737 return if $CFPlus::UI::TOOLTIP->{owner}
3415 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3738 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416 values %{ $self->{item} }; 3739 values %{ $self->{item} };
3417 3740
3418 while (my ($k, $v) = each %{ $self->{item} }) { 3741 while (my ($k, $v) = each %{ $self->{item} }) {
3419 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3742 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420 } 3743 }
… …
3441 for ($short) { 3764 for ($short) {
3442 s/^\s+//; 3765 s/^\s+//;
3443 s/\s+/ /g; 3766 s/\s+/ /g;
3444 } 3767 }
3445 3768
3446 new CFClient::UI::Label 3769 new CFPlus::UI::Label
3447 markup => $short, 3770 markup => $short,
3448 tooltip => $item->{tooltip}, 3771 tooltip => $item->{tooltip},
3449 tooltip_font => $::FONT_PROP, 3772 tooltip_font => $::FONT_PROP,
3450 tooltip_width => 0.67, 3773 tooltip_width => 0.67,
3451 fontsize => $item->{fontsize} || $self->{fontsize}, 3774 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3530 $self->SUPER::destroy; 3853 $self->SUPER::destroy;
3531} 3854}
3532 3855
3533############################################################################# 3856#############################################################################
3534 3857
3535package CFClient::UI::Inventory;
3536
3537our @ISA = CFClient::UI::Table::;
3538
3539sub new {
3540 my $class = shift;
3541
3542 my $self = $class->SUPER::new (
3543 col_expand => [0, 1, 0],
3544 @_,
3545 );
3546
3547 $self
3548}
3549
3550sub set_items {
3551 my ($self, $items) = @_;
3552
3553 $self->clear;
3554 return unless $items;
3555
3556 my @items = sort {
3557 ($a->{type} <=> $b->{type})
3558 or ($a->{name} cmp $b->{name})
3559 } values %$items;
3560
3561 $self->{real_items} = \@items;
3562
3563 my $row = 0;
3564 for my $item (@items) {
3565 CFClient::Item::update_widgets $item;
3566
3567 $self->add (0, $row, $item->{face_widget});
3568 $self->add (1, $row, $item->{desc_widget});
3569 $self->add (2, $row, $item->{weight_widget});
3570
3571 $row++;
3572 }
3573}
3574
3575#############################################################################
3576
3577package CFClient::UI::SpellList;
3578
3579our @ISA = CFClient::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 binding => [],
3586 commands => [],
3587 @_,
3588 )
3589}
3590
3591my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604sub rebuild_spell_list {
3605 my ($self) = @_;
3606
3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3608 $self->clear;
3609
3610 return unless $::CONN;
3611
3612 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618 my $row = 0;
3619
3620 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621 my $spell = $self->{spell}{$_};
3622
3623 $row++;
3624
3625 my $spell_cb = sub {
3626 my ($widget, $ev) = @_;
3627
3628 if ($ev->{button} == 1) {
3629 $::CONN->user_send ("cast $spell->{name}");
3630 } elsif ($ev->{button} == 2) {
3631 $::CONN->user_send ("invoke $spell->{name}");
3632 } elsif ($ev->{button} == 3) {
3633 (new CFClient::UI::Menu
3634 items => [
3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637 ],
3638 )->popup ($ev);
3639 } else {
3640 return 0;
3641 }
3642
3643 1
3644 };
3645
3646 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648 #TODO: add path info to tooltip
3649 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651 $self->add (0, $row, new CFClient::UI::Face
3652 face => $spell->{face},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (1, $row, new CFClient::UI::Label
3660 expand => 1,
3661 text => $spell->{name},
3662 can_hover => 1,
3663 can_events => 1,
3664 tooltip => $tooltip,
3665 on_button_down => $spell_cb,
3666 );
3667
3668 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672 }
3673 });
3674}
3675
3676sub add_spell {
3677 my ($self, $spell) = @_;
3678
3679 $self->{spell}->{$spell->{name}} = $spell;
3680 $self->rebuild_spell_list;
3681}
3682
3683sub remove_spell {
3684 my ($self, $spell) = @_;
3685
3686 delete $self->{spell}->{$spell->{name}};
3687 $self->rebuild_spell_list;
3688}
3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3694 $self->rebuild_spell_list;
3695}
3696
3697#############################################################################
3698
3699package CFClient::UI::Root; 3858package CFPlus::UI::Root;
3700 3859
3701our @ISA = CFClient::UI::Container::; 3860our @ISA = CFPlus::UI::Container::;
3702 3861
3703use List::Util qw(min max); 3862use List::Util qw(min max);
3704 3863
3705use CFClient::OpenGL; 3864use CFPlus::OpenGL;
3706 3865
3707sub new { 3866sub new {
3708 my $class = shift; 3867 my $class = shift;
3709 3868
3710 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3711 visible => 1, 3870 visible => 1,
3712 @_, 3871 @_,
3713 ); 3872 );
3714 3873
3715 Scalar::Util::weaken ($self->{root} = $self); 3874 CFPlus::weaken ($self->{root} = $self);
3716 3875
3717 $self 3876 $self
3718} 3877}
3719 3878
3720sub size_request { 3879sub size_request {
… …
3889 $h = 0 if $h < 0; 4048 $h = 0 if $h < 0;
3890 4049
3891 $w = max $widget->{min_w}, $w; 4050 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h; 4051 $h = max $widget->{min_h}, $h;
3893 4052
4053# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4054# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4055
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4056 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4057 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896 4058
3897 $w = int $w + 0.5; 4059 $w = int $w + 0.5;
3898 $h = int $h + 0.5; 4060 $h = int $h + 0.5;
… …
3924 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4086 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925 glMatrixMode GL_MODELVIEW; 4087 glMatrixMode GL_MODELVIEW;
3926 glLoadIdentity; 4088 glLoadIdentity;
3927 4089
3928 { 4090 {
3929 package CFClient::UI::Base; 4091 package CFPlus::UI::Base;
3930 4092
3931 ($draw_x, $draw_y, $draw_w, $draw_h) = 4093 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932 (0, 0, $self->{w}, $self->{h}); 4094 (0, 0, $self->{w}, $self->{h});
3933 }
3934 4095
3935 $self->_draw; 4096 $self->_draw;
4097 }
3936} 4098}
3937 4099
3938############################################################################# 4100#############################################################################
3939 4101
3940package CFClient::UI; 4102package CFPlus::UI;
3941 4103
3942$ROOT = new CFClient::UI::Root; 4104$ROOT = new CFPlus::UI::Root;
3943$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4105$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944 4106
39451 41071
3946 4108

Diff Legend

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