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.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 {
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 { 552sub find_widget {
516 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
517 554
… …
525} 562}
526 563
527sub set_parent { 564sub set_parent {
528 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
529 566
530 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
531 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
532} 569}
533 570
534sub realloc { 571sub realloc {
535 my ($self) = @_; 572 my ($self) = @_;
… …
601 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
602 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
603 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
604 glEnd; 641 glEnd;
605 glPopMatrix; 642 glPopMatrix;
606 #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;
607 } 644 }
608 645
609 $self->_draw; 646 $self->_draw;
610 glPopMatrix; 647 glPopMatrix;
611} 648}
… …
614 my ($self) = @_; 651 my ($self) = @_;
615 652
616 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
617} 654}
618 655
656my $cntx;#d#
619sub DESTROY { 657sub DESTROY {
620 my ($self) = @_; 658 my ($self) = @_;
621 659
622 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
623
624 delete $WIDGET{$self+0};
625 661
626 eval { $self->destroy }; 662 eval { $self->destroy };
627 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};
628} 666}
629 667
630############################################################################# 668#############################################################################
631 669
632package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
633 671
634our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
635 673
636use strict; 674use strict;
637use CFClient::OpenGL; 675use CFPlus::OpenGL;
638 676
639sub new { 677sub new {
640 my $class = shift; 678 my $class = shift;
641 679
642 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
673 } 711 }
674} 712}
675 713
676############################################################################# 714#############################################################################
677 715
678package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
679 717
680our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
681 719
682sub new { 720sub new {
683 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
684 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
685} 723}
… …
692 730
693sub draw { } 731sub draw { }
694 732
695############################################################################# 733#############################################################################
696 734
697package CFClient::UI::Container; 735package CFPlus::UI::Container;
698 736
699our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
700 738
701sub new { 739sub new {
702 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
703 741
704 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
713 if $children; 751 if $children;
714 752
715 $self 753 $self
716} 754}
717 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
718sub add { 764sub add {
719 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
720 766
721 $_->set_parent ($self) 767 $_->set_parent ($self)
722 for @widgets; 768 for @widgets;
… …
782 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
783} 829}
784 830
785############################################################################# 831#############################################################################
786 832
787package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
788 834
789our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
790 836
791sub new { 837sub new {
792 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
793 839
794 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795 841
796 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
797} 843}
798 844
799sub add { 845sub add {
… …
806sub remove { 852sub remove {
807 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
808 854
809 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
810 856
811 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
812 unless @{$self->{children}}; 858 unless @{$self->{children}};
813} 859}
814 860
815sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
816 862
… …
828 874
829############################################################################# 875#############################################################################
830 876
831# back-buffered drawing area 877# back-buffered drawing area
832 878
833package CFClient::UI::Window; 879package CFPlus::UI::Window;
834 880
835our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
836 882
837use CFClient::OpenGL; 883use CFPlus::OpenGL;
838 884
839sub new { 885sub new {
840 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
841 887
842 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
864} 910}
865 911
866sub render_child { 912sub render_child {
867 my ($self) = @_; 913 my ($self) = @_;
868 914
869 $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 {
870 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
871 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
872 918
873 { 919 {
874 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
875 921
876 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
878 } 926 }
879
880 $self->_render;
881 }; 927 };
882} 928}
883 929
884sub _draw { 930sub _draw {
885 my ($self) = @_; 931 my ($self) = @_;
886
887 my ($w, $h) = @$self{qw(w h)};
888 932
889 my $tex = $self->{texture} 933 my $tex = $self->{texture}
890 or return; 934 or return;
891 935
892 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
895 939
896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
897 941
898 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
899} 943}
900 944
901############################################################################# 945#############################################################################
902 946
903package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
904 948
905our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
906 950
907sub new { 951sub new {
908 my $class = shift; 952 my $class = shift;
909 953
910 $class->SUPER::new ( 954 $class->SUPER::new (
… …
970 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
972 ) { 1016 ) {
973 $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})
974 } else { 1018 } else {
975 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
976 } 1020 }
977} 1021}
978 1022
979sub _render { 1023sub _render {
980 my ($self) = @_; 1024 my ($self) = @_;
981 1025
982 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};
983 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};
984 1028
985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986 1030
987 $self->SUPER::_render; 1031 $self->SUPER::_render;
988} 1032}
989 1033
990############################################################################# 1034#############################################################################
991 1035
992package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
993 1037
994our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
995 1039
996sub new { 1040sub new {
997 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
998 1042
999 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1000 1044
1001 my $self; 1045 my $self;
1002 1046
1003 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
1004 vertical => 1, 1057 vertical => 1,
1005 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1006 on_changed => sub { 1059 on_changed => sub {
1007 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008 }, 1062 },
1009 ; 1063 ;
1010 1064
1011 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1012 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1013 can_events => 1, 1068 can_events => 1,
1014 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1015 %arg, 1073 %arg,
1016 ); 1074 );
1017 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});
1018 $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
1019 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
1020 1087
1021 $self 1088 $self
1022} 1089}
1023 1090
… …
1032sub invoke_mouse_wheel { 1099sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_; 1100 my ($self, $ev) = @_;
1034 1101
1035 return 0 unless $ev->{dy}; # only vertical movements 1102 return 0 unless $ev->{dy}; # only vertical movements
1036 1103
1037 $self->{slider}->emit (mouse_wheel => $ev); 1104 $self->{vslider}->emit (mouse_wheel => $ev);
1038 1105
1039 1 1106 1
1040} 1107}
1041 1108
1042sub update_slider { 1109sub update_slider {
1043 my ($self) = @_; 1110 my ($self) = @_;
1044 1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1045 $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);
1046} 1121}
1047 1122
1048sub update { 1123sub update {
1049 my ($self) = @_; 1124 my ($self) = @_;
1050 1125
1051 $self->SUPER::update; 1126 $self->SUPER::update;
1052
1053 $self->update_slider; 1127 $self->update_slider;
1054} 1128}
1055 1129
1056sub invoke_size_allocate { 1130sub invoke_size_allocate {
1057 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1058 1132
1059 $self->update_slider; 1133 $self->update_slider;
1060
1061 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1062} 1135}
1063 1136
1064############################################################################# 1137#############################################################################
1065 1138
1066package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1067 1140
1068our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1069 1142
1070use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1071 1144
1072sub new { 1145sub new {
1073 my $class = shift; 1146 my $class = shift;
1074 1147
1075 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1101 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1102} 1175}
1103 1176
1104############################################################################# 1177#############################################################################
1105 1178
1106package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1107 1180
1108our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1109 1182
1110use 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;
1111 1284
1112my $bg = 1285my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1115 1288
1116my @border = 1289my @border =
1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 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); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119 1292
1120sub new { 1293sub new {
1121 my ($class, %arg) = @_; 1294 my ($class, %arg) = @_;
1122 1295
… …
1128 min_w => 64, 1301 min_w => 64,
1129 min_h => 32, 1302 min_h => 32,
1130 %arg, 1303 %arg,
1131 ); 1304 );
1132 1305
1133 $self->{title_widget} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1134 align => 0, 1307 align => 0,
1135 valign => 1, 1308 valign => 1,
1136 text => $self->{title}, 1309 text => $self->{title},
1137 fontsize => $self->{border}, 1310 fontsize => $self->{border},
1138 if exists $self->{title}; 1311 if exists $self->{title};
1139 1312
1140 if ($self->{has_close_button}) { 1313 if ($self->{has_close_button}) {
1141 $self->{close_button} = 1314 $self->{close_button} =
1142 new CFClient::UI::ImageButton 1315 new CFPlus::UI::ImageButton
1143 path => 'x1_close.png', 1316 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") }; 1317 on_activate => sub { $self->emit ("delete") };
1145 1318
1146 $self->CFClient::UI::Container::add ($self->{close_button}); 1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1147 } 1320 }
1148 1321
1149 $self 1322 $self
1150} 1323}
1151 1324
1152sub add { 1325sub add {
1153 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1154 1327
1155 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1156 $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};
1157 $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};
1158} 1331}
1159 1332
1160sub border { 1333sub border {
1161 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1162} 1335}
… …
1270 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271 1444
1272 ! ! $self->{motion} 1445 ! ! $self->{motion}
1273} 1446}
1274 1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1454}
1455
1275sub _draw { 1456sub _draw {
1276 my ($self) = @_; 1457 my ($self) = @_;
1277 1458
1278 my $child = $self->{children}[0]; 1459 my $child = $self->{children}[0];
1279 1460
… …
1316 if $self->{close_button}; 1497 if $self->{close_button};
1317} 1498}
1318 1499
1319############################################################################# 1500#############################################################################
1320 1501
1321package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1322 1503
1323our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1324 1505
1325use List::Util qw(max sum); 1506use List::Util qw(max sum);
1326 1507
1327use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1328 1509
1329sub new { 1510sub new {
1330 my $class = shift; 1511 my $class = shift;
1331 1512
1332 $class->SUPER::new ( 1513 $class->SUPER::new (
1333 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1334 @_, 1516 @_,
1335 ) 1517 )
1336} 1518}
1337 1519
1338sub children { 1520sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340} 1522}
1341 1523
1342sub add { 1524sub add {
1343 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1344 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1345 $child->set_parent ($self); 1529 $child->set_parent ($self);
1346 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1347 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1348 $self->realloc; 1535 $self->realloc;
1349} 1536}
1350 1537
1351sub remove { 1538sub remove {
1352 my ($self, $child) = @_; 1539 my ($self, $child) = @_;
… …
1408 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1409 1596
1410 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1411 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1412 1599
1413 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1414 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1415 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1416 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1417 1604
1418 # linearly scale sizes
1419 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421 1606
1422 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
1423 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1424 1616
1425 my $y; 1617 my $y;
1426 1618
1427 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1428 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1471 } 1663 }
1472} 1664}
1473 1665
1474############################################################################# 1666#############################################################################
1475 1667
1476package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1477 1669
1478our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1479 1671
1480sub size_request { 1672sub size_request {
1481 my ($self) = @_; 1673 my ($self) = @_;
1482 1674
1483 $self->{vertical} 1675 $self->{vertical}
… …
1516 $req[$_] += $space * $children[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1517 for 0 .. $#children; 1709 for 0 .. $#children;
1518 } 1710 }
1519 } 1711 }
1520 1712
1521 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1522 1714
1523 my $pos = 0; 1715 my $pos = 0;
1524 for (0 .. $#children) { 1716 for (0 .. $#children) {
1525 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1526 $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));
… …
1531 1 1723 1
1532} 1724}
1533 1725
1534############################################################################# 1726#############################################################################
1535 1727
1536package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1537 1729
1538our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1539 1731
1540sub new { 1732sub new {
1541 my $class = shift; 1733 my $class = shift;
1542 1734
1543 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1546 ) 1738 )
1547} 1739}
1548 1740
1549############################################################################# 1741#############################################################################
1550 1742
1551package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1552 1744
1553our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1554 1746
1555sub new { 1747sub new {
1556 my $class = shift; 1748 my $class = shift;
1557 1749
1558 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1561 ) 1753 )
1562} 1754}
1563 1755
1564############################################################################# 1756#############################################################################
1565 1757
1566package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1567 1759
1568our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1569 1761
1570use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1571 1763
1572sub new { 1764sub new {
1573 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1574 1766
1575 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1578 #active_bg => none 1770 #active_bg => none
1579 #font => default_font 1771 #font => default_font
1580 #text => initial text 1772 #text => initial text
1581 #markup => initial narkup 1773 #markup => initial narkup
1582 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1583 ellipsise => 3, # end 1776 ellipsise => 3, # end
1584 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1585 fontsize => 1, 1778 fontsize => 1,
1586 align => -1, 1779 align => -1,
1587 valign => -1, 1780 valign => -1,
1588 padding_x => 2, 1781 padding_x => 2,
1589 padding_y => 2, 1782 padding_y => 2,
1590 can_events => 0, 1783 can_events => 0,
1591 %arg 1784 %arg
1592 ); 1785 );
1593 1786
1594 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1595 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1596 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1597 $self->{template} = $layout; 1790 $self->{template} = $layout;
1598 } 1791 }
1599 1792
1600 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1602 } else { 1795 } else {
1603 $self->set_text (delete $self->{text}); 1796 $self->set_text (delete $self->{text});
1604 } 1797 }
1605 1798
1606 $self 1799 $self
1607}
1608
1609sub escape($) {
1610 local $_ = $_[0];
1611
1612 s/&/&amp;/g;
1613 s/>/&gt;/g;
1614 s/</&lt;/g;
1615
1616 $_
1617} 1800}
1618 1801
1619sub update { 1802sub update {
1620 my ($self) = @_; 1803 my ($self) = @_;
1621 1804
… …
1748 }; 1931 };
1749 1932
1750 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1751 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1752 1935
1753 $self->{layout}->render ($self->{ox}, $self->{oy}); 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754} 1937}
1755 1938
1756############################################################################# 1939#############################################################################
1757 1940
1758package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1759 1942
1760our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1761 1944
1762use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1763 1946
1764sub new { 1947sub new {
1765 my $class = shift; 1948 my $class = shift;
1766 1949
1767 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1771 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1772 can_hover => 1, 1955 can_hover => 1,
1773 can_focus => 1, 1956 can_focus => 1,
1774 valign => 0, 1957 valign => 0,
1775 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1776 #text => ... 1960 #text => ...
1777 #hidden => "*", 1961 #hidden => "*",
1778 @_ 1962 @_
1779 ) 1963 )
1780} 1964}
… …
1825 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1826 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1827 2011
1828 my $text = $self->get_text; 2012 my $text = $self->get_text;
1829 2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2015
1830 if ($uni == 8) { 2016 if ($uni == 8) {
1831 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1833 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1834 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1835 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1836 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1837 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1838 } 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 = "";
1839 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1840 } elsif ($sym == CFClient::SDLK_END) {
1841 $self->{cursor} = length $text;
1842 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1843 $self->emit ('escape'); 2040 $self->emit ('escape');
1844 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1845 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else { 2045 } else {
1847 return 0; 2046 return 0;
1848 } 2047 }
1849 2048
1850 $self->_set_text ($text); 2049 $self->_set_text ($text);
1851 2050
1852 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1853 2053
1854 1 2054 1
1855} 2055}
1856 2056
1857sub invoke_focus_in { 2057sub invoke_focus_in {
… …
1919 utf8::encode $text; 2119 utf8::encode $text;
1920 2120
1921 @$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)
1922 } 2122 }
1923 2123
1924 glColor @{$self->{fg}};
1925 glBegin GL_LINES; 2124 glBegin GL_LINES;
1926 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};
1927 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};
1928 glEnd; 2127 glEnd;
1929 } 2128 }
1930} 2129}
1931 2130
2131#############################################################################
2132
1932package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1933 2134
1934our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1935 2136
1936use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1937 2138
1938sub invoke_key_down { 2139sub invoke_key_down {
1939 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1940 2141
1941 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1942 2143
1943 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1944 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1945 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
1946 2147
1947 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1948 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1949 $self->emit (activate => $txt); 2150 $self->emit (activate => $txt);
1950 $self->update; 2151 $self->update;
1951 2152
1952 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1953 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1954 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1955 } 2156 }
1956 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1957 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1959 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1960 } 2161 }
1961 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1962 } 2163 }
1963 2164
1964 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1965 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1966 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967 2168
1968 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1969 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1978 1 2179 1
1979} 2180}
1980 2181
1981############################################################################# 2182#############################################################################
1982 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
1983package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1984 2224
1985our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1986 2226
1987use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1988 2228
1989my @tex = 2229my @tex =
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1992 2232
1993sub new { 2233sub new {
1994 my $class = shift; 2234 my $class = shift;
1995 2235
… …
2032 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
2033} 2273}
2034 2274
2035############################################################################# 2275#############################################################################
2036 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
2037package CFClient::UI::ImageButton; 2426package CFPlus::UI::ImageButton;
2038 2427
2039our @ISA = CFClient::UI::Image::; 2428our @ISA = CFPlus::UI::Image::;
2040 2429
2041use CFClient::OpenGL; 2430use CFPlus::OpenGL;
2042 2431
2043my %textures; 2432my %textures;
2044 2433
2045sub new { 2434sub new {
2046 my $class = shift; 2435 my $class = shift;
… …
2068 1 2457 1
2069} 2458}
2070 2459
2071############################################################################# 2460#############################################################################
2072 2461
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; 2462package CFPlus::UI::VGauge;
2149 2463
2150our @ISA = CFClient::UI::Base::; 2464our @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 2465
2211use List::Util qw(min max); 2466use List::Util qw(min max);
2212 2467
2213use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2214 2469
2215my %tex = ( 2470my %tex = (
2216 food => [ 2471 food => [
2217 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219 ], 2474 ],
2220 grace => [ 2475 grace => [
2221 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 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/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223 ], 2478 ],
2224 hp => [ 2479 hp => [
2225 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227 ], 2482 ],
2228 mana => [ 2483 mana => [
2229 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 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/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231 ], 2486 ],
2232); 2487);
2233 2488
2234# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2337 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2338} 2593}
2339 2594
2340############################################################################# 2595#############################################################################
2341 2596
2342package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2343 2598
2344our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2345 2600
2346sub new { 2601sub new {
2347 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2348 2603
2349 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2351 can_hover => 1, 2606 can_hover => 1,
2352 can_events => 1, 2607 can_events => 1,
2353 %arg, 2608 %arg,
2354 ); 2609 );
2355 2610
2356 $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");
2357 $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);
2358 $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");
2359 2614
2360 $self 2615 $self
2361} 2616}
2362 2617
2363sub set_fontsize { 2618sub set_fontsize {
… …
2384 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2385} 2640}
2386 2641
2387############################################################################# 2642#############################################################################
2388 2643
2389package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2390 2645
2391use strict; 2646use strict;
2392 2647
2393use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2394 2649
2395our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2396 2651
2397my @tex = 2652my @tex =
2398 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2400 2655
2401sub new { 2656sub new {
2402 my $class = shift; 2657 my $class = shift;
2403 2658
… …
2497sub invoke_mouse_wheel { 2752sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_; 2753 my ($self, $ev) = @_;
2499 2754
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501 2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503 2760
2504 ! ! $delta 2761 ! ! $delta
2505} 2762}
2506 2763
2507sub update { 2764sub update {
… …
2558 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2559} 2816}
2560 2817
2561############################################################################# 2818#############################################################################
2562 2819
2563package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2564 2821
2565our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2566 2823
2567sub new { 2824sub new {
2568 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2569 2826
2570 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2571 2828
2572 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2573 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575 to_value => sub { shift }, 2832 to_value => sub { shift },
2576 from_value => sub { shift }, 2833 from_value => sub { shift },
2577 %arg, 2834 %arg,
2578 ); 2835 );
2579 2836
… …
2599sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2600sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2601 2858
2602############################################################################# 2859#############################################################################
2603 2860
2604package CFClient::UI::TextScroller; 2861package CFPlus::UI::TextScroller;
2605 2862
2606our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2607 2864
2608use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2609 2866
2610sub new { 2867sub new {
2611 my $class = shift; 2868 my $class = shift;
2612 2869
2613 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
… …
2615 can_events => 1, 2872 can_events => 1,
2616 indent => 0, 2873 indent => 0,
2617 #font => default_font 2874 #font => default_font
2618 @_, 2875 @_,
2619 2876
2620 layout => (new CFClient::Layout), 2877 layout => (new CFPlus::Layout),
2621 par => [], 2878 par => [],
2879 max_par => 0,
2622 height => 0, 2880 height => 0,
2623 children => [ 2881 children => [
2624 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2625 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2626 ], 2884 ],
2627 ); 2885 );
2628 2886
2629 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2630 2888
… …
2707 2965
2708 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2709 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2710} 2968}
2711 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
2712sub clear { 2985sub clear {
2713 my ($self) = @_; 2986 my ($self) = @_;
2714 2987
2715 my (undef, undef, @other) = @{ $self->{children} }; 2988 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other; 2989 $self->remove ($_) for @other;
… …
2719 $self->{height} = 0; 2992 $self->{height} = 0;
2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721} 2994}
2722 2995
2723sub add_paragraph { 2996sub add_paragraph {
2724 my ($self, $color, $para, $indent) = @_; 2997 my $self = shift;
2725 2998
2726 my ($text, @w) = ref $para ? @$para : $para; 2999 for my $para (@_) {
2727
2728 $para = { 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
2729 w => 1e10, 3006 w => 1e10,
2730 wrapped => 1, 3007 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2735 }; 3008 };
2736 3009
2737 $self->add (@w) if @w; 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738 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 }
2739 3017
2740 $self->{need_reflow}++; 3018 $self->{need_reflow}++;
2741 $self->update; 3019 $self->update;
2742} 3020}
2743 3021
2744sub scroll_to_bottom { 3022sub scroll_to_bottom {
2745 my ($self) = @_; 3023 my ($self) = @_;
2746 3024
2747 $self->{scroll_to_bottom} = 1; 3025 $self->{scroll_to} = $#{$self->{par}};
2748 $self->update; 3026 $self->update;
2749} 3027}
2750 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
2751sub update { 3062sub update {
2752 my ($self) = @_; 3063 my ($self) = @_;
2753 3064
2754 $self->SUPER::update; 3065 $self->SUPER::update;
2755 3066
2756 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2757 3068
2758 delete $self->{texture}; 3069 delete $self->{texture};
2759 3070
2760 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762 3075
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 { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2792 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2793 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;
2794 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2795 3089
2796 my $y0 = $top; 3090 my $y0 = $top;
2797 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2798 3092
2799 my $y = 0;
2800
2801 for my $para (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2802 my $h = $para->{h}; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2803 3096
2804 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2805
2806 my $layout = $self->get_layout ($para); 3098 my $layout = $self->get_layout ($para);
2807 3099
2808 $layout->render ($para->{indent}, $y - $y0); 3100 $layout->render ($para->{indent}, $y - $y0);
2809 3101
2810 if (my @w = @{ $para->{widget} }) { 3102 if (my @w = @{ $para->{widget} }) {
… …
2819 $_->draw; 3111 $_->draw;
2820 } 3112 }
2821 } 3113 }
2822 } 3114 }
2823 3115
2824 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2825 } 3118 }
3119
3120 $self->{top_paragraph} = $top_paragraph;
2826 }; 3121 };
2827 }); 3122 });
2828} 3123}
2829 3124
2830sub reconfigure { 3125sub reconfigure {
… …
2848 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2849} 3144}
2850 3145
2851############################################################################# 3146#############################################################################
2852 3147
2853package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2854 3149
2855use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2856 3151
2857our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2858 3153
2859sub moveto { 3154sub moveto {
2860 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2861 3156
2862 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2890 glPopMatrix; 3185 glPopMatrix;
2891} 3186}
2892 3187
2893############################################################################# 3188#############################################################################
2894 3189
2895package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2896 3191
2897our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2898 3193
2899sub new { 3194sub new {
2900 my $class = shift; 3195 my $class = shift;
2901 3196
2902 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2914 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2915} 3210}
2916 3211
2917############################################################################# 3212#############################################################################
2918 3213
2919package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2920 3215
2921our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2922 3217
2923use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2924 3219
2925sub new { 3220sub new {
2926 my $class = shift; 3221 my $class = shift;
2927 3222
2928 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2931 ) 3226 )
2932} 3227}
2933 3228
2934sub set_tooltip_from { 3229sub set_tooltip_from {
2935 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2936 3234
2937 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2938 3236
2939 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2944 } 3242 }
2945 3243
2946 $tooltip =~ s/^\n+//; 3244 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//; 3245 $tooltip =~ s/\n+$//;
2948 3246
2949 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2950 markup => $tooltip, 3248 markup => $tooltip,
2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952 fontsize => 0.8, 3250 fontsize => 0.8,
2953 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2954 ellipsise => 0, 3252 ellipsise => 0,
2955 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2956 ); 3254 );
2957} 3255}
2958 3256
… …
2977 3275
2978 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2979 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2980 or return; 3278 or return;
2981 3279
3280 if ($widget->{visible}) {
2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983 3282
2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985 if $x + $self->{w} > $self->{root}{w}; 3284 if $x + $self->{w} > $self->{root}{w};
2986 3285
2987 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2988 }); 3290 });
2989} 3291}
2990 3292
2991sub _draw { 3293sub _draw {
2992 my ($self) = @_; 3294 my ($self) = @_;
… …
3016 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
3017} 3319}
3018 3320
3019############################################################################# 3321#############################################################################
3020 3322
3021package CFClient::UI::Face; 3323package CFPlus::UI::Face;
3022 3324
3023our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
3024 3326
3025use CFClient::OpenGL; 3327use CFPlus::OpenGL;
3026 3328
3027sub new { 3329sub new {
3028 my $class = shift; 3330 my $class = shift;
3029 3331
3030 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
3333 size_w => 32,
3334 size_h => 8,
3031 aspect => 1, 3335 aspect => 1,
3032 can_events => 0, 3336 can_events => 0,
3033 @_, 3337 @_,
3034 ); 3338 );
3035 3339
3036 if ($self->{anim} && $self->{animspeed}) { 3340 if ($self->{anim} && $self->{animspeed}) {
3037 Scalar::Util::weaken (my $widget = $self); 3341 CFPlus::weaken (my $widget = $self);
3038 3342
3039 $self->{timer} = Event->timer ( 3343 $self->{timer} = Event->timer (
3040 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041 hard => 1, 3345 hard => 1,
3042 interval => $self->{animspeed}, 3346 interval => $self->{animspeed},
3043 cb => sub { 3347 cb => sub {
3348 return unless $::CONN;
3349
3044 ++$widget->{frame}; 3350 ++$widget->{frame};
3351 $self->update_face;
3045 $widget->update; 3352 $self->update;
3046 }, 3353 },
3047 ); 3354 );
3355
3356 $self->update_face;
3048 } 3357 }
3049 3358
3050 $self 3359 $self
3051} 3360}
3052 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
3053sub size_request { 3375sub size_request {
3054 (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)
3055} 3391}
3056 3392
3057sub update { 3393sub update {
3058 my ($self) = @_; 3394 my ($self) = @_;
3059 3395
… …
3065sub _draw { 3401sub _draw {
3066 my ($self) = @_; 3402 my ($self) = @_;
3067 3403
3068 return unless $::CONN; 3404 return unless $::CONN;
3069 3405
3070 my $face; 3406 $self->SUPER::_draw;
3071 3407
3072 if ($self->{frame}) {
3073 my $anim = $::CONN->{anim}[$self->{anim}]; 3408 my $faceid = $::CONN->{faceid}[$self->{face}]
3074 3409 or return;
3075 $face = $anim->[ $self->{frame} % @$anim ]
3076 if $anim && @$anim;
3077 }
3078 3410
3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3411 my $tex = $::CONN->{texture}[$faceid];
3080 3412
3081 if ($tex) { 3413 if ($tex) {
3082 glEnable GL_TEXTURE_2D; 3414 glEnable GL_TEXTURE_2D;
3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084 glColor 0, 0, 0, 1; 3416 glColor 0, 0, 0, 1;
… …
3096 $self->SUPER::destroy; 3428 $self->SUPER::destroy;
3097} 3429}
3098 3430
3099############################################################################# 3431#############################################################################
3100 3432
3101package CFClient::UI::Buttonbar; 3433package CFPlus::UI::Buttonbar;
3102 3434
3103our @ISA = CFClient::UI::HBox::; 3435our @ISA = CFPlus::UI::HBox::;
3104 3436
3105# TODO: should actualyl wrap buttons and other goodies. 3437# TODO: should actually wrap buttons and other goodies.
3106 3438
3107############################################################################# 3439#############################################################################
3108 3440
3109package CFClient::UI::Menu; 3441package CFPlus::UI::Menu;
3110 3442
3111our @ISA = CFClient::UI::FancyFrame::; 3443our @ISA = CFPlus::UI::Toplevel::;
3112 3444
3113use CFClient::OpenGL; 3445use CFPlus::OpenGL;
3114 3446
3115sub new { 3447sub new {
3116 my $class = shift; 3448 my $class = shift;
3117 3449
3118 my $self = $class->SUPER::new ( 3450 my $self = $class->SUPER::new (
3119 items => [], 3451 items => [],
3120 z => 100, 3452 z => 100,
3121 @_, 3453 @_,
3122 ); 3454 );
3123 3455
3124 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3456 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125 3457
3126 for my $item (@{ $self->{items} }) { 3458 for my $item (@{ $self->{items} }) {
3127 my ($widget, $cb, $tooltip) = @$item; 3459 my ($widget, $cb, $tooltip) = @$item;
3128 3460
3129 # handle various types of items, only text for now 3461 # handle various types of items, only text for now
3130 if (!ref $widget) { 3462 if (!ref $widget) {
3131 if ($widget =~ /\t/) { 3463 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2; 3464 my ($left, $right) = split /\t/, $widget, 2;
3133 3465
3134 $widget = new CFClient::UI::HBox 3466 $widget = new CFPlus::UI::HBox
3135 can_hover => 1, 3467 can_hover => 1,
3136 can_events => 1, 3468 can_events => 1,
3137 tooltip => $tooltip, 3469 tooltip => $tooltip,
3138 children => [ 3470 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1), 3471 (new CFPlus::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1), 3472 (new CFPlus::UI::Label markup => $right, align => +1),
3141 ], 3473 ],
3142 ; 3474 ;
3143 3475
3144 } else { 3476 } else {
3145 $widget = new CFClient::UI::Label 3477 $widget = new CFPlus::UI::Label
3146 can_hover => 1, 3478 can_hover => 1,
3147 can_events => 1, 3479 can_events => 1,
3148 markup => $widget, 3480 markup => $widget,
3149 tooltip => $tooltip; 3481 tooltip => $tooltip;
3150 } 3482 }
… …
3198 1 3530 1
3199} 3531}
3200 3532
3201############################################################################# 3533#############################################################################
3202 3534
3203package CFClient::UI::Multiplexer; 3535package CFPlus::UI::Multiplexer;
3204 3536
3205our @ISA = CFClient::UI::Container::; 3537our @ISA = CFPlus::UI::Container::;
3206 3538
3207sub new { 3539sub new {
3208 my $class = shift; 3540 my $class = shift;
3209 3541
3210 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
3271 $self->{current}->draw; 3603 $self->{current}->draw;
3272} 3604}
3273 3605
3274############################################################################# 3606#############################################################################
3275 3607
3276package CFClient::UI::Notebook; 3608package CFPlus::UI::Notebook;
3277 3609
3278our @ISA = CFClient::UI::VBox::; 3610our @ISA = CFPlus::UI::VBox::;
3279 3611
3280sub new { 3612sub new {
3281 my $class = shift; 3613 my $class = shift;
3282 3614
3283 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar), 3616 buttonbar => (new CFPlus::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3617 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self 3618 # filter => # will be put between multiplexer and $self
3287 @_, 3619 @_,
3288 ); 3620 );
3289 3621
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3622 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3294} 3626}
3295 3627
3296sub add { 3628sub add {
3297 my ($self, $title, $widget, $tooltip) = @_; 3629 my ($self, $title, $widget, $tooltip) = @_;
3298 3630
3299 Scalar::Util::weaken $self; 3631 CFPlus::weaken $self;
3300 3632
3301 $self->{buttonbar}->add (new CFClient::UI::Button 3633 $self->{buttonbar}->add (new CFPlus::UI::Button
3302 markup => $title, 3634 markup => $title,
3303 tooltip => $tooltip, 3635 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) }, 3636 on_activate => sub { $self->set_current_page ($widget) },
3305 ); 3637 );
3306 3638
… …
3320 $self->emit (page_changed => $self->{multiplexer}{current}); 3652 $self->emit (page_changed => $self->{multiplexer}{current});
3321} 3653}
3322 3654
3323############################################################################# 3655#############################################################################
3324 3656
3325package CFClient::UI::Combobox; 3657package CFPlus::UI::Selector;
3326 3658
3327use utf8; 3659use utf8;
3328 3660
3329our @ISA = CFClient::UI::Button::; 3661our @ISA = CFPlus::UI::Button::;
3330 3662
3331sub new { 3663sub new {
3332 my $class = shift; 3664 my $class = shift;
3333 3665
3334 my $self = $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
… …
3351 my ($value, $title, $tooltip) = @$_; 3683 my ($value, $title, $tooltip) = @$_;
3352 3684
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3685 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 } 3686 }
3355 3687
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3688 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357} 3689}
3358 3690
3359sub _set_value { 3691sub _set_value {
3360 my ($self, $value) = @_; 3692 my ($self, $value) = @_;
3361 3693
… …
3376 $self->emit (changed => $value); 3708 $self->emit (changed => $value);
3377} 3709}
3378 3710
3379############################################################################# 3711#############################################################################
3380 3712
3381package CFClient::UI::Statusbox; 3713package CFPlus::UI::Statusbox;
3382 3714
3383our @ISA = CFClient::UI::VBox::; 3715our @ISA = CFPlus::UI::VBox::;
3384 3716
3385sub new { 3717sub new {
3386 my $class = shift; 3718 my $class = shift;
3387 3719
3388 my $self = $class->SUPER::new ( 3720 my $self = $class->SUPER::new (
3389 fontsize => 0.8, 3721 fontsize => 0.8,
3390 @_, 3722 @_,
3391 ); 3723 );
3392 3724
3393 Scalar::Util::weaken (my $this = $self); 3725 CFPlus::weaken (my $this = $self);
3394 3726
3395 $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 });
3396 3728
3397 $self 3729 $self
3398} 3730}
… …
3400sub reorder { 3732sub reorder {
3401 my ($self) = @_; 3733 my ($self) = @_;
3402 my $NOW = Time::HiRes::time; 3734 my $NOW = Time::HiRes::time;
3403 3735
3404 # freeze display when hovering over any label 3736 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner} 3737 return if $CFPlus::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3738 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} }; 3739 values %{ $self->{item} };
3408 3740
3409 while (my ($k, $v) = each %{ $self->{item} }) { 3741 while (my ($k, $v) = each %{ $self->{item} }) {
3410 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3742 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411 } 3743 }
… …
3432 for ($short) { 3764 for ($short) {
3433 s/^\s+//; 3765 s/^\s+//;
3434 s/\s+/ /g; 3766 s/\s+/ /g;
3435 } 3767 }
3436 3768
3437 new CFClient::UI::Label 3769 new CFPlus::UI::Label
3438 markup => $short, 3770 markup => $short,
3439 tooltip => $item->{tooltip}, 3771 tooltip => $item->{tooltip},
3440 tooltip_font => $::FONT_PROP, 3772 tooltip_font => $::FONT_PROP,
3441 tooltip_width => 0.67, 3773 tooltip_width => 0.67,
3442 fontsize => $item->{fontsize} || $self->{fontsize}, 3774 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3521 $self->SUPER::destroy; 3853 $self->SUPER::destroy;
3522} 3854}
3523 3855
3524############################################################################# 3856#############################################################################
3525 3857
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; 3858package CFPlus::UI::Root;
3691 3859
3692our @ISA = CFClient::UI::Container::; 3860our @ISA = CFPlus::UI::Container::;
3693 3861
3694use List::Util qw(min max); 3862use List::Util qw(min max);
3695 3863
3696use CFClient::OpenGL; 3864use CFPlus::OpenGL;
3697 3865
3698sub new { 3866sub new {
3699 my $class = shift; 3867 my $class = shift;
3700 3868
3701 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3702 visible => 1, 3870 visible => 1,
3703 @_, 3871 @_,
3704 ); 3872 );
3705 3873
3706 Scalar::Util::weaken ($self->{root} = $self); 3874 CFPlus::weaken ($self->{root} = $self);
3707 3875
3708 $self 3876 $self
3709} 3877}
3710 3878
3711sub size_request { 3879sub size_request {
… …
3880 $h = 0 if $h < 0; 4048 $h = 0 if $h < 0;
3881 4049
3882 $w = max $widget->{min_w}, $w; 4050 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h; 4051 $h = max $widget->{min_h}, $h;
3884 4052
4053# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4054# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4055
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4056 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4057 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887 4058
3888 $w = int $w + 0.5; 4059 $w = int $w + 0.5;
3889 $h = int $h + 0.5; 4060 $h = int $h + 0.5;
… …
3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4086 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916 glMatrixMode GL_MODELVIEW; 4087 glMatrixMode GL_MODELVIEW;
3917 glLoadIdentity; 4088 glLoadIdentity;
3918 4089
3919 { 4090 {
3920 package CFClient::UI::Base; 4091 package CFPlus::UI::Base;
3921 4092
3922 ($draw_x, $draw_y, $draw_w, $draw_h) = 4093 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h}); 4094 (0, 0, $self->{w}, $self->{h});
3924 }
3925 4095
3926 $self->_draw; 4096 $self->_draw;
4097 }
3927} 4098}
3928 4099
3929############################################################################# 4100#############################################################################
3930 4101
3931package CFClient::UI; 4102package CFPlus::UI;
3932 4103
3933$ROOT = new CFClient::UI::Root; 4104$ROOT = new CFPlus::UI::Root;
3934$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4105$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935 4106
39361 41071
3937 4108

Diff Legend

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