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.332 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 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 {
497sub connect { 505sub connect {
498 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
499 507
500 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
501 509
502 defined wantarray and CFClient::guard { 510 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
505 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
506} 520}
507 521
508my %has_coords = ( 522my %has_coords = (
509 button_down => 1, 523 button_down => 1,
510 button_up => 1, 524 button_up => 1,
513); 527);
514 528
515sub emit { 529sub emit {
516 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
517 531
518 # I do not really like this solution, but I dislike duplication 532 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
520 my @append 534 my @append
521 = $has_coords{$signal} 535 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
523 : (); 537 : ();
524 538
525 #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#
526 540
527 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($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
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 550}
532 551
533sub find_widget { 552sub find_widget {
534 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
535 554
543} 562}
544 563
545sub set_parent { 564sub set_parent {
546 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
547 566
548 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
550} 569}
551 570
552sub realloc { 571sub realloc {
553 my ($self) = @_; 572 my ($self) = @_;
619 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
622 glEnd; 641 glEnd;
623 glPopMatrix; 642 glPopMatrix;
624 #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;
625 } 644 }
626 645
627 $self->_draw; 646 $self->_draw;
628 glPopMatrix; 647 glPopMatrix;
629} 648}
632 my ($self) = @_; 651 my ($self) = @_;
633 652
634 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
635} 654}
636 655
656my $cntx;#d#
637sub DESTROY { 657sub DESTROY {
638 my ($self) = @_; 658 my ($self) = @_;
639 659
640 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 661
644 eval { $self->destroy }; 662 eval { $self->destroy };
645 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};
646} 666}
647 667
648############################################################################# 668#############################################################################
649 669
650package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
651 671
652our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
653 673
654use strict; 674use strict;
655use CFClient::OpenGL; 675use CFPlus::OpenGL;
656 676
657sub new { 677sub new {
658 my $class = shift; 678 my $class = shift;
659 679
660 # range [value, low, high, page] 680 # range [value, low, high, page]
691 } 711 }
692} 712}
693 713
694############################################################################# 714#############################################################################
695 715
696package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
697 717
698our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
699 719
700sub new { 720sub new {
701 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
703} 723}
710 730
711sub draw { } 731sub draw { }
712 732
713############################################################################# 733#############################################################################
714 734
715package CFClient::UI::Container; 735package CFPlus::UI::Container;
716 736
717our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
718 738
719sub new { 739sub new {
720 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
721 741
722 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
808 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
809} 829}
810 830
811############################################################################# 831#############################################################################
812 832
813package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
814 834
815our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
816 836
817sub new { 837sub new {
818 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
819 839
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 841
822 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
823} 843}
824 844
825sub add { 845sub add {
832sub remove { 852sub remove {
833 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
834 854
835 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
836 856
837 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 858 unless @{$self->{children}};
839} 859}
840 860
841sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
842 862
854 874
855############################################################################# 875#############################################################################
856 876
857# back-buffered drawing area 877# back-buffered drawing area
858 878
859package CFClient::UI::Window; 879package CFPlus::UI::Window;
860 880
861our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
862 882
863use CFClient::OpenGL; 883use CFPlus::OpenGL;
864 884
865sub new { 885sub new {
866 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
867 887
868 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
890} 910}
891 911
892sub render_child { 912sub render_child {
893 my ($self) = @_; 913 my ($self) = @_;
894 914
895 $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 {
896 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
898 918
899 { 919 {
900 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
901 921
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
904 } 926 }
905
906 $self->_render;
907 }; 927 };
908} 928}
909 929
910sub _draw { 930sub _draw {
911 my ($self) = @_; 931 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 932
915 my $tex = $self->{texture} 933 my $tex = $self->{texture}
916 or return; 934 or return;
917 935
918 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
921 939
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
923 941
924 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
925} 943}
926 944
927############################################################################# 945#############################################################################
928 946
929package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
930 948
931our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
932 950
933sub new { 951sub new {
934 my $class = shift; 952 my $class = shift;
935 953
936 $class->SUPER::new ( 954 $class->SUPER::new (
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1016 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1018 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1020 }
1003} 1021}
1004 1022
1005sub _render { 1023sub _render {
1006 my ($self) = @_; 1024 my ($self) = @_;
1007 1025
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1028
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1030
1013 $self->SUPER::_render; 1031 $self->SUPER::_render;
1014} 1032}
1015 1033
1016############################################################################# 1034#############################################################################
1017 1035
1018package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1019 1037
1020our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1021 1039
1022sub new { 1040sub new {
1023 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1024 1042
1025 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1026 1044
1027 my $self; 1045 my $self;
1028 1046
1029 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
1030 vertical => 1, 1057 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1059 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1062 },
1035 ; 1063 ;
1036 1064
1037 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1, 1067 can_events => 1,
1040 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1041 %arg, 1072 %arg,
1042 ); 1073 );
1043 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1045 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1046 1080
1047 $self 1081 $self
1048} 1082}
1049 1083
1058sub invoke_mouse_wheel { 1092sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1093 my ($self, $ev) = @_;
1060 1094
1061 return 0 unless $ev->{dy}; # only vertical movements 1095 return 0 unless $ev->{dy}; # only vertical movements
1062 1096
1063 $self->{slider}->emit (mouse_wheel => $ev); 1097 $self->{vslider}->emit (mouse_wheel => $ev);
1064 1098
1065 1 1099 1
1066} 1100}
1067 1101
1068sub update_slider { 1102sub update_slider {
1069 my ($self) = @_; 1103 my ($self) = @_;
1070 1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1072} 1114}
1073 1115
1074sub update { 1116sub update {
1075 my ($self) = @_; 1117 my ($self) = @_;
1076 1118
1077 $self->SUPER::update; 1119 $self->SUPER::update;
1078
1079 $self->update_slider; 1120 $self->update_slider;
1080} 1121}
1081 1122
1082sub invoke_size_allocate { 1123sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1084 1125
1085 $self->update_slider; 1126 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1128}
1089 1129
1090############################################################################# 1130#############################################################################
1091 1131
1092package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1093 1133
1094our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1095 1135
1096use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1097 1137
1098sub new { 1138sub new {
1099 my $class = shift; 1139 my $class = shift;
1100 1140
1101 $class->SUPER::new ( 1141 $class->SUPER::new (
1127 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1128} 1168}
1129 1169
1130############################################################################# 1170#############################################################################
1131 1171
1132package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1133 1173
1134our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1135 1175
1136use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1137 1277
1138my $bg = 1278my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1141 1281
1142my @border = 1282my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145 1285
1146sub new { 1286sub new {
1147 my ($class, %arg) = @_; 1287 my ($class, %arg) = @_;
1148 1288
1154 min_w => 64, 1294 min_w => 64,
1155 min_h => 32, 1295 min_h => 32,
1156 %arg, 1296 %arg,
1157 ); 1297 );
1158 1298
1159 $self->{title_widget} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1300 align => 0,
1161 valign => 1, 1301 valign => 1,
1162 text => $self->{title}, 1302 text => $self->{title},
1163 fontsize => $self->{border}, 1303 fontsize => $self->{border},
1164 if exists $self->{title}; 1304 if exists $self->{title};
1165 1305
1166 if ($self->{has_close_button}) { 1306 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1307 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1308 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1309 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1310 on_activate => sub { $self->emit ("delete") };
1171 1311
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1313 }
1174 1314
1175 $self 1315 $self
1176} 1316}
1177 1317
1178sub add { 1318sub add {
1179 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1180 1320
1181 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1324}
1185 1325
1186sub border { 1326sub border {
1187 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1188} 1328}
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1437
1298 ! ! $self->{motion} 1438 ! ! $self->{motion}
1299} 1439}
1300 1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1447}
1448
1301sub _draw { 1449sub _draw {
1302 my ($self) = @_; 1450 my ($self) = @_;
1303 1451
1304 my $child = $self->{children}[0]; 1452 my $child = $self->{children}[0];
1305 1453
1342 if $self->{close_button}; 1490 if $self->{close_button};
1343} 1491}
1344 1492
1345############################################################################# 1493#############################################################################
1346 1494
1347package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1348 1496
1349our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1350 1498
1351use List::Util qw(max sum); 1499use List::Util qw(max sum);
1352 1500
1353use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1354 1502
1355sub new { 1503sub new {
1356 my $class = shift; 1504 my $class = shift;
1357 1505
1358 $class->SUPER::new ( 1506 $class->SUPER::new (
1359 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1360 @_, 1509 @_,
1361 ) 1510 )
1362} 1511}
1363 1512
1364sub children { 1513sub children {
1439 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1440 1589
1441 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1443 1592
1444 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1445 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1448 1597
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1599
1453 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1454 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1455 1609
1456 my $y; 1610 my $y;
1457 1611
1458 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1459 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
1502 } 1656 }
1503} 1657}
1504 1658
1505############################################################################# 1659#############################################################################
1506 1660
1507package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1508 1662
1509our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1510 1664
1511sub size_request { 1665sub size_request {
1512 my ($self) = @_; 1666 my ($self) = @_;
1513 1667
1514 $self->{vertical} 1668 $self->{vertical}
1547 $req[$_] += $space * $children[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1702 for 0 .. $#children;
1549 } 1703 }
1550 } 1704 }
1551 1705
1552 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1553 1707
1554 my $pos = 0; 1708 my $pos = 0;
1555 for (0 .. $#children) { 1709 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1562 1 1716 1
1563} 1717}
1564 1718
1565############################################################################# 1719#############################################################################
1566 1720
1567package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1568 1722
1569our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1570 1724
1571sub new { 1725sub new {
1572 my $class = shift; 1726 my $class = shift;
1573 1727
1574 $class->SUPER::new ( 1728 $class->SUPER::new (
1577 ) 1731 )
1578} 1732}
1579 1733
1580############################################################################# 1734#############################################################################
1581 1735
1582package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1583 1737
1584our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1585 1739
1586sub new { 1740sub new {
1587 my $class = shift; 1741 my $class = shift;
1588 1742
1589 $class->SUPER::new ( 1743 $class->SUPER::new (
1592 ) 1746 )
1593} 1747}
1594 1748
1595############################################################################# 1749#############################################################################
1596 1750
1597package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1598 1752
1599our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1600 1754
1601use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1602 1756
1603sub new { 1757sub new {
1604 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1605 1759
1606 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
1609 #active_bg => none 1763 #active_bg => none
1610 #font => default_font 1764 #font => default_font
1611 #text => initial text 1765 #text => initial text
1612 #markup => initial narkup 1766 #markup => initial narkup
1613 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1614 ellipsise => 3, # end 1769 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1771 fontsize => 1,
1617 align => -1, 1772 align => -1,
1618 valign => -1, 1773 valign => -1,
1619 padding_x => 2, 1774 padding_x => 2,
1620 padding_y => 2, 1775 padding_y => 2,
1621 can_events => 0, 1776 can_events => 0,
1622 %arg 1777 %arg
1623 ); 1778 );
1624 1779
1625 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1783 $self->{template} = $layout;
1629 } 1784 }
1630 1785
1631 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
1633 } else { 1788 } else {
1634 $self->set_text (delete $self->{text}); 1789 $self->set_text (delete $self->{text});
1635 } 1790 }
1636 1791
1637 $self 1792 $self
1638}
1639
1640sub escape($) {
1641 local $_ = $_[0];
1642
1643 s/&/&amp;/g;
1644 s/>/&gt;/g;
1645 s/</&lt;/g;
1646
1647 $_
1648} 1793}
1649 1794
1650sub update { 1795sub update {
1651 my ($self) = @_; 1796 my ($self) = @_;
1652 1797
1779 }; 1924 };
1780 1925
1781 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1782 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1783 1928
1784 $self->{layout}->render ($self->{ox}, $self->{oy}); 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1785} 1930}
1786 1931
1787############################################################################# 1932#############################################################################
1788 1933
1789package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1790 1935
1791our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1792 1937
1793use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1794 1939
1795sub new { 1940sub new {
1796 my $class = shift; 1941 my $class = shift;
1797 1942
1798 $class->SUPER::new ( 1943 $class->SUPER::new (
1802 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1803 can_hover => 1, 1948 can_hover => 1,
1804 can_focus => 1, 1949 can_focus => 1,
1805 valign => 0, 1950 valign => 0,
1806 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1807 #text => ... 1953 #text => ...
1808 #hidden => "*", 1954 #hidden => "*",
1809 @_ 1955 @_
1810 ) 1956 )
1811} 1957}
1856 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1857 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1858 2004
1859 my $text = $self->get_text; 2005 my $text = $self->get_text;
1860 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1861 if ($uni == 8) { 2009 if ($uni == 8) {
1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1864 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1865 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1866 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1867 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1868 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1869 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1870 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1871 } elsif ($sym == CFClient::SDLK_END) {
1872 $self->{cursor} = length $text;
1873 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1874 $self->emit ('escape'); 2033 $self->emit ('escape');
1875 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1876 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else { 2038 } else {
1878 return 0; 2039 return 0;
1879 } 2040 }
1880 2041
1881 $self->_set_text ($text); 2042 $self->_set_text ($text);
1882 2043
1883 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1884 2046
1885 1 2047 1
1886} 2048}
1887 2049
1888sub invoke_focus_in { 2050sub invoke_focus_in {
1950 utf8::encode $text; 2112 utf8::encode $text;
1951 2113
1952 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953 } 2115 }
1954 2116
1955 glColor @{$self->{fg}};
1956 glBegin GL_LINES; 2117 glBegin GL_LINES;
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959 glEnd; 2120 glEnd;
1960 } 2121 }
1961} 2122}
1962 2123
2124#############################################################################
2125
1963package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1964 2127
1965our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1966 2129
1967use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1968 2131
1969sub invoke_key_down { 2132sub invoke_key_down {
1970 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1971 2134
1972 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1973 2136
1974 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1975 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1976 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1977 2140
1978 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1979 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1980 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1981 $self->update; 2144 $self->update;
1982 2145
1983 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1984 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1985 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1986 } 2149 }
1987 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1988 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
1990 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1991 } 2154 }
1992 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1993 } 2156 }
1994 2157
1995 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1996 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1997 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998 2161
1999 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
2000 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2009 1 2172 1
2010} 2173}
2011 2174
2012############################################################################# 2175#############################################################################
2013 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
2014package CFClient::UI::Button; 2216package CFPlus::UI::Button;
2015 2217
2016our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
2017 2219
2018use CFClient::OpenGL; 2220use CFPlus::OpenGL;
2019 2221
2020my @tex = 2222my @tex =
2021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
2023 2225
2024sub new { 2226sub new {
2025 my $class = shift; 2227 my $class = shift;
2026 2228
2063 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
2064} 2266}
2065 2267
2066############################################################################# 2268#############################################################################
2067 2269
2270package CFPlus::UI::CheckBox;
2271
2272our @ISA = CFPlus::UI::DrawBG::;
2273
2274my @tex =
2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2277
2278use CFPlus::OpenGL;
2279
2280sub new {
2281 my $class = shift;
2282
2283 $class->SUPER::new (
2284 padding_x => 2,
2285 padding_y => 2,
2286 fg => [1, 1, 1],
2287 active_fg => [1, 1, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
2290 state => 0,
2291 can_hover => 1,
2292 @_
2293 )
2294}
2295
2296sub size_request {
2297 my ($self) = @_;
2298
2299 (6) x 2
2300}
2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
2310sub invoke_button_down {
2311 my ($self, $ev, $x, $y) = @_;
2312
2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2315 $self->toggle;
2316 } else {
2317 return 0
2318 }
2319
2320 1
2321}
2322
2323sub _draw {
2324 my ($self) = @_;
2325
2326 $self->SUPER::_draw;
2327
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2329
2330 my ($w, $h) = @$self{qw(w h)};
2331
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333
2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2335
2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
2338 glEnable GL_TEXTURE_2D;
2339 $tex->draw_quad_alpha (0, 0, $s, $s);
2340 glDisable GL_TEXTURE_2D;
2341}
2342
2343#############################################################################
2344
2345package CFPlus::UI::Image;
2346
2347our @ISA = CFPlus::UI::Base::;
2348
2349use CFPlus::OpenGL;
2350
2351our %texture_cache;
2352
2353sub new {
2354 my $class = shift;
2355
2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2360
2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2363
2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2366
2367 CFPlus::weaken $texture_cache{$self->{path}};
2368
2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2370
2371 $self
2372}
2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2389sub size_request {
2390 my ($self) = @_;
2391
2392 ($self->{tex}{w}, $self->{tex}{h})
2393}
2394
2395sub _draw {
2396 my ($self) = @_;
2397
2398 my $tex = $self->{tex};
2399
2400 my ($w, $h) = ($self->{w}, $self->{h});
2401
2402 if ($self->{rot90}) {
2403 glRotate 90, 0, 0, 1;
2404 glTranslate 0, -$self->{w}, 0;
2405
2406 ($w, $h) = ($h, $w);
2407 }
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411
2412 $tex->draw_quad (0, 0, $w, $h);
2413
2414 glDisable GL_TEXTURE_2D;
2415}
2416
2417#############################################################################
2418
2068package CFClient::UI::ImageButton; 2419package CFPlus::UI::ImageButton;
2069 2420
2070our @ISA = CFClient::UI::Image::; 2421our @ISA = CFPlus::UI::Image::;
2071 2422
2072use CFClient::OpenGL; 2423use CFPlus::OpenGL;
2073 2424
2074my %textures; 2425my %textures;
2075 2426
2076sub new { 2427sub new {
2077 my $class = shift; 2428 my $class = shift;
2099 1 2450 1
2100} 2451}
2101 2452
2102############################################################################# 2453#############################################################################
2103 2454
2104package CFClient::UI::CheckBox;
2105
2106our @ISA = CFClient::UI::DrawBG::;
2107
2108my @tex =
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2110 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2111
2112use CFClient::OpenGL;
2113
2114sub new {
2115 my $class = shift;
2116
2117 $class->SUPER::new (
2118 padding_x => 2,
2119 padding_y => 2,
2120 fg => [1, 1, 1],
2121 active_fg => [1, 1, 0],
2122 bg => [0, 0, 0, 0.2],
2123 active_bg => [1, 1, 1, 0.5],
2124 state => 0,
2125 can_hover => 1,
2126 @_
2127 )
2128}
2129
2130sub size_request {
2131 my ($self) = @_;
2132
2133 (6) x 2
2134}
2135
2136sub toggle {
2137 my ($self) = @_;
2138
2139 $self->{state} = !$self->{state};
2140 $self->emit (changed => $self->{state});
2141 $self->update;
2142}
2143
2144sub invoke_button_down {
2145 my ($self, $ev, $x, $y) = @_;
2146
2147 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2148 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2149 $self->toggle;
2150 } else {
2151 return 0
2152 }
2153
2154 1
2155}
2156
2157sub _draw {
2158 my ($self) = @_;
2159
2160 $self->SUPER::_draw;
2161
2162 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2163
2164 my ($w, $h) = @$self{qw(w h)};
2165
2166 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2167
2168 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2169
2170 my $tex = $self->{state} ? $tex[1] : $tex[0];
2171
2172 glEnable GL_TEXTURE_2D;
2173 $tex->draw_quad_alpha (0, 0, $s, $s);
2174 glDisable GL_TEXTURE_2D;
2175}
2176
2177#############################################################################
2178
2179package CFClient::UI::Image; 2455package CFPlus::UI::VGauge;
2180 2456
2181our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2182
2183use CFClient::OpenGL;
2184
2185our %texture_cache;
2186
2187sub new {
2188 my $class = shift;
2189
2190 my $self = $class->SUPER::new (
2191 can_events => 0,
2192 @_,
2193 );
2194
2195 $self->{path} || $self->{tex}
2196 or Carp::croak "'path' or 'tex' attributes required";
2197
2198 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2199 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2200
2201 Scalar::Util::weaken $texture_cache{$self->{path}};
2202
2203 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2204
2205 $self
2206}
2207
2208sub size_request {
2209 my ($self) = @_;
2210
2211 ($self->{tex}{w}, $self->{tex}{h})
2212}
2213
2214sub _draw {
2215 my ($self) = @_;
2216
2217 my $tex = $self->{tex};
2218
2219 my ($w, $h) = ($self->{w}, $self->{h});
2220
2221 if ($self->{rot90}) {
2222 glRotate 90, 0, 0, 1;
2223 glTranslate 0, -$self->{w}, 0;
2224
2225 ($w, $h) = ($h, $w);
2226 }
2227
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231 $tex->draw_quad_alpha (0, 0, $w, $h);
2232
2233 glDisable GL_TEXTURE_2D;
2234}
2235
2236#############################################################################
2237
2238package CFClient::UI::VGauge;
2239
2240our @ISA = CFClient::UI::Base::;
2241 2458
2242use List::Util qw(min max); 2459use List::Util qw(min max);
2243 2460
2244use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2245 2462
2246my %tex = ( 2463my %tex = (
2247 food => [ 2464 food => [
2248 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2249 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250 ], 2467 ],
2251 grace => [ 2468 grace => [
2252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2253 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2254 ], 2471 ],
2255 hp => [ 2472 hp => [
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258 ], 2475 ],
2259 mana => [ 2476 mana => [
2260 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2262 ], 2479 ],
2263); 2480);
2264 2481
2265# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
2368 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2369} 2586}
2370 2587
2371############################################################################# 2588#############################################################################
2372 2589
2373package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2374 2591
2375our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2376 2593
2377sub new { 2594sub new {
2378 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2379 2596
2380 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
2382 can_hover => 1, 2599 can_hover => 1,
2383 can_events => 1, 2600 can_events => 1,
2384 %arg, 2601 %arg,
2385 ); 2602 );
2386 2603
2387 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2388 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2389 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2390 2607
2391 $self 2608 $self
2392} 2609}
2393 2610
2394sub set_fontsize { 2611sub set_fontsize {
2415 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2416} 2633}
2417 2634
2418############################################################################# 2635#############################################################################
2419 2636
2420package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2421 2638
2422use strict; 2639use strict;
2423 2640
2424use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2425 2642
2426our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2427 2644
2428my @tex = 2645my @tex =
2429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2430 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2431 2648
2432sub new { 2649sub new {
2433 my $class = shift; 2650 my $class = shift;
2434 2651
2528sub invoke_mouse_wheel { 2745sub invoke_mouse_wheel {
2529 my ($self, $ev) = @_; 2746 my ($self, $ev) = @_;
2530 2747
2531 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532 2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2533 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2534 2753
2535 ! ! $delta 2754 ! ! $delta
2536} 2755}
2537 2756
2538sub update { 2757sub update {
2589 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2590} 2809}
2591 2810
2592############################################################################# 2811#############################################################################
2593 2812
2594package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2595 2814
2596our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2597 2816
2598sub new { 2817sub new {
2599 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2600 2819
2601 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2602 2821
2603 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2604 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2605 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2606 to_value => sub { shift }, 2825 to_value => sub { shift },
2607 from_value => sub { shift }, 2826 from_value => sub { shift },
2608 %arg, 2827 %arg,
2609 ); 2828 );
2610 2829
2630sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2631sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2632 2851
2633############################################################################# 2852#############################################################################
2634 2853
2635package CFClient::UI::TextScroller; 2854package CFPlus::UI::TextScroller;
2636 2855
2637our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2638 2857
2639use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2640 2859
2641sub new { 2860sub new {
2642 my $class = shift; 2861 my $class = shift;
2643 2862
2644 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2646 can_events => 1, 2865 can_events => 1,
2647 indent => 0, 2866 indent => 0,
2648 #font => default_font 2867 #font => default_font
2649 @_, 2868 @_,
2650 2869
2651 layout => (new CFClient::Layout), 2870 layout => (new CFPlus::Layout),
2652 par => [], 2871 par => [],
2872 max_par => 0,
2653 height => 0, 2873 height => 0,
2654 children => [ 2874 children => [
2655 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2656 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2657 ], 2877 ],
2658 ); 2878 );
2659 2879
2660 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2661 2881
2738 2958
2739 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2740 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2741} 2961}
2742 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2743sub clear { 2978sub clear {
2744 my ($self) = @_; 2979 my ($self) = @_;
2745 2980
2746 my (undef, undef, @other) = @{ $self->{children} }; 2981 my (undef, undef, @other) = @{ $self->{children} };
2747 $self->remove ($_) for @other; 2982 $self->remove ($_) for @other;
2750 $self->{height} = 0; 2985 $self->{height} = 0;
2751 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752} 2987}
2753 2988
2754sub add_paragraph { 2989sub add_paragraph {
2755 my ($self, $color, $para, $indent) = @_; 2990 my $self = shift;
2756 2991
2757 my ($text, @w) = ref $para ? @$para : $para; 2992 for my $para (@_) {
2758
2759 $para = { 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2760 w => 1e10, 2999 w => 1e10,
2761 wrapped => 1, 3000 wrapped => 1,
2762 fg => $color,
2763 indent => $indent,
2764 markup => $text,
2765 widget => \@w,
2766 }; 3001 };
2767 3002
2768 $self->add (@w) if @w; 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769 push @{$self->{par}}, $para; 3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
2770 3010
2771 $self->{need_reflow}++; 3011 $self->{need_reflow}++;
2772 $self->update; 3012 $self->update;
2773} 3013}
2774 3014
2775sub scroll_to_bottom { 3015sub scroll_to_bottom {
2776 my ($self) = @_; 3016 my ($self) = @_;
2777 3017
2778 $self->{scroll_to_bottom} = 1; 3018 $self->{scroll_to} = $#{$self->{par}};
2779 $self->update; 3019 $self->update;
2780} 3020}
2781 3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
3044 $self->{height} = $height;
3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3046
3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
3053}
3054
2782sub update { 3055sub update {
2783 my ($self) = @_; 3056 my ($self) = @_;
2784 3057
2785 $self->SUPER::update; 3058 $self->SUPER::update;
2786 3059
2787 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2788 3061
2789 delete $self->{texture}; 3062 delete $self->{texture};
2790 3063
2791 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2792 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793 3068
2794 if (delete $self->{need_reflow}) {
2795 my $height = 0;
2796
2797 for my $para (@{$self->{par}}) {
2798 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2799 my $layout = $self->get_layout ($para);
2800 my ($w, $h) = $layout->size;
2801
2802 $para->{w} = $w + $para->{indent};
2803 $para->{h} = $h;
2804 $para->{wrapped} = $layout->has_wrapped;
2805 }
2806
2807 $height += $para->{h};
2808 }
2809
2810 $self->{height} = $height;
2811
2812 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2813
2814 delete $self->{texture};
2815 }
2816
2817 if (delete $self->{scroll_to_bottom}) {
2818 $self->{children}[1]->set_value (1e10);
2819 }
2820
2821 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2822 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2823 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2824 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2825 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2826 3082
2827 my $y0 = $top; 3083 my $y0 = $top;
2828 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2829 3085
2830 my $y = 0;
2831
2832 for my $para (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2833 my $h = $para->{h}; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2834 3089
2835 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2836
2837 my $layout = $self->get_layout ($para); 3091 my $layout = $self->get_layout ($para);
2838 3092
2839 $layout->render ($para->{indent}, $y - $y0); 3093 $layout->render ($para->{indent}, $y - $y0);
2840 3094
2841 if (my @w = @{ $para->{widget} }) { 3095 if (my @w = @{ $para->{widget} }) {
2850 $_->draw; 3104 $_->draw;
2851 } 3105 }
2852 } 3106 }
2853 } 3107 }
2854 3108
2855 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2856 } 3111 }
3112
3113 $self->{top_paragraph} = $top_paragraph;
2857 }; 3114 };
2858 }); 3115 });
2859} 3116}
2860 3117
2861sub reconfigure { 3118sub reconfigure {
2879 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2880} 3137}
2881 3138
2882############################################################################# 3139#############################################################################
2883 3140
2884package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2885 3142
2886use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2887 3144
2888our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2889 3146
2890sub moveto { 3147sub moveto {
2891 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2892 3149
2893 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
2921 glPopMatrix; 3178 glPopMatrix;
2922} 3179}
2923 3180
2924############################################################################# 3181#############################################################################
2925 3182
2926package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2927 3184
2928our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2929 3186
2930sub new { 3187sub new {
2931 my $class = shift; 3188 my $class = shift;
2932 3189
2933 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
2945 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2946} 3203}
2947 3204
2948############################################################################# 3205#############################################################################
2949 3206
2950package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2951 3208
2952our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2953 3210
2954use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2955 3212
2956sub new { 3213sub new {
2957 my $class = shift; 3214 my $class = shift;
2958 3215
2959 $class->SUPER::new ( 3216 $class->SUPER::new (
2962 ) 3219 )
2963} 3220}
2964 3221
2965sub set_tooltip_from { 3222sub set_tooltip_from {
2966 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2967 3227
2968 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2969 3229
2970 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2971 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
2975 } 3235 }
2976 3236
2977 $tooltip =~ s/^\n+//; 3237 $tooltip =~ s/^\n+//;
2978 $tooltip =~ s/\n+$//; 3238 $tooltip =~ s/\n+$//;
2979 3239
2980 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2981 markup => $tooltip, 3241 markup => $tooltip,
2982 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2983 fontsize => 0.8, 3243 fontsize => 0.8,
2984 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2985 ellipsise => 0, 3245 ellipsise => 0,
2986 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2987 ); 3247 );
2988} 3248}
2989 3249
3051 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
3052} 3312}
3053 3313
3054############################################################################# 3314#############################################################################
3055 3315
3056package CFClient::UI::Face; 3316package CFPlus::UI::Face;
3057 3317
3058our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
3059 3319
3060use CFClient::OpenGL; 3320use CFPlus::OpenGL;
3061 3321
3062sub new { 3322sub new {
3063 my $class = shift; 3323 my $class = shift;
3064 3324
3065 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
3067 can_events => 0, 3327 can_events => 0,
3068 @_, 3328 @_,
3069 ); 3329 );
3070 3330
3071 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
3072 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
3073 3333
3074 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
3075 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3076 hard => 1, 3336 hard => 1,
3077 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
3078 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
3079 ++$widget->{frame}; 3340 ++$widget->{frame};
3080 $widget->update; 3341 $widget->update;
3081 }, 3342 },
3082 ); 3343 );
3083 } 3344 }
3100sub _draw { 3361sub _draw {
3101 my ($self) = @_; 3362 my ($self) = @_;
3102 3363
3103 return unless $::CONN; 3364 return unless $::CONN;
3104 3365
3366 $self->SUPER::_draw;
3367
3105 my $face; 3368 my $face;
3106 3369
3107 if ($self->{frame}) { 3370 if ($self->{frame}) {
3108 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
3109 3372
3110 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
3111 if $anim && @$anim; 3374 if $anim && @$anim;
3112 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3113 3379
3114 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
3115 3381
3116 if ($tex) { 3382 if ($tex) {
3117 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
3118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3119 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
3120 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3121 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3122 } 3392 }
3123} 3393}
3124 3394
3125sub destroy { 3395sub destroy {
3126 my ($self) = @_; 3396 my ($self) = @_;
3131 $self->SUPER::destroy; 3401 $self->SUPER::destroy;
3132} 3402}
3133 3403
3134############################################################################# 3404#############################################################################
3135 3405
3136package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
3137 3407
3138our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
3139 3409
3140# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
3141 3411
3142############################################################################# 3412#############################################################################
3143 3413
3144package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
3145 3415
3146our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
3147 3417
3148use CFClient::OpenGL; 3418use CFPlus::OpenGL;
3149 3419
3150sub new { 3420sub new {
3151 my $class = shift; 3421 my $class = shift;
3152 3422
3153 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
3154 items => [], 3424 items => [],
3155 z => 100, 3425 z => 100,
3156 @_, 3426 @_,
3157 ); 3427 );
3158 3428
3159 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3160 3430
3161 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
3162 my ($widget, $cb, $tooltip) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
3163 3433
3164 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
3165 if (!ref $widget) { 3435 if (!ref $widget) {
3166 if ($widget =~ /\t/) { 3436 if ($widget =~ /\t/) {
3167 my ($left, $right) = split /\t/, $widget, 2; 3437 my ($left, $right) = split /\t/, $widget, 2;
3168 3438
3169 $widget = new CFClient::UI::HBox 3439 $widget = new CFPlus::UI::HBox
3170 can_hover => 1, 3440 can_hover => 1,
3171 can_events => 1, 3441 can_events => 1,
3172 tooltip => $tooltip, 3442 tooltip => $tooltip,
3173 children => [ 3443 children => [
3174 (new CFClient::UI::Label markup => $left, expand => 1), 3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3175 (new CFClient::UI::Label markup => $right, align => +1), 3445 (new CFPlus::UI::Label markup => $right, align => +1),
3176 ], 3446 ],
3177 ; 3447 ;
3178 3448
3179 } else { 3449 } else {
3180 $widget = new CFClient::UI::Label 3450 $widget = new CFPlus::UI::Label
3181 can_hover => 1, 3451 can_hover => 1,
3182 can_events => 1, 3452 can_events => 1,
3183 markup => $widget, 3453 markup => $widget,
3184 tooltip => $tooltip; 3454 tooltip => $tooltip;
3185 } 3455 }
3233 1 3503 1
3234} 3504}
3235 3505
3236############################################################################# 3506#############################################################################
3237 3507
3238package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
3239 3509
3240our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
3241 3511
3242sub new { 3512sub new {
3243 my $class = shift; 3513 my $class = shift;
3244 3514
3245 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
3306 $self->{current}->draw; 3576 $self->{current}->draw;
3307} 3577}
3308 3578
3309############################################################################# 3579#############################################################################
3310 3580
3311package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3312 3582
3313our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3314 3584
3315sub new { 3585sub new {
3316 my $class = shift; 3586 my $class = shift;
3317 3587
3318 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3319 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3320 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3321 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3322 @_, 3592 @_,
3323 ); 3593 );
3324 3594
3325 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3329} 3599}
3330 3600
3331sub add { 3601sub add {
3332 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3333 3603
3334 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3335 3605
3336 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3337 markup => $title, 3607 markup => $title,
3338 tooltip => $tooltip, 3608 tooltip => $tooltip,
3339 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3340 ); 3610 );
3341 3611
3355 $self->emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3356} 3626}
3357 3627
3358############################################################################# 3628#############################################################################
3359 3629
3360package CFClient::UI::Combobox; 3630package CFPlus::UI::Selector;
3361 3631
3362use utf8; 3632use utf8;
3363 3633
3364our @ISA = CFClient::UI::Button::; 3634our @ISA = CFPlus::UI::Button::;
3365 3635
3366sub new { 3636sub new {
3367 my $class = shift; 3637 my $class = shift;
3368 3638
3369 my $self = $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
3386 my ($value, $title, $tooltip) = @$_; 3656 my ($value, $title, $tooltip) = @$_;
3387 3657
3388 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389 } 3659 }
3390 3660
3391 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392} 3662}
3393 3663
3394sub _set_value { 3664sub _set_value {
3395 my ($self, $value) = @_; 3665 my ($self, $value) = @_;
3396 3666
3411 $self->emit (changed => $value); 3681 $self->emit (changed => $value);
3412} 3682}
3413 3683
3414############################################################################# 3684#############################################################################
3415 3685
3416package CFClient::UI::Statusbox; 3686package CFPlus::UI::Statusbox;
3417 3687
3418our @ISA = CFClient::UI::VBox::; 3688our @ISA = CFPlus::UI::VBox::;
3419 3689
3420sub new { 3690sub new {
3421 my $class = shift; 3691 my $class = shift;
3422 3692
3423 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3424 fontsize => 0.8, 3694 fontsize => 0.8,
3425 @_, 3695 @_,
3426 ); 3696 );
3427 3697
3428 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3429 3699
3430 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3431 3701
3432 $self 3702 $self
3433} 3703}
3435sub reorder { 3705sub reorder {
3436 my ($self) = @_; 3706 my ($self) = @_;
3437 my $NOW = Time::HiRes::time; 3707 my $NOW = Time::HiRes::time;
3438 3708
3439 # freeze display when hovering over any label 3709 # freeze display when hovering over any label
3440 return if $CFClient::UI::TOOLTIP->{owner} 3710 return if $CFPlus::UI::TOOLTIP->{owner}
3441 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3442 values %{ $self->{item} }; 3712 values %{ $self->{item} };
3443 3713
3444 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3445 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446 } 3716 }
3467 for ($short) { 3737 for ($short) {
3468 s/^\s+//; 3738 s/^\s+//;
3469 s/\s+/ /g; 3739 s/\s+/ /g;
3470 } 3740 }
3471 3741
3472 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3473 markup => $short, 3743 markup => $short,
3474 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3475 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3476 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3477 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
3556 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3557} 3827}
3558 3828
3559############################################################################# 3829#############################################################################
3560 3830
3561package CFClient::UI::Inventory;
3562
3563our @ISA = CFClient::UI::Table::;
3564
3565sub new {
3566 my $class = shift;
3567
3568 my $self = $class->SUPER::new (
3569 col_expand => [0, 1, 0],
3570 items => [],
3571 @_,
3572 );
3573
3574 $self->set_sort_order (undef);
3575
3576 $self
3577}
3578
3579sub update_items {
3580 my ($self) = @_;
3581
3582 $self->clear;
3583
3584 my @item = $self->{sort}->(@{ $self->{items} });
3585
3586 my @adds;
3587 my $row = 0;
3588 for my $item ($self->{sort}->(@{ $self->{items} })) {
3589 CFClient::Item::update_widgets $item;
3590
3591 push @adds, 0, $row, $item->{face_widget};
3592 push @adds, 1, $row, $item->{desc_widget};
3593 push @adds, 2, $row, $item->{weight_widget};
3594
3595 $row++;
3596 }
3597
3598 $self->add (@adds);
3599}
3600
3601sub set_sort_order {
3602 my ($self, $order) = @_;
3603
3604 $self->{sort} = $order ||= sub {
3605 sort {
3606 $a->{type} <=> $b->{type}
3607 or $a->{name} cmp $b->{name}
3608 } @_
3609 };
3610
3611 $self->update_items;
3612}
3613
3614sub set_items {
3615 my ($self, $items) = @_;
3616
3617 $self->{items} = [$items ? values %$items : ()];
3618 $self->update_items;
3619}
3620
3621#############################################################################
3622
3623package CFClient::UI::SpellList;
3624
3625our @ISA = CFClient::UI::Table::;
3626
3627sub new {
3628 my $class = shift;
3629
3630 my $self = $class->SUPER::new (
3631 binding => [],
3632 commands => [],
3633 @_,
3634 )
3635}
3636
3637my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650sub rebuild_spell_list {
3651 my ($self) = @_;
3652
3653 $CFClient::UI::ROOT->on_refresh ($self => sub {
3654 $self->clear;
3655
3656 return unless $::CONN;
3657
3658 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664 my $row = 0;
3665
3666 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667 my $spell = $self->{spell}{$_};
3668
3669 $row++;
3670
3671 my $spell_cb = sub {
3672 my ($widget, $ev) = @_;
3673
3674 if ($ev->{button} == 1) {
3675 $::CONN->user_send ("cast $spell->{name}");
3676 } elsif ($ev->{button} == 2) {
3677 $::CONN->user_send ("invoke $spell->{name}");
3678 } elsif ($ev->{button} == 3) {
3679 (new CFClient::UI::Menu
3680 items => [
3681 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683 ],
3684 )->popup ($ev);
3685 } else {
3686 return 0;
3687 }
3688
3689 1
3690 };
3691
3692 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694 #TODO: add path info to tooltip
3695 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697 $self->add (0, $row, new CFClient::UI::Face
3698 face => $spell->{face},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (1, $row, new CFClient::UI::Label
3706 expand => 1,
3707 text => $spell->{name},
3708 can_hover => 1,
3709 can_events => 1,
3710 tooltip => $tooltip,
3711 on_button_down => $spell_cb,
3712 );
3713
3714 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718 }
3719 });
3720}
3721
3722sub add_spell {
3723 my ($self, $spell) = @_;
3724
3725 $self->{spell}->{$spell->{name}} = $spell;
3726 $self->rebuild_spell_list;
3727}
3728
3729sub remove_spell {
3730 my ($self, $spell) = @_;
3731
3732 delete $self->{spell}->{$spell->{name}};
3733 $self->rebuild_spell_list;
3734}
3735
3736sub clear_spells {
3737 my ($self) = @_;
3738
3739 $self->{spell} = {};
3740 $self->rebuild_spell_list;
3741}
3742
3743#############################################################################
3744
3745package CFClient::UI::Root; 3831package CFPlus::UI::Root;
3746 3832
3747our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3748 3834
3749use List::Util qw(min max); 3835use List::Util qw(min max);
3750 3836
3751use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3752 3838
3753sub new { 3839sub new {
3754 my $class = shift; 3840 my $class = shift;
3755 3841
3756 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3757 visible => 1, 3843 visible => 1,
3758 @_, 3844 @_,
3759 ); 3845 );
3760 3846
3761 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3762 3848
3763 $self 3849 $self
3764} 3850}
3765 3851
3766sub size_request { 3852sub size_request {
3935 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
3936 4022
3937 $w = max $widget->{min_w}, $w; 4023 $w = max $widget->{min_w}, $w;
3938 $h = max $widget->{min_h}, $h; 4024 $h = max $widget->{min_h}, $h;
3939 4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
3940 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942 4031
3943 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3944 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3970 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
3972 glLoadIdentity; 4061 glLoadIdentity;
3973 4062
3974 { 4063 {
3975 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
3976 4065
3977 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3979 }
3980 4068
3981 $self->_draw; 4069 $self->_draw;
4070 }
3982} 4071}
3983 4072
3984############################################################################# 4073#############################################################################
3985 4074
3986package CFClient::UI; 4075package CFPlus::UI;
3987 4076
3988$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
3989$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3990 4079
39911 40801
3992 4081

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines