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.381 by root, Thu Jul 19 13:45:18 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
949use List::Util qw(min max);
950
914our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
915 952
916sub new { 953sub new {
917 my $class = shift; 954 my $class = shift;
918 955
919 $class->SUPER::new ( 956 $class->SUPER::new (
… …
949} 986}
950 987
951sub set_offset { 988sub set_offset {
952 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
953 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
954 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
955 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
956 997
998 $self->emit (changed => $x, $y);
957 $self->update; 999 $self->update;
1000 }
958} 1001}
959 1002
960# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
961sub coord2local { 1004sub coord2local {
962 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
979 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
981 ) { 1024 ) {
982 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
983 } else { 1026 } else {
984 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
985 } 1028 }
986} 1029}
987 1030
988sub _render { 1031sub _render {
989 my ($self) = @_; 1032 my ($self) = @_;
990 1033
991 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1034 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}; 1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
993 1036
994 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995 1038
996 $self->SUPER::_render; 1039 $self->SUPER::_render;
997} 1040}
998 1041
999############################################################################# 1042#############################################################################
1000 1043
1001package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1002 1045
1003our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1004 1047
1005sub new { 1048sub new {
1006 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1007 1050
1008 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1009 1052
1010 my $self; 1053 my $self;
1011 1054
1012 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1013 vertical => 1, 1065 vertical => 1,
1014 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1015 on_changed => sub { 1067 on_changed => sub {
1016 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017 }, 1070 },
1018 ; 1071 ;
1019 1072
1020 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1021 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1022 can_events => 1, 1076 can_events => 1,
1023 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1024 %arg, 1081 %arg,
1025 ); 1082 );
1026 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1027 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1028 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1029 1101
1030 $self 1102 $self
1031} 1103}
1032 1104
… …
1036 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1037 1109
1038 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1039} 1111}
1040 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1041sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1043 1146
1044 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1045 1148
1046 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1047 1150
1048 1 1151 1
1049} 1152}
1050 1153
1051sub update_slider { 1154sub invoke_button_down {
1052 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1053 1156
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1055} 1158 $self->grab_focus;
1056 1159
1057sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1058 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1059 1165
1060 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1061 1169
1062 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1063} 1195}
1064 1196
1065sub invoke_size_allocate { 1197sub invoke_size_allocate {
1066 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1067 1199
1068 $self->update_slider; 1200 $self->update_slider;
1069
1070 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1071} 1202}
1072 1203
1073############################################################################# 1204#############################################################################
1074 1205
1075package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1076 1207
1077our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1078 1209
1079use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1080 1211
1081sub new { 1212sub new {
1082 my $class = shift; 1213 my $class = shift;
1083 1214
1084 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1110 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1111} 1242}
1112 1243
1113############################################################################# 1244#############################################################################
1114 1245
1115package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1116 1247
1117our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1118 1249
1119use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1251
1252sub new {
1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1120 1351
1121my $bg = 1352my $bg =
1122 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1124 1355
1125my @border = 1356my @border =
1126 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1357 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); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1128 1359
1129sub new { 1360sub new {
1130 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1131 1362
… …
1137 min_w => 64, 1368 min_w => 64,
1138 min_h => 32, 1369 min_h => 32,
1139 %arg, 1370 %arg,
1140 ); 1371 );
1141 1372
1142 $self->{title_widget} = new CFClient::UI::Label 1373 $self->{title_widget} = new CFPlus::UI::Label
1143 align => 0, 1374 align => 0,
1144 valign => 1, 1375 valign => 1,
1145 text => $self->{title}, 1376 text => $self->{title},
1146 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1147 if exists $self->{title}; 1378 if exists $self->{title};
1148 1379
1149 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1150 $self->{close_button} = 1381 $self->{close_button} =
1151 new CFClient::UI::ImageButton 1382 new CFPlus::UI::ImageButton
1152 path => 'x1_close.png', 1383 path => 'x1_close.png',
1153 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1154 1385
1155 $self->CFClient::UI::Container::add ($self->{close_button}); 1386 $self->CFPlus::UI::Container::add ($self->{close_button});
1156 } 1387 }
1157 1388
1158 $self 1389 $self
1159} 1390}
1160 1391
1161sub add { 1392sub add {
1162 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1163 1394
1164 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $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}; 1397 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1167} 1398}
1168 1399
1169sub border { 1400sub border {
1170 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1171} 1402}
… …
1279 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1510 $self->{motion}->($ev, $x, $y) if $self->{motion};
1280 1511
1281 ! ! $self->{motion} 1512 ! ! $self->{motion}
1282} 1513}
1283 1514
1515sub invoke_visibility_change {
1516 my ($self, $visible) = @_;
1517
1518 delete $self->{motion} unless $visible;
1519
1520 0
1521}
1522
1284sub _draw { 1523sub _draw {
1285 my ($self) = @_; 1524 my ($self) = @_;
1286 1525
1287 my $child = $self->{children}[0]; 1526 my $child = $self->{children}[0];
1288 1527
… …
1325 if $self->{close_button}; 1564 if $self->{close_button};
1326} 1565}
1327 1566
1328############################################################################# 1567#############################################################################
1329 1568
1330package CFClient::UI::Table; 1569package CFPlus::UI::Table;
1331 1570
1332our @ISA = CFClient::UI::Base::; 1571our @ISA = CFPlus::UI::Base::;
1333 1572
1334use List::Util qw(max sum); 1573use List::Util qw(max sum);
1335 1574
1336use CFClient::OpenGL; 1575use CFPlus::OpenGL;
1337 1576
1338sub new { 1577sub new {
1339 my $class = shift; 1578 my $class = shift;
1340 1579
1341 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1342 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1343 @_, 1584 @_,
1344 ) 1585 )
1345} 1586}
1346 1587
1347sub children { 1588sub children {
1348 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349} 1590}
1350 1591
1592# TODO: store row/col info in child widget and use standard add/del
1351sub add { 1593sub add {
1352 my ($self, $x, $y, $child) = @_; 1594 my ($self) = shift;
1353 1595
1596 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1354 $child->set_parent ($self); 1598 $child->set_parent ($self);
1355 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1600 }
1356 1601
1602 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1;
1357 $self->realloc; 1604 $self->realloc;
1358} 1605}
1359 1606
1360sub remove { 1607sub remove {
1361 my ($self, $child) = @_; 1608 my ($self, $child) = @_;
1362 1609
1363 # TODO: not yet implemented 1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1364} 1615}
1365 1616
1366# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1367sub clear { 1618sub clear {
1368 my ($self) = @_; 1619 my ($self) = @_;
… …
1417 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1418 1669
1419 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1420 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1421 1672
1422 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1423 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1424 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1425 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1426 1677
1427 # linearly scale sizes
1428 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430 1679
1431 CFClient::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1432 CFClient::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1433 1689
1434 my $y; 1690 my $y;
1435 1691
1436 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
1437 my $row = $self->{children}[$r] 1693 my $row = $self->{children}[$r]
… …
1480 } 1736 }
1481} 1737}
1482 1738
1483############################################################################# 1739#############################################################################
1484 1740
1485package CFClient::UI::Box; 1741package CFPlus::UI::Fixed;
1486 1742
1743use List::Util qw(min max);
1744
1487our @ISA = CFClient::UI::Container::; 1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1761
1762sub size_request {
1763 my ($self) = @_;
1764
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1778 }
1779
1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1819}
1820
1821#############################################################################
1822
1823package CFPlus::UI::Box;
1824
1825our @ISA = CFPlus::UI::Container::;
1488 1826
1489sub size_request { 1827sub size_request {
1490 my ($self) = @_; 1828 my ($self) = @_;
1491 1829
1492 $self->{vertical} 1830 $self->{vertical}
… …
1525 $req[$_] += $space * $children[$_]{expand} 1863 $req[$_] += $space * $children[$_]{expand}
1526 for 0 .. $#children; 1864 for 0 .. $#children;
1527 } 1865 }
1528 } 1866 }
1529 1867
1530 CFClient::UI::harmonize \@req; 1868 CFPlus::UI::harmonize \@req;
1531 1869
1532 my $pos = 0; 1870 my $pos = 0;
1533 for (0 .. $#children) { 1871 for (0 .. $#children) {
1534 my $alloc = $req[$_]; 1872 my $alloc = $req[$_];
1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1873 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1540 1 1878 1
1541} 1879}
1542 1880
1543############################################################################# 1881#############################################################################
1544 1882
1545package CFClient::UI::HBox; 1883package CFPlus::UI::HBox;
1546 1884
1547our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1548 1886
1549sub new { 1887sub new {
1550 my $class = shift; 1888 my $class = shift;
1551 1889
1552 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1555 ) 1893 )
1556} 1894}
1557 1895
1558############################################################################# 1896#############################################################################
1559 1897
1560package CFClient::UI::VBox; 1898package CFPlus::UI::VBox;
1561 1899
1562our @ISA = CFClient::UI::Box::; 1900our @ISA = CFPlus::UI::Box::;
1563 1901
1564sub new { 1902sub new {
1565 my $class = shift; 1903 my $class = shift;
1566 1904
1567 $class->SUPER::new ( 1905 $class->SUPER::new (
… …
1570 ) 1908 )
1571} 1909}
1572 1910
1573############################################################################# 1911#############################################################################
1574 1912
1575package CFClient::UI::Label; 1913package CFPlus::UI::Label;
1576 1914
1577our @ISA = CFClient::UI::DrawBG::; 1915our @ISA = CFPlus::UI::DrawBG::;
1578 1916
1579use CFClient::OpenGL; 1917use CFPlus::OpenGL;
1580 1918
1581sub new { 1919sub new {
1582 my ($class, %arg) = @_; 1920 my ($class, %arg) = @_;
1583 1921
1584 my $self = $class->SUPER::new ( 1922 my $self = $class->SUPER::new (
… …
1587 #active_bg => none 1925 #active_bg => none
1588 #font => default_font 1926 #font => default_font
1589 #text => initial text 1927 #text => initial text
1590 #markup => initial narkup 1928 #markup => initial narkup
1591 #max_w => maximum pixel width 1929 #max_w => maximum pixel width
1930 #style => 0, # render flags
1592 ellipsise => 3, # end 1931 ellipsise => 3, # end
1593 layout => (new CFClient::Layout), 1932 layout => (new CFPlus::Layout),
1594 fontsize => 1, 1933 fontsize => 1,
1595 align => -1, 1934 align => -1,
1596 valign => -1, 1935 valign => -1,
1597 padding_x => 2, 1936 padding_x => 2,
1598 padding_y => 2, 1937 padding_y => 2,
1599 can_events => 0, 1938 can_events => 0,
1600 %arg 1939 %arg
1601 ); 1940 );
1602 1941
1603 if (exists $self->{template}) { 1942 if (exists $self->{template}) {
1604 my $layout = new CFClient::Layout; 1943 my $layout = new CFPlus::Layout;
1605 $layout->set_text (delete $self->{template}); 1944 $layout->set_text (delete $self->{template});
1606 $self->{template} = $layout; 1945 $self->{template} = $layout;
1607 } 1946 }
1608 1947
1609 if (exists $self->{markup}) { 1948 if (exists $self->{markup}) {
… …
1611 } else { 1950 } else {
1612 $self->set_text (delete $self->{text}); 1951 $self->set_text (delete $self->{text});
1613 } 1952 }
1614 1953
1615 $self 1954 $self
1616}
1617
1618sub escape($) {
1619 local $_ = $_[0];
1620
1621 s/&/&amp;/g;
1622 s/>/&gt;/g;
1623 s/</&lt;/g;
1624
1625 $_
1626} 1955}
1627 1956
1628sub update { 1957sub update {
1629 my ($self) = @_; 1958 my ($self) = @_;
1630 1959
… …
1757 }; 2086 };
1758 2087
1759 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2088 my $w = List::Util::min $self->{w} + 4, $size->[0];
1760 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2089 my $h = List::Util::min $self->{h} + 2, $size->[1];
1761 2090
1762 $self->{layout}->render ($self->{ox}, $self->{oy}); 2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763} 2092}
1764 2093
1765############################################################################# 2094#############################################################################
1766 2095
1767package CFClient::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
1768 2097
1769our @ISA = CFClient::UI::Label::; 2098our @ISA = CFPlus::UI::Label::;
1770 2099
1771use CFClient::OpenGL; 2100use CFPlus::OpenGL;
1772 2101
1773sub new { 2102sub new {
1774 my $class = shift; 2103 my $class = shift;
1775 2104
1776 $class->SUPER::new ( 2105 $class->SUPER::new (
… …
1780 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1781 can_hover => 1, 2110 can_hover => 1,
1782 can_focus => 1, 2111 can_focus => 1,
1783 valign => 0, 2112 valign => 0,
1784 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
1785 #text => ... 2115 #text => ...
1786 #hidden => "*", 2116 #hidden => "*",
1787 @_ 2117 @_
1788 ) 2118 )
1789} 2119}
… …
1834 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1835 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1836 2166
1837 my $text = $self->get_text; 2167 my $text = $self->get_text;
1838 2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2170
1839 if ($uni == 8) { 2171 if ($uni == 8) {
1840 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1842 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1843 } elsif ($sym == CFClient::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1844 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1845 } elsif ($sym == CFClient::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1846 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1847 } elsif ($sym == CFClient::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
2191 } elsif ($uni == 21) { # ctrl-u
2192 $text = "";
1848 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1849 } elsif ($sym == CFClient::SDLK_END) {
1850 $self->{cursor} = length $text;
1851 } elsif ($uni == 27) { 2194 } elsif ($uni == 27) {
1852 $self->emit ('escape'); 2195 $self->emit ('escape');
1853 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1854 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
1855 } else { 2200 } else {
1856 return 0; 2201 return 0;
1857 } 2202 }
1858 2203
1859 $self->_set_text ($text); 2204 $self->_set_text ($text);
1860 2205
1861 $self->realloc; 2206 $self->realloc;
2207 $self->update;
1862 2208
1863 1 2209 1
1864} 2210}
1865 2211
1866sub invoke_focus_in { 2212sub invoke_focus_in {
… …
1928 utf8::encode $text; 2274 utf8::encode $text;
1929 2275
1930 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1931 } 2277 }
1932 2278
1933 glColor @{$self->{fg}};
1934 glBegin GL_LINES; 2279 glBegin GL_LINES;
1935 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2280 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}; 2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1937 glEnd; 2282 glEnd;
1938 } 2283 }
1939} 2284}
1940 2285
2286#############################################################################
2287
1941package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1942 2289
1943our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1944 2291
1945use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1946 2293
1947sub invoke_key_down { 2294sub invoke_key_down {
1948 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1949 2296
1950 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1951 2298
1952 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1953 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1954 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
1955 2302
1956 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1957 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1958 $self->emit (activate => $txt); 2305 $self->emit (activate => $txt);
1959 $self->update; 2306 $self->update;
1960 2307
1961 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1962 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1963 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1964 } 2311 }
1965 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1966 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1968 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1969 } 2316 }
1970 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1971 } 2318 }
1972 2319
1973 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1974 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1975 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976 2323
1977 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1978 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1987 1 2334 1
1988} 2335}
1989 2336
1990############################################################################# 2337#############################################################################
1991 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
1992package CFClient::UI::Button; 2378package CFPlus::UI::Button;
1993 2379
1994our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
1995 2381
1996use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1997 2383
1998my @tex = 2384my @tex =
1999 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000 qw(b1_button_active.png); 2386 qw(b1_button_inactive.png b1_button_active.png);
2001 2387
2002sub new { 2388sub new {
2003 my $class = shift; 2389 my $class = shift;
2004 2390
2005 $class->SUPER::new ( 2391 $class->SUPER::new (
2006 padding_x => 4, 2392 padding_x => 4,
2007 padding_y => 4, 2393 padding_y => 4,
2008 fg => [1, 1, 1], 2394 fg => [1.0, 1.0, 1.0],
2009 active_fg => [0, 0, 1], 2395 active_fg => [0.8, 0.8, 0.8],
2010 can_hover => 1, 2396 can_hover => 1,
2011 align => 0, 2397 align => 0,
2012 valign => 0, 2398 valign => 0,
2013 can_events => 1, 2399 can_events => 1,
2014 @_ 2400 @_
… …
2032 2418
2033 glEnable GL_TEXTURE_2D; 2419 glEnable GL_TEXTURE_2D;
2034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2035 glColor 0, 0, 0, 1; 2421 glColor 0, 0, 0, 1;
2036 2422
2423 my $tex = $tex[$GRAB == $self];
2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2424 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2038 2425
2039 glDisable GL_TEXTURE_2D; 2426 glDisable GL_TEXTURE_2D;
2040 2427
2041 $self->SUPER::_draw; 2428 $self->SUPER::_draw;
2042} 2429}
2043 2430
2044############################################################################# 2431#############################################################################
2045 2432
2433package CFPlus::UI::CheckBox;
2434
2435our @ISA = CFPlus::UI::DrawBG::;
2436
2437my @tex =
2438 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2439 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2440
2441use CFPlus::OpenGL;
2442
2443sub new {
2444 my $class = shift;
2445
2446 $class->SUPER::new (
2447 padding_x => 2,
2448 padding_y => 2,
2449 fg => [1, 1, 1],
2450 active_fg => [1, 1, 0],
2451 bg => [0, 0, 0, 0.2],
2452 active_bg => [1, 1, 1, 0.5],
2453 state => 0,
2454 can_hover => 1,
2455 @_
2456 )
2457}
2458
2459sub size_request {
2460 my ($self) = @_;
2461
2462 (6) x 2
2463}
2464
2465sub toggle {
2466 my ($self) = @_;
2467
2468 $self->{state} = !$self->{state};
2469 $self->emit (changed => $self->{state});
2470 $self->update;
2471}
2472
2473sub invoke_button_down {
2474 my ($self, $ev, $x, $y) = @_;
2475
2476 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2477 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2478 $self->toggle;
2479 } else {
2480 return 0
2481 }
2482
2483 1
2484}
2485
2486sub _draw {
2487 my ($self) = @_;
2488
2489 $self->SUPER::_draw;
2490
2491 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2492
2493 my ($w, $h) = @$self{qw(w h)};
2494
2495 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2496
2497 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2498
2499 my $tex = $self->{state} ? $tex[1] : $tex[0];
2500
2501 glEnable GL_TEXTURE_2D;
2502 $tex->draw_quad_alpha (0, 0, $s, $s);
2503 glDisable GL_TEXTURE_2D;
2504}
2505
2506#############################################################################
2507
2508package CFPlus::UI::Image;
2509
2510our @ISA = CFPlus::UI::Base::;
2511
2512use CFPlus::OpenGL;
2513
2514our %texture_cache;
2515
2516sub new {
2517 my $class = shift;
2518
2519 my $self = $class->SUPER::new (
2520 can_events => 0,
2521 @_,
2522 );
2523
2524 $self->{path} || $self->{tex}
2525 or Carp::croak "'path' or 'tex' attributes required";
2526
2527 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2528 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2529
2530 CFPlus::weaken $texture_cache{$self->{path}};
2531
2532 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2533
2534 $self
2535}
2536
2537sub STORABLE_freeze {
2538 my ($self, $cloning) = @_;
2539
2540 $self->{path}
2541 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2542
2543 $self->{path}
2544}
2545
2546sub STORABLE_attach {
2547 my ($self, $cloning, $path) = @_;
2548
2549 $self->new (path => $path)
2550}
2551
2552sub size_request {
2553 my ($self) = @_;
2554
2555 ($self->{tex}{w}, $self->{tex}{h})
2556}
2557
2558sub _draw {
2559 my ($self) = @_;
2560
2561 my $tex = $self->{tex};
2562
2563 my ($w, $h) = ($self->{w}, $self->{h});
2564
2565 if ($self->{rot90}) {
2566 glRotate 90, 0, 0, 1;
2567 glTranslate 0, -$self->{w}, 0;
2568
2569 ($w, $h) = ($h, $w);
2570 }
2571
2572 glEnable GL_TEXTURE_2D;
2573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2574
2575 $tex->draw_quad (0, 0, $w, $h);
2576
2577 glDisable GL_TEXTURE_2D;
2578}
2579
2580#############################################################################
2581
2046package CFClient::UI::ImageButton; 2582package CFPlus::UI::ImageButton;
2047 2583
2048our @ISA = CFClient::UI::Image::; 2584our @ISA = CFPlus::UI::Image::;
2049 2585
2050use CFClient::OpenGL; 2586use CFPlus::OpenGL;
2051 2587
2052my %textures; 2588my %textures;
2053 2589
2054sub new { 2590sub new {
2055 my $class = shift; 2591 my $class = shift;
… …
2077 1 2613 1
2078} 2614}
2079 2615
2080############################################################################# 2616#############################################################################
2081 2617
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; 2618package CFPlus::UI::VGauge;
2158 2619
2159our @ISA = CFClient::UI::Base::; 2620our @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 2621
2220use List::Util qw(min max); 2622use List::Util qw(min max);
2221 2623
2222use CFClient::OpenGL; 2624use CFPlus::OpenGL;
2223 2625
2224my %tex = ( 2626my %tex = (
2225 food => [ 2627 food => [
2226 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2629 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228 ], 2630 ],
2229 grace => [ 2631 grace => [
2230 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2632 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/ 2633 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232 ], 2634 ],
2233 hp => [ 2635 hp => [
2234 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2636 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2637 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236 ], 2638 ],
2237 mana => [ 2639 mana => [
2238 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2640 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/ 2641 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240 ], 2642 ],
2241); 2643);
2242 2644
2243# eg. VGauge->new (gauge => 'food'), default gauge: food 2645# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2346 glDisable GL_TEXTURE_2D; 2748 glDisable GL_TEXTURE_2D;
2347} 2749}
2348 2750
2349############################################################################# 2751#############################################################################
2350 2752
2351package CFClient::UI::Gauge; 2753package CFPlus::UI::Gauge;
2352 2754
2353our @ISA = CFClient::UI::VBox::; 2755our @ISA = CFPlus::UI::VBox::;
2354 2756
2355sub new { 2757sub new {
2356 my ($class, %arg) = @_; 2758 my ($class, %arg) = @_;
2357 2759
2358 my $self = $class->SUPER::new ( 2760 my $self = $class->SUPER::new (
… …
2360 can_hover => 1, 2762 can_hover => 1,
2361 can_events => 1, 2763 can_events => 1,
2362 %arg, 2764 %arg,
2363 ); 2765 );
2364 2766
2365 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2767 $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); 2768 $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"); 2769 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368 2770
2369 $self 2771 $self
2370} 2772}
2371 2773
2372sub set_fontsize { 2774sub set_fontsize {
… …
2393 $self->{value}->set_text ($val); 2795 $self->{value}->set_text ($val);
2394} 2796}
2395 2797
2396############################################################################# 2798#############################################################################
2397 2799
2398package CFClient::UI::Slider; 2800package CFPlus::UI::Slider;
2399 2801
2400use strict; 2802use strict;
2401 2803
2402use CFClient::OpenGL; 2804use CFPlus::OpenGL;
2403 2805
2404our @ISA = CFClient::UI::DrawBG::; 2806our @ISA = CFPlus::UI::DrawBG::;
2405 2807
2406my @tex = 2808my @tex =
2407 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2809 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408 qw(s1_slider.png s1_slider_bg.png); 2810 qw(s1_slider.png s1_slider_bg.png);
2409 2811
2410sub new { 2812sub new {
2411 my $class = shift; 2813 my $class = shift;
2412 2814
… …
2506sub invoke_mouse_wheel { 2908sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_; 2909 my ($self, $ev) = @_;
2508 2910
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2911 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510 2912
2913 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2914
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 2915 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512 2916
2513 ! ! $delta 2917 ! ! $delta
2514} 2918}
2515 2919
2516sub update { 2920sub update {
… …
2567 glDisable GL_TEXTURE_2D; 2971 glDisable GL_TEXTURE_2D;
2568} 2972}
2569 2973
2570############################################################################# 2974#############################################################################
2571 2975
2572package CFClient::UI::ValSlider; 2976package CFPlus::UI::ValSlider;
2573 2977
2574our @ISA = CFClient::UI::HBox::; 2978our @ISA = CFPlus::UI::HBox::;
2575 2979
2576sub new { 2980sub new {
2577 my ($class, %arg) = @_; 2981 my ($class, %arg) = @_;
2578 2982
2579 my $range = delete $arg{range}; 2983 my $range = delete $arg{range};
2580 2984
2581 my $self = $class->SUPER::new ( 2985 my $self = $class->SUPER::new (
2582 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2986 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2987 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584 to_value => sub { shift }, 2988 to_value => sub { shift },
2585 from_value => sub { shift }, 2989 from_value => sub { shift },
2586 %arg, 2990 %arg,
2587 ); 2991 );
2588 2992
… …
2608sub set_range { shift->{slider}->set_range (@_) } 3012sub set_range { shift->{slider}->set_range (@_) }
2609sub set_value { shift->{slider}->set_value (@_) } 3013sub set_value { shift->{slider}->set_value (@_) }
2610 3014
2611############################################################################# 3015#############################################################################
2612 3016
2613package CFClient::UI::TextScroller; 3017package CFPlus::UI::TextScroller;
2614 3018
2615our @ISA = CFClient::UI::HBox::; 3019our @ISA = CFPlus::UI::HBox::;
2616 3020
2617use CFClient::OpenGL; 3021use CFPlus::OpenGL;
2618 3022
2619sub new { 3023sub new {
2620 my $class = shift; 3024 my $class = shift;
2621 3025
2622 my $self = $class->SUPER::new ( 3026 my $self = $class->SUPER::new (
… …
2624 can_events => 1, 3028 can_events => 1,
2625 indent => 0, 3029 indent => 0,
2626 #font => default_font 3030 #font => default_font
2627 @_, 3031 @_,
2628 3032
2629 layout => (new CFClient::Layout), 3033 layout => (new CFPlus::Layout),
2630 par => [], 3034 par => [],
3035 max_par => 0,
2631 height => 0, 3036 height => 0,
2632 children => [ 3037 children => [
2633 (new CFClient::UI::Empty expand => 1), 3038 (new CFPlus::UI::Empty expand => 1),
2634 (new CFClient::UI::Slider vertical => 1), 3039 (new CFPlus::UI::Slider vertical => 1),
2635 ], 3040 ],
2636 ); 3041 );
2637 3042
2638 $self->{children}[1]->connect (changed => sub { $self->update }); 3043 $self->{children}[1]->connect (changed => sub { $self->update });
2639 3044
… …
2716 3121
2717 # todo: base offset on lines or so, not on pixels 3122 # todo: base offset on lines or so, not on pixels
2718 $self->{children}[1]->set_value ($offset); 3123 $self->{children}[1]->set_value ($offset);
2719} 3124}
2720 3125
3126sub current_paragraph {
3127 my ($self) = @_;
3128
3129 $self->{top_paragraph} - 1
3130}
3131
3132sub scroll_to {
3133 my ($self, $para) = @_;
3134
3135 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3136
3137 $self->{scroll_to} = $para;
3138 $self->update;
3139}
3140
2721sub clear { 3141sub clear {
2722 my ($self) = @_; 3142 my ($self) = @_;
2723 3143
2724 my (undef, undef, @other) = @{ $self->{children} }; 3144 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other; 3145 $self->remove ($_) for @other;
… …
2728 $self->{height} = 0; 3148 $self->{height} = 0;
2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3149 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730} 3150}
2731 3151
2732sub add_paragraph { 3152sub add_paragraph {
2733 my ($self, $color, $para, $indent) = @_; 3153 my $self = shift;
2734 3154
2735 my ($text, @w) = ref $para ? @$para : $para; 3155 for my $para (@_) {
2736
2737 $para = { 3156 $para = {
3157 fg => [1, 1, 1, 1],
3158 indent => 0,
3159 markup => "",
3160 widget => [],
3161 ref $para ? %$para : (markup => $para),
2738 w => 1e10, 3162 w => 1e10,
2739 wrapped => 1, 3163 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2744 }; 3164 };
2745 3165
2746 $self->add (@w) if @w; 3166 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747 push @{$self->{par}}, $para; 3167 push @{$self->{par}}, $para;
3168 }
3169
3170 if (my $max = $self->{max_par}) {
3171 shift @{$self->{par}} while @{$self->{par}} > $max;
3172 }
2748 3173
2749 $self->{need_reflow}++; 3174 $self->{need_reflow}++;
2750 $self->update; 3175 $self->update;
2751} 3176}
2752 3177
2753sub scroll_to_bottom { 3178sub scroll_to_bottom {
2754 my ($self) = @_; 3179 my ($self) = @_;
2755 3180
2756 $self->{scroll_to_bottom} = 1; 3181 $self->{scroll_to} = $#{$self->{par}};
2757 $self->update; 3182 $self->update;
2758} 3183}
2759 3184
3185sub force_uptodate {
3186 my ($self) = @_;
3187
3188 if (delete $self->{need_reflow}) {
3189 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3190
3191 my $height = 0;
3192
3193 for my $para (@{$self->{par}}) {
3194 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3195 my $layout = $self->get_layout ($para);
3196 my ($w, $h) = $layout->size;
3197
3198 $para->{w} = $w + $para->{indent};
3199 $para->{h} = $h;
3200 $para->{wrapped} = $layout->has_wrapped;
3201 }
3202
3203 $para->{y} = $height;
3204 $height += $para->{h};
3205 }
3206
3207 $self->{height} = $height;
3208 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3209
3210 delete $self->{texture};
3211 }
3212
3213 if (my $paridx = delete $self->{scroll_to}) {
3214 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3215 }
3216}
3217
2760sub update { 3218sub update {
2761 my ($self) = @_; 3219 my ($self) = @_;
2762 3220
2763 $self->SUPER::update; 3221 $self->SUPER::update;
2764 3222
2765 return unless $self->{h} > 0; 3223 return unless $self->{h} > 0;
2766 3224
2767 delete $self->{texture}; 3225 delete $self->{texture};
2768 3226
2769 $ROOT->on_post_alloc ($self => sub { 3227 $ROOT->on_post_alloc ($self => sub {
3228 $self->force_uptodate;
3229
2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3230 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771 3231
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 { 3232 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800 glClearColor 0, 0, 0, 0; 3233 glClearColor 0, 0, 0, 0;
2801 glClear GL_COLOR_BUFFER_BIT; 3234 glClear GL_COLOR_BUFFER_BIT;
2802 3235
3236 package CFPlus::UI::Base;
3237 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3238 (0, 0, $self->{w}, $self->{h});
3239
3240 my $top = int $self->{children}[1]{range}[0];
3241
3242 my $paridx = 0;
3243 my $top_paragraph;
2803 my $top = int $self->{children}[1]{range}[0]; 3244 my $top = int $self->{children}[1]{range}[0];
2804 3245
2805 my $y0 = $top; 3246 my $y0 = $top;
2806 my $y1 = $top + $H; 3247 my $y1 = $top + $H;
2807 3248
2808 my $y = 0;
2809
2810 for my $para (@{$self->{par}}) { 3249 for my $para (@{$self->{par}}) {
2811 my $h = $para->{h}; 3250 my $h = $para->{h};
3251 my $y = $para->{y};
2812 3252
2813 if ($y0 < $y + $h && $y < $y1) { 3253 if ($y0 < $y + $h && $y < $y1) {
2814
2815 my $layout = $self->get_layout ($para); 3254 my $layout = $self->get_layout ($para);
2816 3255
2817 $layout->render ($para->{indent}, $y - $y0); 3256 $layout->render ($para->{indent}, $y - $y0);
2818 3257
2819 if (my @w = @{ $para->{widget} }) { 3258 if (my @w = @{ $para->{widget} }) {
… …
2828 $_->draw; 3267 $_->draw;
2829 } 3268 }
2830 } 3269 }
2831 } 3270 }
2832 3271
2833 $y += $h; 3272 $paridx++;
3273 $top_paragraph ||= $paridx if $y >= $top;
2834 } 3274 }
3275
3276 $self->{top_paragraph} = $top_paragraph;
2835 }; 3277 };
2836 }); 3278 });
2837} 3279}
2838 3280
2839sub reconfigure { 3281sub reconfigure {
… …
2857 $self->{children}[1]->draw; 3299 $self->{children}[1]->draw;
2858} 3300}
2859 3301
2860############################################################################# 3302#############################################################################
2861 3303
2862package CFClient::UI::Animator; 3304package CFPlus::UI::Animator;
2863 3305
2864use CFClient::OpenGL; 3306use CFPlus::OpenGL;
2865 3307
2866our @ISA = CFClient::UI::Bin::; 3308our @ISA = CFPlus::UI::Bin::;
2867 3309
2868sub moveto { 3310sub moveto {
2869 my ($self, $x, $y) = @_; 3311 my ($self, $x, $y) = @_;
2870 3312
2871 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3313 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2899 glPopMatrix; 3341 glPopMatrix;
2900} 3342}
2901 3343
2902############################################################################# 3344#############################################################################
2903 3345
2904package CFClient::UI::Flopper; 3346package CFPlus::UI::Flopper;
2905 3347
2906our @ISA = CFClient::UI::Button::; 3348our @ISA = CFPlus::UI::Button::;
2907 3349
2908sub new { 3350sub new {
2909 my $class = shift; 3351 my $class = shift;
2910 3352
2911 my $self = $class->SUPER::new ( 3353 my $self = $class->SUPER::new (
… …
2923 $self->{other}->toggle_visibility; 3365 $self->{other}->toggle_visibility;
2924} 3366}
2925 3367
2926############################################################################# 3368#############################################################################
2927 3369
2928package CFClient::UI::Tooltip; 3370package CFPlus::UI::Tooltip;
2929 3371
2930our @ISA = CFClient::UI::Bin::; 3372our @ISA = CFPlus::UI::Bin::;
2931 3373
2932use CFClient::OpenGL; 3374use CFPlus::OpenGL;
2933 3375
2934sub new { 3376sub new {
2935 my $class = shift; 3377 my $class = shift;
2936 3378
2937 $class->SUPER::new ( 3379 $class->SUPER::new (
… …
2940 ) 3382 )
2941} 3383}
2942 3384
2943sub set_tooltip_from { 3385sub set_tooltip_from {
2944 my ($self, $widget) = @_; 3386 my ($self, $widget) = @_;
3387
3388 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3389 if $widget->{tooltip} =~ /^#(.*)$/;
2945 3390
2946 my $tooltip = $widget->{tooltip}; 3391 my $tooltip = $widget->{tooltip};
2947 3392
2948 if ($ENV{CFPLUS_DEBUG} & 2) { 3393 if ($ENV{CFPLUS_DEBUG} & 2) {
2949 $tooltip .= "\n\n" . (ref $widget) . "\n" 3394 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2953 } 3398 }
2954 3399
2955 $tooltip =~ s/^\n+//; 3400 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//; 3401 $tooltip =~ s/\n+$//;
2957 3402
2958 $self->add (new CFClient::UI::Label 3403 $self->add (new CFPlus::UI::Label
2959 markup => $tooltip, 3404 markup => $tooltip,
2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3405 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961 fontsize => 0.8, 3406 fontsize => 0.8,
2962 fg => [0, 0, 0, 1], 3407 style => 1, # FLAG_INVERSE
2963 ellipsise => 0, 3408 ellipsise => 0,
2964 font => ($widget->{tooltip_font} || $::FONT_PROP), 3409 font => ($widget->{tooltip_font} || $::FONT_PROP),
2965 ); 3410 );
2966} 3411}
2967 3412
… …
2986 3431
2987 $self->{root}->on_post_alloc ("move_$self" => sub { 3432 $self->{root}->on_post_alloc ("move_$self" => sub {
2988 my $widget = $self->{owner} 3433 my $widget = $self->{owner}
2989 or return; 3434 or return;
2990 3435
3436 if ($widget->{visible}) {
2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3437 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992 3438
2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3439 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994 if $x + $self->{w} > $self->{root}{w}; 3440 if $x + $self->{w} > $self->{root}{w};
2995 3441
2996 $self->move_abs ($x, $y); 3442 $self->move_abs ($x, $y);
3443 } else {
3444 $self->hide;
3445 }
2997 }); 3446 });
2998} 3447}
2999 3448
3000sub _draw { 3449sub _draw {
3001 my ($self) = @_; 3450 my ($self) = @_;
… …
3025 $self->SUPER::_draw; 3474 $self->SUPER::_draw;
3026} 3475}
3027 3476
3028############################################################################# 3477#############################################################################
3029 3478
3030package CFClient::UI::Face; 3479package CFPlus::UI::Face;
3031 3480
3032our @ISA = CFClient::UI::Base::; 3481our @ISA = CFPlus::UI::DrawBG::;
3033 3482
3034use CFClient::OpenGL; 3483use CFPlus::OpenGL;
3035 3484
3036sub new { 3485sub new {
3037 my $class = shift; 3486 my $class = shift;
3038 3487
3039 my $self = $class->SUPER::new ( 3488 my $self = $class->SUPER::new (
3489 size_w => 32,
3490 size_h => 8,
3040 aspect => 1, 3491 aspect => 1,
3041 can_events => 0, 3492 can_events => 0,
3042 @_, 3493 @_,
3043 ); 3494 );
3044 3495
3045 if ($self->{anim} && $self->{animspeed}) { 3496 if ($self->{anim} && $self->{animspeed}) {
3046 Scalar::Util::weaken (my $widget = $self); 3497 CFPlus::weaken (my $widget = $self);
3047 3498
3499 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3500 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3048 $self->{timer} = Event->timer ( 3501 $self->{timer} = Event->timer (
3049 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050 hard => 1, 3502 parked => 1,
3051 interval => $self->{animspeed},
3052 cb => sub { 3503 cb => sub {
3504 return unless $::CONN && $widget;
3505
3053 ++$widget->{frame}; 3506 ++$widget->{frame};
3507 $widget->update_face;
3054 $widget->update; 3508 $widget->update;
3509
3510 $widget->update_timer;
3055 }, 3511 },
3056 ); 3512 );
3513
3514 $self->update_face;
3515 $self->update_timer;
3057 } 3516 }
3058 3517
3059 $self 3518 $self
3060} 3519}
3061 3520
3521sub update_timer {
3522 my ($self) = @_;
3523
3524 return unless $self->{timer};
3525
3526 if ($self->{visible}) {
3527 $self->{timer}->at (
3528 $self->{anim_start}
3529 + $self->{animspeed}
3530 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3531 );
3532 $self->{timer}->start;
3533 } else {
3534 $self->{timer}->stop;
3535 }
3536}
3537
3538sub update_face {
3539 my ($self) = @_;
3540
3541 return unless $::CONN;
3542
3543 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3544 if ($anim && @$anim) {
3545 delete $self->{wait_face};
3546 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3547 }
3548 }
3549}
3550
3062sub size_request { 3551sub size_request {
3063 (32, 8) 3552 my ($self) = @_;
3553
3554 if ($::CONN) {
3555 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3556 if (my $tex = $::CONN->{texture}[$faceid]) {
3557 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3558 } else {
3559 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3560 $self->realloc;
3561 });
3562 }
3563 }
3564 }
3565
3566 ($self->{size_w} || 8, $self->{size_h} || 8)
3064} 3567}
3065 3568
3066sub update { 3569sub update {
3067 my ($self) = @_; 3570 my ($self) = @_;
3068 3571
3069 return unless $self->{visible}; 3572 return unless $self->{visible};
3070 3573
3071 $self->SUPER::update; 3574 $self->SUPER::update;
3072} 3575}
3073 3576
3577sub invoke_visibility_change {
3578 my ($self) = @_;
3579
3580 $self->update_timer;
3581
3582 0
3583}
3584
3074sub _draw { 3585sub _draw {
3075 my ($self) = @_; 3586 my ($self) = @_;
3076 3587
3077 return unless $::CONN; 3588 return unless $::CONN;
3078 3589
3079 my $face; 3590 $self->SUPER::_draw;
3080 3591
3081 if ($self->{frame}) {
3082 my $anim = $::CONN->{anim}[$self->{anim}]; 3592 my $faceid = $::CONN->{faceid}[$self->{face}]
3083 3593 or return;
3084 $face = $anim->[ $self->{frame} % @$anim ]
3085 if $anim && @$anim;
3086 }
3087 3594
3088 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3595 my $tex = $::CONN->{texture}[$faceid];
3089 3596
3090 if ($tex) { 3597 if ($tex) {
3091 glEnable GL_TEXTURE_2D; 3598 glEnable GL_TEXTURE_2D;
3092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3093 glColor 0, 0, 0, 1; 3600 glColor 0, 0, 0, 1;
… …
3097} 3604}
3098 3605
3099sub destroy { 3606sub destroy {
3100 my ($self) = @_; 3607 my ($self) = @_;
3101 3608
3102 $self->{timer}->cancel 3609 (delete $self->{timer})->cancel
3103 if $self->{timer}; 3610 if $self->{timer};
3104 3611
3105 $self->SUPER::destroy; 3612 $self->SUPER::destroy;
3106} 3613}
3107 3614
3108############################################################################# 3615#############################################################################
3109 3616
3110package CFClient::UI::Buttonbar; 3617package CFPlus::UI::Buttonbar;
3111 3618
3112our @ISA = CFClient::UI::HBox::; 3619our @ISA = CFPlus::UI::HBox::;
3113 3620
3114# TODO: should actualyl wrap buttons and other goodies. 3621# TODO: should actually wrap buttons and other goodies.
3115 3622
3116############################################################################# 3623#############################################################################
3117 3624
3118package CFClient::UI::Menu; 3625package CFPlus::UI::Menu;
3119 3626
3120our @ISA = CFClient::UI::FancyFrame::; 3627our @ISA = CFPlus::UI::Toplevel::;
3121 3628
3122use CFClient::OpenGL; 3629use CFPlus::OpenGL;
3123 3630
3124sub new { 3631sub new {
3125 my $class = shift; 3632 my $class = shift;
3126 3633
3127 my $self = $class->SUPER::new ( 3634 my $self = $class->SUPER::new (
3128 items => [], 3635 items => [],
3129 z => 100, 3636 z => 100,
3130 @_, 3637 @_,
3131 ); 3638 );
3132 3639
3133 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3640 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134 3641
3135 for my $item (@{ $self->{items} }) { 3642 for my $item (@{ $self->{items} }) {
3136 my ($widget, $cb, $tooltip) = @$item; 3643 my ($widget, $cb, $tooltip) = @$item;
3137 3644
3138 # handle various types of items, only text for now 3645 # handle various types of items, only text for now
3139 if (!ref $widget) { 3646 if (!ref $widget) {
3140 if ($widget =~ /\t/) { 3647 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2; 3648 my ($left, $right) = split /\t/, $widget, 2;
3142 3649
3143 $widget = new CFClient::UI::HBox 3650 $widget = new CFPlus::UI::HBox
3144 can_hover => 1, 3651 can_hover => 1,
3145 can_events => 1, 3652 can_events => 1,
3146 tooltip => $tooltip, 3653 tooltip => $tooltip,
3147 children => [ 3654 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1), 3655 (new CFPlus::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1), 3656 (new CFPlus::UI::Label markup => $right, align => +1),
3150 ], 3657 ],
3151 ; 3658 ;
3152 3659
3153 } else { 3660 } else {
3154 $widget = new CFClient::UI::Label 3661 $widget = new CFPlus::UI::Label
3155 can_hover => 1, 3662 can_hover => 1,
3156 can_events => 1, 3663 can_events => 1,
3157 markup => $widget, 3664 markup => $widget,
3158 tooltip => $tooltip; 3665 tooltip => $tooltip;
3159 } 3666 }
… …
3207 1 3714 1
3208} 3715}
3209 3716
3210############################################################################# 3717#############################################################################
3211 3718
3212package CFClient::UI::Multiplexer; 3719package CFPlus::UI::Multiplexer;
3213 3720
3214our @ISA = CFClient::UI::Container::; 3721our @ISA = CFPlus::UI::Container::;
3215 3722
3216sub new { 3723sub new {
3217 my $class = shift; 3724 my $class = shift;
3218 3725
3219 my $self = $class->SUPER::new ( 3726 my $self = $class->SUPER::new (
… …
3280 $self->{current}->draw; 3787 $self->{current}->draw;
3281} 3788}
3282 3789
3283############################################################################# 3790#############################################################################
3284 3791
3285package CFClient::UI::Notebook; 3792package CFPlus::UI::Notebook;
3286 3793
3287our @ISA = CFClient::UI::VBox::; 3794our @ISA = CFPlus::UI::VBox::;
3288 3795
3289sub new { 3796sub new {
3290 my $class = shift; 3797 my $class = shift;
3291 3798
3292 my $self = $class->SUPER::new ( 3799 my $self = $class->SUPER::new (
3293 buttonbar => (new CFClient::UI::Buttonbar), 3800 buttonbar => (new CFPlus::UI::Buttonbar),
3294 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3801 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295 # filter => # will be put between multiplexer and $self 3802 # filter => # will be put between multiplexer and $self
3296 @_, 3803 @_,
3297 ); 3804 );
3298 3805
3299 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3806 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3303} 3810}
3304 3811
3305sub add { 3812sub add {
3306 my ($self, $title, $widget, $tooltip) = @_; 3813 my ($self, $title, $widget, $tooltip) = @_;
3307 3814
3308 Scalar::Util::weaken $self; 3815 CFPlus::weaken $self;
3309 3816
3310 $self->{buttonbar}->add (new CFClient::UI::Button 3817 $self->{buttonbar}->add (new CFPlus::UI::Button
3311 markup => $title, 3818 markup => $title,
3312 tooltip => $tooltip, 3819 tooltip => $tooltip,
3313 on_activate => sub { $self->set_current_page ($widget) }, 3820 on_activate => sub { $self->set_current_page ($widget) },
3314 ); 3821 );
3315 3822
… …
3329 $self->emit (page_changed => $self->{multiplexer}{current}); 3836 $self->emit (page_changed => $self->{multiplexer}{current});
3330} 3837}
3331 3838
3332############################################################################# 3839#############################################################################
3333 3840
3334package CFClient::UI::Combobox; 3841package CFPlus::UI::Selector;
3335 3842
3336use utf8; 3843use utf8;
3337 3844
3338our @ISA = CFClient::UI::Button::; 3845our @ISA = CFPlus::UI::Button::;
3339 3846
3340sub new { 3847sub new {
3341 my $class = shift; 3848 my $class = shift;
3342 3849
3343 my $self = $class->SUPER::new ( 3850 my $self = $class->SUPER::new (
… …
3360 my ($value, $title, $tooltip) = @$_; 3867 my ($value, $title, $tooltip) = @$_;
3361 3868
3362 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3869 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363 } 3870 }
3364 3871
3365 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3872 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366} 3873}
3367 3874
3368sub _set_value { 3875sub _set_value {
3369 my ($self, $value) = @_; 3876 my ($self, $value) = @_;
3370 3877
… …
3385 $self->emit (changed => $value); 3892 $self->emit (changed => $value);
3386} 3893}
3387 3894
3388############################################################################# 3895#############################################################################
3389 3896
3390package CFClient::UI::Statusbox; 3897package CFPlus::UI::Statusbox;
3391 3898
3392our @ISA = CFClient::UI::VBox::; 3899our @ISA = CFPlus::UI::VBox::;
3393 3900
3394sub new { 3901sub new {
3395 my $class = shift; 3902 my $class = shift;
3396 3903
3397 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
3398 fontsize => 0.8, 3905 fontsize => 0.8,
3399 @_, 3906 @_,
3400 ); 3907 );
3401 3908
3402 Scalar::Util::weaken (my $this = $self); 3909 CFPlus::weaken (my $this = $self);
3403 3910
3404 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3911 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405 3912
3406 $self 3913 $self
3407} 3914}
… …
3409sub reorder { 3916sub reorder {
3410 my ($self) = @_; 3917 my ($self) = @_;
3411 my $NOW = Time::HiRes::time; 3918 my $NOW = Time::HiRes::time;
3412 3919
3413 # freeze display when hovering over any label 3920 # freeze display when hovering over any label
3414 return if $CFClient::UI::TOOLTIP->{owner} 3921 return if $CFPlus::UI::TOOLTIP->{owner}
3415 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3922 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416 values %{ $self->{item} }; 3923 values %{ $self->{item} };
3417 3924
3418 while (my ($k, $v) = each %{ $self->{item} }) { 3925 while (my ($k, $v) = each %{ $self->{item} }) {
3419 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3926 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420 } 3927 }
… …
3441 for ($short) { 3948 for ($short) {
3442 s/^\s+//; 3949 s/^\s+//;
3443 s/\s+/ /g; 3950 s/\s+/ /g;
3444 } 3951 }
3445 3952
3446 new CFClient::UI::Label 3953 new CFPlus::UI::Label
3447 markup => $short, 3954 markup => $short,
3448 tooltip => $item->{tooltip}, 3955 tooltip => $item->{tooltip},
3449 tooltip_font => $::FONT_PROP, 3956 tooltip_font => $::FONT_PROP,
3450 tooltip_width => 0.67, 3957 tooltip_width => 0.67,
3451 fontsize => $item->{fontsize} || $self->{fontsize}, 3958 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3530 $self->SUPER::destroy; 4037 $self->SUPER::destroy;
3531} 4038}
3532 4039
3533############################################################################# 4040#############################################################################
3534 4041
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; 4042package CFPlus::UI::Root;
3700 4043
3701our @ISA = CFClient::UI::Container::; 4044our @ISA = CFPlus::UI::Container::;
3702 4045
3703use List::Util qw(min max); 4046use List::Util qw(min max);
3704 4047
3705use CFClient::OpenGL; 4048use CFPlus::OpenGL;
3706 4049
3707sub new { 4050sub new {
3708 my $class = shift; 4051 my $class = shift;
3709 4052
3710 my $self = $class->SUPER::new ( 4053 my $self = $class->SUPER::new (
3711 visible => 1, 4054 visible => 1,
3712 @_, 4055 @_,
3713 ); 4056 );
3714 4057
3715 Scalar::Util::weaken ($self->{root} = $self); 4058 CFPlus::weaken ($self->{root} = $self);
3716 4059
3717 $self 4060 $self
3718} 4061}
3719 4062
3720sub size_request { 4063sub size_request {
… …
3889 $h = 0 if $h < 0; 4232 $h = 0 if $h < 0;
3890 4233
3891 $w = max $widget->{min_w}, $w; 4234 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h; 4235 $h = max $widget->{min_h}, $h;
3893 4236
4237# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4238# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4239
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4240 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4241 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896 4242
3897 $w = int $w + 0.5; 4243 $w = int $w + 0.5;
3898 $h = int $h + 0.5; 4244 $h = int $h + 0.5;
… …
3911 4257
3912 while ($self->{post_alloc_hook}) { 4258 while ($self->{post_alloc_hook}) {
3913 $_->() 4259 $_->()
3914 for values %{delete $self->{post_alloc_hook}}; 4260 for values %{delete $self->{post_alloc_hook}};
3915 } 4261 }
3916
3917 4262
3918 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4263 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3919 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4264 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3920 glClear GL_COLOR_BUFFER_BIT; 4265 glClear GL_COLOR_BUFFER_BIT;
3921 4266
… …
3924 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4269 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925 glMatrixMode GL_MODELVIEW; 4270 glMatrixMode GL_MODELVIEW;
3926 glLoadIdentity; 4271 glLoadIdentity;
3927 4272
3928 { 4273 {
3929 package CFClient::UI::Base; 4274 package CFPlus::UI::Base;
3930 4275
3931 ($draw_x, $draw_y, $draw_w, $draw_h) = 4276 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932 (0, 0, $self->{w}, $self->{h}); 4277 (0, 0, $self->{w}, $self->{h});
3933 }
3934 4278
3935 $self->_draw; 4279 $self->_draw;
4280 }
3936} 4281}
3937 4282
3938############################################################################# 4283#############################################################################
3939 4284
3940package CFClient::UI; 4285package CFPlus::UI;
3941 4286
3942$ROOT = new CFClient::UI::Root; 4287$ROOT = new CFPlus::UI::Root;
3943$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4288$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944 4289
39451 42901
3946 4291

Diff Legend

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