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.338 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 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, CFClient::ceil $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $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
949use List::Util qw(min max);
950
931our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
932 952
933sub new { 953sub new {
934 my $class = shift; 954 my $class = shift;
935 955
936 $class->SUPER::new ( 956 $class->SUPER::new (
… …
966} 986}
967 987
968sub set_offset { 988sub set_offset {
969 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
970 990
971 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
972 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
973 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
974 $self->update; 995 $self->update;
975} 996}
976 997
977# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 999sub coord2local {
… …
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1019 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1021 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1023 }
1003} 1024}
1004 1025
1005sub _render { 1026sub _render {
1006 my ($self) = @_; 1027 my ($self) = @_;
1007 1028
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 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}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1031
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1033
1013 $self->SUPER::_render; 1034 $self->SUPER::_render;
1014} 1035}
1015 1036
1016############################################################################# 1037#############################################################################
1017 1038
1018package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1019 1040
1020our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1021 1042
1022sub new { 1043sub new {
1023 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1024 1045
1025 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1026 1047
1027 my $self; 1048 my $self;
1028 1049
1029 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
1030 vertical => 1, 1060 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1062 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1065 },
1035 ; 1066 ;
1036 1067
1037 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1039 can_events => 1, 1071 can_events => 1,
1040 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1041 %arg, 1076 %arg,
1042 ); 1077 );
1043 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
1045 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
1046 1095
1047 $self 1096 $self
1048} 1097}
1049 1098
… …
1053 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1054 1103
1055 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1056} 1105}
1057 1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136}
1137
1058sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1060 1140
1061 return 0 unless $ev->{dy}; # only vertical movements 1141 return 0 unless $ev->{dy}; # only vertical movements for now
1062 1142
1063 $self->{slider}->emit (mouse_wheel => $ev); 1143 $self->{vslider}->emit (mouse_wheel => $ev);
1064 1144
1065 1 1145 1
1066} 1146}
1067 1147
1068sub update_slider { 1148sub invoke_button_down {
1069 my ($self) = @_; 1149 my ($self, $ev, $x, $y) = @_;
1070 1150
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1151 if ($ev->{button} == 2) {
1072} 1152 $self->grab_focus;
1073 1153
1074sub update { 1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1075 my ($self) = @_; 1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1076 1159
1077 $self->SUPER::update; 1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1078 1163
1079 $self->update_slider; 1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1080} 1189}
1081 1190
1082sub invoke_size_allocate { 1191sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1084 1193
1085 $self->update_slider; 1194 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1196}
1089 1197
1090############################################################################# 1198#############################################################################
1091 1199
1092package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1093 1201
1094our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1095 1203
1096use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1097 1205
1098sub new { 1206sub new {
1099 my $class = shift; 1207 my $class = shift;
1100 1208
1101 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1128} 1236}
1129 1237
1130############################################################################# 1238#############################################################################
1131 1239
1132package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1133 1241
1134our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1135 1243
1136use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1137 1345
1138my $bg = 1346my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1141 1349
1142my @border = 1350my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 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); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145 1353
1146sub new { 1354sub new {
1147 my ($class, %arg) = @_; 1355 my ($class, %arg) = @_;
1148 1356
… …
1154 min_w => 64, 1362 min_w => 64,
1155 min_h => 32, 1363 min_h => 32,
1156 %arg, 1364 %arg,
1157 ); 1365 );
1158 1366
1159 $self->{title_widget} = new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1368 align => 0,
1161 valign => 1, 1369 valign => 1,
1162 text => $self->{title}, 1370 text => $self->{title},
1163 fontsize => $self->{border}, 1371 fontsize => $self->{border},
1164 if exists $self->{title}; 1372 if exists $self->{title};
1165 1373
1166 if ($self->{has_close_button}) { 1374 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1375 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1376 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1377 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1378 on_activate => sub { $self->emit ("delete") };
1171 1379
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1381 }
1174 1382
1175 $self 1383 $self
1176} 1384}
1177 1385
1178sub add { 1386sub add {
1179 my ($self, @widgets) = @_; 1387 my ($self, @widgets) = @_;
1180 1388
1181 $self->SUPER::add (@widgets); 1389 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1390 $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}; 1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1392}
1185 1393
1186sub border { 1394sub border {
1187 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
1188} 1396}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1505
1298 ! ! $self->{motion} 1506 ! ! $self->{motion}
1299} 1507}
1300 1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1515}
1516
1301sub _draw { 1517sub _draw {
1302 my ($self) = @_; 1518 my ($self) = @_;
1303 1519
1304 my $child = $self->{children}[0]; 1520 my $child = $self->{children}[0];
1305 1521
… …
1342 if $self->{close_button}; 1558 if $self->{close_button};
1343} 1559}
1344 1560
1345############################################################################# 1561#############################################################################
1346 1562
1347package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1348 1564
1349our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1350 1566
1351use List::Util qw(max sum); 1567use List::Util qw(max sum);
1352 1568
1353use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1354 1570
1355sub new { 1571sub new {
1356 my $class = shift; 1572 my $class = shift;
1357 1573
1358 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1359 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1360 @_, 1578 @_,
1361 ) 1579 )
1362} 1580}
1363 1581
1364sub children { 1582sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366} 1584}
1367 1585
1586# TODO: store row/col info in child widget and use standard add/del
1368sub add { 1587sub add {
1369 my ($self) = shift; 1588 my ($self) = shift;
1370 1589
1371 while (@_) { 1590 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self); 1592 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1375 } 1594 }
1376 1595
1377 $self->{force_realloc} = 1; 1596 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1; 1597 $self->{force_size_alloc} = 1;
1379 $self->realloc; 1598 $self->realloc;
1380} 1599}
1381 1600
1382sub remove { 1601sub remove {
1383 my ($self, $child) = @_; 1602 my ($self, $child) = @_;
1384 1603
1385 # TODO: not yet implemented 1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1386} 1609}
1387 1610
1388# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1389sub clear { 1612sub clear {
1390 my ($self) = @_; 1613 my ($self) = @_;
… …
1439 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1440 1663
1441 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1443 1666
1444 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1445 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1448 1671
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1673
1453 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1454 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1455 1683
1456 my $y; 1684 my $y;
1457 1685
1458 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1459 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1502 } 1730 }
1503} 1731}
1504 1732
1505############################################################################# 1733#############################################################################
1506 1734
1507package CFClient::UI::Box; 1735package CFPlus::UI::Fixed;
1508 1736
1737use List::Util qw(min max);
1738
1509our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1510 1820
1511sub size_request { 1821sub size_request {
1512 my ($self) = @_; 1822 my ($self) = @_;
1513 1823
1514 $self->{vertical} 1824 $self->{vertical}
… …
1547 $req[$_] += $space * $children[$_]{expand} 1857 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1858 for 0 .. $#children;
1549 } 1859 }
1550 } 1860 }
1551 1861
1552 CFClient::UI::harmonize \@req; 1862 CFPlus::UI::harmonize \@req;
1553 1863
1554 my $pos = 0; 1864 my $pos = 0;
1555 for (0 .. $#children) { 1865 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1866 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1872 1
1563} 1873}
1564 1874
1565############################################################################# 1875#############################################################################
1566 1876
1567package CFClient::UI::HBox; 1877package CFPlus::UI::HBox;
1568 1878
1569our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1570 1880
1571sub new { 1881sub new {
1572 my $class = shift; 1882 my $class = shift;
1573 1883
1574 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1577 ) 1887 )
1578} 1888}
1579 1889
1580############################################################################# 1890#############################################################################
1581 1891
1582package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1583 1893
1584our @ISA = CFClient::UI::Box::; 1894our @ISA = CFPlus::UI::Box::;
1585 1895
1586sub new { 1896sub new {
1587 my $class = shift; 1897 my $class = shift;
1588 1898
1589 $class->SUPER::new ( 1899 $class->SUPER::new (
… …
1592 ) 1902 )
1593} 1903}
1594 1904
1595############################################################################# 1905#############################################################################
1596 1906
1597package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1598 1908
1599our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1600 1910
1601use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1602 1912
1603sub new { 1913sub new {
1604 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1605 1915
1606 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1919 #active_bg => none
1610 #font => default_font 1920 #font => default_font
1611 #text => initial text 1921 #text => initial text
1612 #markup => initial narkup 1922 #markup => initial narkup
1613 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1614 ellipsise => 3, # end 1925 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1927 fontsize => 1,
1617 align => -1, 1928 align => -1,
1618 valign => -1, 1929 valign => -1,
1619 padding_x => 2, 1930 padding_x => 2,
1620 padding_y => 2, 1931 padding_y => 2,
1621 can_events => 0, 1932 can_events => 0,
1622 %arg 1933 %arg
1623 ); 1934 );
1624 1935
1625 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1939 $self->{template} = $layout;
1629 } 1940 }
1630 1941
1631 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1769 }; 2080 };
1770 2081
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
1773 2084
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2086}
1776 2087
1777############################################################################# 2088#############################################################################
1778 2089
1779package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1780 2091
1781our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1782 2093
1783use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1784 2095
1785sub new { 2096sub new {
1786 my $class = shift; 2097 my $class = shift;
1787 2098
1788 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1792 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1793 can_hover => 1, 2104 can_hover => 1,
1794 can_focus => 1, 2105 can_focus => 1,
1795 valign => 0, 2106 valign => 0,
1796 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1797 #text => ... 2109 #text => ...
1798 #hidden => "*", 2110 #hidden => "*",
1799 @_ 2111 @_
1800 ) 2112 )
1801} 2113}
… …
1846 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1848 2160
1849 my $text = $self->get_text; 2161 my $text = $self->get_text;
1850 2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2164
1851 if ($uni == 8) { 2165 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1860 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2189 $self->emit ('escape');
1865 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2194 } else {
1868 return 0; 2195 return 0;
1869 } 2196 }
1870 2197
1871 $self->_set_text ($text); 2198 $self->_set_text ($text);
1872 2199
1873 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1874 2202
1875 1 2203 1
1876} 2204}
1877 2205
1878sub invoke_focus_in { 2206sub invoke_focus_in {
… …
1940 utf8::encode $text; 2268 utf8::encode $text;
1941 2269
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943 } 2271 }
1944 2272
1945 glColor @{$self->{fg}};
1946 glBegin GL_LINES; 2273 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2276 glEnd;
1950 } 2277 }
1951} 2278}
1952 2279
2280#############################################################################
2281
1953package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1954 2283
1955our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1956 2285
1957use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1958 2287
1959sub invoke_key_down { 2288sub invoke_key_down {
1960 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1961 2290
1962 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1963 2292
1964 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
1967 2296
1968 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2299 $self->emit (activate => $txt);
1971 $self->update; 2300 $self->update;
1972 2301
1973 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1976 } 2305 }
1977 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2310 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2312 }
1984 2313
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2317
1989 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2328 1
2000} 2329}
2001 2330
2002############################################################################# 2331#############################################################################
2003 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
2004package CFClient::UI::Button; 2372package CFPlus::UI::Button;
2005 2373
2006our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
2007 2375
2008use CFClient::OpenGL; 2376use CFPlus::OpenGL;
2009 2377
2010my @tex = 2378my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
2013 2381
2014sub new { 2382sub new {
2015 my $class = shift; 2383 my $class = shift;
2016 2384
… …
2053 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
2054} 2422}
2055 2423
2056############################################################################# 2424#############################################################################
2057 2425
2058package CFClient::UI::CheckBox; 2426package CFPlus::UI::CheckBox;
2059 2427
2060our @ISA = CFClient::UI::DrawBG::; 2428our @ISA = CFPlus::UI::DrawBG::;
2061 2429
2062my @tex = 2430my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2433
2066use CFClient::OpenGL; 2434use CFPlus::OpenGL;
2067 2435
2068sub new { 2436sub new {
2069 my $class = shift; 2437 my $class = shift;
2070 2438
2071 $class->SUPER::new ( 2439 $class->SUPER::new (
… …
2128 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2129} 2497}
2130 2498
2131############################################################################# 2499#############################################################################
2132 2500
2133package CFClient::UI::Image; 2501package CFPlus::UI::Image;
2134 2502
2135our @ISA = CFClient::UI::Base::; 2503our @ISA = CFPlus::UI::Base::;
2136 2504
2137use CFClient::OpenGL; 2505use CFPlus::OpenGL;
2138 2506
2139our %texture_cache; 2507our %texture_cache;
2140 2508
2141sub new { 2509sub new {
2142 my $class = shift; 2510 my $class = shift;
… …
2148 2516
2149 $self->{path} || $self->{tex} 2517 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2518 or Carp::croak "'path' or 'tex' attributes required";
2151 2519
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154 2522
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
2156 2524
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2526
2159 $self 2527 $self
2160} 2528}
2161 2529
2162sub STORABLE_freeze { 2530sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2531 my ($self, $cloning) = @_;
2164 2532
2165 $self->{path} 2533 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167 2535
2168 $self->{path} 2536 $self->{path}
2169} 2537}
2170 2538
2171sub STORABLE_attach { 2539sub STORABLE_attach {
… …
2202 glDisable GL_TEXTURE_2D; 2570 glDisable GL_TEXTURE_2D;
2203} 2571}
2204 2572
2205############################################################################# 2573#############################################################################
2206 2574
2207package CFClient::UI::ImageButton; 2575package CFPlus::UI::ImageButton;
2208 2576
2209our @ISA = CFClient::UI::Image::; 2577our @ISA = CFPlus::UI::Image::;
2210 2578
2211use CFClient::OpenGL; 2579use CFPlus::OpenGL;
2212 2580
2213my %textures; 2581my %textures;
2214 2582
2215sub new { 2583sub new {
2216 my $class = shift; 2584 my $class = shift;
… …
2238 1 2606 1
2239} 2607}
2240 2608
2241############################################################################# 2609#############################################################################
2242 2610
2243package CFClient::UI::VGauge; 2611package CFPlus::UI::VGauge;
2244 2612
2245our @ISA = CFClient::UI::Base::; 2613our @ISA = CFPlus::UI::Base::;
2246 2614
2247use List::Util qw(min max); 2615use List::Util qw(min max);
2248 2616
2249use CFClient::OpenGL; 2617use CFPlus::OpenGL;
2250 2618
2251my %tex = ( 2619my %tex = (
2252 food => [ 2620 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2623 ],
2256 grace => [ 2624 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2627 ],
2260 hp => [ 2628 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2631 ],
2264 mana => [ 2632 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2635 ],
2268); 2636);
2269 2637
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2374} 2742}
2375 2743
2376############################################################################# 2744#############################################################################
2377 2745
2378package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2379 2747
2380our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2381 2749
2382sub new { 2750sub new {
2383 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2384 2752
2385 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2755 can_hover => 1,
2388 can_events => 1, 2756 can_events => 1,
2389 %arg, 2757 %arg,
2390 ); 2758 );
2391 2759
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2763
2396 $self 2764 $self
2397} 2765}
2398 2766
2399sub set_fontsize { 2767sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2421} 2789}
2422 2790
2423############################################################################# 2791#############################################################################
2424 2792
2425package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2426 2794
2427use strict; 2795use strict;
2428 2796
2429use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2430 2798
2431our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2432 2800
2433my @tex = 2801my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2436 2804
2437sub new { 2805sub new {
2438 my $class = shift; 2806 my $class = shift;
2439 2807
… …
2533sub invoke_mouse_wheel { 2901sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 2902 my ($self, $ev) = @_;
2535 2903
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 2909
2540 ! ! $delta 2910 ! ! $delta
2541} 2911}
2542 2912
2543sub update { 2913sub update {
… …
2594 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2595} 2965}
2596 2966
2597############################################################################# 2967#############################################################################
2598 2968
2599package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2600 2970
2601our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2602 2972
2603sub new { 2973sub new {
2604 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2605 2975
2606 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2607 2977
2608 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 2981 to_value => sub { shift },
2612 from_value => sub { shift }, 2982 from_value => sub { shift },
2613 %arg, 2983 %arg,
2614 ); 2984 );
2615 2985
… …
2635sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2637 3007
2638############################################################################# 3008#############################################################################
2639 3009
2640package CFClient::UI::TextScroller; 3010package CFPlus::UI::TextScroller;
2641 3011
2642our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2643 3013
2644use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2645 3015
2646sub new { 3016sub new {
2647 my $class = shift; 3017 my $class = shift;
2648 3018
2649 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3021 can_events => 1,
2652 indent => 0, 3022 indent => 0,
2653 #font => default_font 3023 #font => default_font
2654 @_, 3024 @_,
2655 3025
2656 layout => (new CFClient::Layout), 3026 layout => (new CFPlus::Layout),
2657 par => [], 3027 par => [],
3028 max_par => 0,
2658 height => 0, 3029 height => 0,
2659 children => [ 3030 children => [
2660 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2662 ], 3033 ],
2663 ); 3034 );
2664 3035
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3037
… …
2741sub set_offset { 3112sub set_offset {
2742 my ($self, $offset) = @_; 3113 my ($self, $offset) = @_;
2743 3114
2744 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
3117}
3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
2746} 3132}
2747 3133
2748sub clear { 3134sub clear {
2749 my ($self) = @_; 3135 my ($self) = @_;
2750 3136
… …
2772 3158
2773 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3160 push @{$self->{par}}, $para;
2775 } 3161 }
2776 3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
3166
2777 $self->{need_reflow}++; 3167 $self->{need_reflow}++;
2778 $self->update; 3168 $self->update;
2779} 3169}
2780 3170
2781sub scroll_to_bottom { 3171sub scroll_to_bottom {
2782 my ($self) = @_; 3172 my ($self) = @_;
2783 3173
2784 $self->{scroll_to_bottom} = 1; 3174 $self->{scroll_to} = $#{$self->{par}};
2785 $self->update; 3175 $self->update;
2786} 3176}
2787 3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
3200 $self->{height} = $height;
3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3202
3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
3209}
3210
2788sub update { 3211sub update {
2789 my ($self) = @_; 3212 my ($self) = @_;
2790 3213
2791 $self->SUPER::update; 3214 $self->SUPER::update;
2792 3215
2793 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2794 3217
2795 delete $self->{texture}; 3218 delete $self->{texture};
2796 3219
2797 $ROOT->on_post_alloc ($self => sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2798 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2799 3224
2800 if (delete $self->{need_reflow}) {
2801 my $height = 0;
2802
2803 for my $para (@{$self->{par}}) {
2804 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2805 my $layout = $self->get_layout ($para);
2806 my ($w, $h) = $layout->size;
2807
2808 $para->{w} = $w + $para->{indent};
2809 $para->{h} = $h;
2810 $para->{wrapped} = $layout->has_wrapped;
2811 }
2812
2813 $height += $para->{h};
2814 }
2815
2816 $self->{height} = $height;
2817
2818 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2819
2820 delete $self->{texture};
2821 }
2822
2823 if (delete $self->{scroll_to_bottom}) {
2824 $self->{children}[1]->set_value (1e10);
2825 }
2826
2827 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2828 glClearColor 0, 0, 0, 0; 3226 glClearColor 0, 0, 0, 0;
2829 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2830 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2831 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2832 3238
2833 my $y0 = $top; 3239 my $y0 = $top;
2834 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2835 3241
2836 my $y = 0;
2837
2838 for my $para (@{$self->{par}}) { 3242 for my $para (@{$self->{par}}) {
2839 my $h = $para->{h}; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2840 3245
2841 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2842
2843 my $layout = $self->get_layout ($para); 3247 my $layout = $self->get_layout ($para);
2844 3248
2845 $layout->render ($para->{indent}, $y - $y0); 3249 $layout->render ($para->{indent}, $y - $y0);
2846 3250
2847 if (my @w = @{ $para->{widget} }) { 3251 if (my @w = @{ $para->{widget} }) {
… …
2856 $_->draw; 3260 $_->draw;
2857 } 3261 }
2858 } 3262 }
2859 } 3263 }
2860 3264
2861 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2862 } 3267 }
3268
3269 $self->{top_paragraph} = $top_paragraph;
2863 }; 3270 };
2864 }); 3271 });
2865} 3272}
2866 3273
2867sub reconfigure { 3274sub reconfigure {
… …
2885 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2886} 3293}
2887 3294
2888############################################################################# 3295#############################################################################
2889 3296
2890package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2891 3298
2892use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2893 3300
2894our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2895 3302
2896sub moveto { 3303sub moveto {
2897 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2898 3305
2899 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2927 glPopMatrix; 3334 glPopMatrix;
2928} 3335}
2929 3336
2930############################################################################# 3337#############################################################################
2931 3338
2932package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2933 3340
2934our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2935 3342
2936sub new { 3343sub new {
2937 my $class = shift; 3344 my $class = shift;
2938 3345
2939 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
… …
2951 $self->{other}->toggle_visibility; 3358 $self->{other}->toggle_visibility;
2952} 3359}
2953 3360
2954############################################################################# 3361#############################################################################
2955 3362
2956package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2957 3364
2958our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2959 3366
2960use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2961 3368
2962sub new { 3369sub new {
2963 my $class = shift; 3370 my $class = shift;
2964 3371
2965 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2968 ) 3375 )
2969} 3376}
2970 3377
2971sub set_tooltip_from { 3378sub set_tooltip_from {
2972 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
2973 3383
2974 my $tooltip = $widget->{tooltip}; 3384 my $tooltip = $widget->{tooltip};
2975 3385
2976 if ($ENV{CFPLUS_DEBUG} & 2) { 3386 if ($ENV{CFPLUS_DEBUG} & 2) {
2977 $tooltip .= "\n\n" . (ref $widget) . "\n" 3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2981 } 3391 }
2982 3392
2983 $tooltip =~ s/^\n+//; 3393 $tooltip =~ s/^\n+//;
2984 $tooltip =~ s/\n+$//; 3394 $tooltip =~ s/\n+$//;
2985 3395
2986 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2987 markup => $tooltip, 3397 markup => $tooltip,
2988 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2989 fontsize => 0.8, 3399 fontsize => 0.8,
2990 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2991 ellipsise => 0, 3401 ellipsise => 0,
2992 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2993 ); 3403 );
2994} 3404}
2995 3405
… …
3057 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
3058} 3468}
3059 3469
3060############################################################################# 3470#############################################################################
3061 3471
3062package CFClient::UI::Face; 3472package CFPlus::UI::Face;
3063 3473
3064our @ISA = CFClient::UI::DrawBG::; 3474our @ISA = CFPlus::UI::DrawBG::;
3065 3475
3066use CFClient::OpenGL; 3476use CFPlus::OpenGL;
3067 3477
3068sub new { 3478sub new {
3069 my $class = shift; 3479 my $class = shift;
3070 3480
3071 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
3072 aspect => 1, 3484 aspect => 1,
3073 can_events => 0, 3485 can_events => 0,
3074 @_, 3486 @_,
3075 ); 3487 );
3076 3488
3077 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
3078 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
3079 3491
3080 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
3081 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3082 hard => 1, 3494 hard => 1,
3083 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
3084 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
3085 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
3086 $widget->update; 3501 $self->update;
3087 }, 3502 },
3088 ); 3503 );
3504
3505 $self->update_face;
3089 } 3506 }
3090 3507
3091 $self 3508 $self
3092} 3509}
3093 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
3094sub size_request { 3524sub size_request {
3095 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
3096} 3540}
3097 3541
3098sub update { 3542sub update {
3099 my ($self) = @_; 3543 my ($self) = @_;
3100 3544
… …
3108 3552
3109 return unless $::CONN; 3553 return unless $::CONN;
3110 3554
3111 $self->SUPER::_draw; 3555 $self->SUPER::_draw;
3112 3556
3113 my $face;
3114
3115 if ($self->{frame}) {
3116 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
3117 3558 or return;
3118 $face = $anim->[ $self->{frame} % @$anim ]
3119 if $anim && @$anim;
3120 }
3121 3559
3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
3123 3561
3124 if ($tex) { 3562 if ($tex) {
3125 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3127 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
… …
3139 $self->SUPER::destroy; 3577 $self->SUPER::destroy;
3140} 3578}
3141 3579
3142############################################################################# 3580#############################################################################
3143 3581
3144package CFClient::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
3145 3583
3146our @ISA = CFClient::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
3147 3585
3148# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
3149 3587
3150############################################################################# 3588#############################################################################
3151 3589
3152package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
3153 3591
3154our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
3155 3593
3156use CFClient::OpenGL; 3594use CFPlus::OpenGL;
3157 3595
3158sub new { 3596sub new {
3159 my $class = shift; 3597 my $class = shift;
3160 3598
3161 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
3162 items => [], 3600 items => [],
3163 z => 100, 3601 z => 100,
3164 @_, 3602 @_,
3165 ); 3603 );
3166 3604
3167 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3168 3606
3169 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
3170 my ($widget, $cb, $tooltip) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
3171 3609
3172 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
3173 if (!ref $widget) { 3611 if (!ref $widget) {
3174 if ($widget =~ /\t/) { 3612 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2; 3613 my ($left, $right) = split /\t/, $widget, 2;
3176 3614
3177 $widget = new CFClient::UI::HBox 3615 $widget = new CFPlus::UI::HBox
3178 can_hover => 1, 3616 can_hover => 1,
3179 can_events => 1, 3617 can_events => 1,
3180 tooltip => $tooltip, 3618 tooltip => $tooltip,
3181 children => [ 3619 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1), 3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1), 3621 (new CFPlus::UI::Label markup => $right, align => +1),
3184 ], 3622 ],
3185 ; 3623 ;
3186 3624
3187 } else { 3625 } else {
3188 $widget = new CFClient::UI::Label 3626 $widget = new CFPlus::UI::Label
3189 can_hover => 1, 3627 can_hover => 1,
3190 can_events => 1, 3628 can_events => 1,
3191 markup => $widget, 3629 markup => $widget,
3192 tooltip => $tooltip; 3630 tooltip => $tooltip;
3193 } 3631 }
… …
3241 1 3679 1
3242} 3680}
3243 3681
3244############################################################################# 3682#############################################################################
3245 3683
3246package CFClient::UI::Multiplexer; 3684package CFPlus::UI::Multiplexer;
3247 3685
3248our @ISA = CFClient::UI::Container::; 3686our @ISA = CFPlus::UI::Container::;
3249 3687
3250sub new { 3688sub new {
3251 my $class = shift; 3689 my $class = shift;
3252 3690
3253 my $self = $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
… …
3314 $self->{current}->draw; 3752 $self->{current}->draw;
3315} 3753}
3316 3754
3317############################################################################# 3755#############################################################################
3318 3756
3319package CFClient::UI::Notebook; 3757package CFPlus::UI::Notebook;
3320 3758
3321our @ISA = CFClient::UI::VBox::; 3759our @ISA = CFPlus::UI::VBox::;
3322 3760
3323sub new { 3761sub new {
3324 my $class = shift; 3762 my $class = shift;
3325 3763
3326 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3327 buttonbar => (new CFClient::UI::Buttonbar), 3765 buttonbar => (new CFPlus::UI::Buttonbar),
3328 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3329 # filter => # will be put between multiplexer and $self 3767 # filter => # will be put between multiplexer and $self
3330 @_, 3768 @_,
3331 ); 3769 );
3332 3770
3333 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3337} 3775}
3338 3776
3339sub add { 3777sub add {
3340 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3341 3779
3342 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3343 3781
3344 $self->{buttonbar}->add (new CFClient::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3345 markup => $title, 3783 markup => $title,
3346 tooltip => $tooltip, 3784 tooltip => $tooltip,
3347 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
3348 ); 3786 );
3349 3787
… …
3363 $self->emit (page_changed => $self->{multiplexer}{current}); 3801 $self->emit (page_changed => $self->{multiplexer}{current});
3364} 3802}
3365 3803
3366############################################################################# 3804#############################################################################
3367 3805
3368package CFClient::UI::Selector; 3806package CFPlus::UI::Selector;
3369 3807
3370use utf8; 3808use utf8;
3371 3809
3372our @ISA = CFClient::UI::Button::; 3810our @ISA = CFPlus::UI::Button::;
3373 3811
3374sub new { 3812sub new {
3375 my $class = shift; 3813 my $class = shift;
3376 3814
3377 my $self = $class->SUPER::new ( 3815 my $self = $class->SUPER::new (
… …
3394 my ($value, $title, $tooltip) = @$_; 3832 my ($value, $title, $tooltip) = @$_;
3395 3833
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 } 3835 }
3398 3836
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400} 3838}
3401 3839
3402sub _set_value { 3840sub _set_value {
3403 my ($self, $value) = @_; 3841 my ($self, $value) = @_;
3404 3842
… …
3419 $self->emit (changed => $value); 3857 $self->emit (changed => $value);
3420} 3858}
3421 3859
3422############################################################################# 3860#############################################################################
3423 3861
3424package CFClient::UI::Statusbox; 3862package CFPlus::UI::Statusbox;
3425 3863
3426our @ISA = CFClient::UI::VBox::; 3864our @ISA = CFPlus::UI::VBox::;
3427 3865
3428sub new { 3866sub new {
3429 my $class = shift; 3867 my $class = shift;
3430 3868
3431 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3432 fontsize => 0.8, 3870 fontsize => 0.8,
3433 @_, 3871 @_,
3434 ); 3872 );
3435 3873
3436 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3437 3875
3438 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439 3877
3440 $self 3878 $self
3441} 3879}
… …
3443sub reorder { 3881sub reorder {
3444 my ($self) = @_; 3882 my ($self) = @_;
3445 my $NOW = Time::HiRes::time; 3883 my $NOW = Time::HiRes::time;
3446 3884
3447 # freeze display when hovering over any label 3885 # freeze display when hovering over any label
3448 return if $CFClient::UI::TOOLTIP->{owner} 3886 return if $CFPlus::UI::TOOLTIP->{owner}
3449 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3450 values %{ $self->{item} }; 3888 values %{ $self->{item} };
3451 3889
3452 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
3453 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3454 } 3892 }
… …
3475 for ($short) { 3913 for ($short) {
3476 s/^\s+//; 3914 s/^\s+//;
3477 s/\s+/ /g; 3915 s/\s+/ /g;
3478 } 3916 }
3479 3917
3480 new CFClient::UI::Label 3918 new CFPlus::UI::Label
3481 markup => $short, 3919 markup => $short,
3482 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
3483 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
3484 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
3485 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3564 $self->SUPER::destroy; 4002 $self->SUPER::destroy;
3565} 4003}
3566 4004
3567############################################################################# 4005#############################################################################
3568 4006
3569package CFClient::UI::Inventory;
3570
3571our @ISA = CFClient::UI::Table::;
3572
3573sub new {
3574 my $class = shift;
3575
3576 my $self = $class->SUPER::new (
3577 col_expand => [0, 1, 0],
3578 items => [],
3579 @_,
3580 );
3581
3582 $self->set_sort_order (undef);
3583
3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3620}
3621
3622sub set_items {
3623 my ($self, $items) = @_;
3624
3625 $self->{items} = [$items ? values %$items : ()];
3626 $self->update_items;
3627}
3628
3629#############################################################################
3630
3631package CFClient::UI::SpellList;
3632
3633our @ISA = CFClient::UI::Table::;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 binding => [],
3640 commands => [],
3641 @_,
3642 )
3643}
3644
3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658sub rebuild_spell_list {
3659 my ($self) = @_;
3660
3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3662 $self->clear;
3663
3664 return unless $::CONN;
3665
3666 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672 my $row = 0;
3673
3674 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675 my $spell = $self->{spell}{$_};
3676
3677 $row++;
3678
3679 my $spell_cb = sub {
3680 my ($widget, $ev) = @_;
3681
3682 if ($ev->{button} == 1) {
3683 $::CONN->user_send ("cast $spell->{name}");
3684 } elsif ($ev->{button} == 2) {
3685 $::CONN->user_send ("invoke $spell->{name}");
3686 } elsif ($ev->{button} == 3) {
3687 (new CFClient::UI::Menu
3688 items => [
3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691 ],
3692 )->popup ($ev);
3693 } else {
3694 return 0;
3695 }
3696
3697 1
3698 };
3699
3700 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702 #TODO: add path info to tooltip
3703 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705 $self->add (0, $row, new CFClient::UI::Face
3706 face => $spell->{face},
3707 can_hover => 1,
3708 can_events => 1,
3709 tooltip => $tooltip,
3710 on_button_down => $spell_cb,
3711 );
3712
3713 $self->add (1, $row, new CFClient::UI::Label
3714 expand => 1,
3715 text => $spell->{name},
3716 can_hover => 1,
3717 can_events => 1,
3718 tooltip => $tooltip,
3719 on_button_down => $spell_cb,
3720 );
3721
3722 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726 }
3727 });
3728}
3729
3730sub add_spell {
3731 my ($self, $spell) = @_;
3732
3733 $self->{spell}->{$spell->{name}} = $spell;
3734 $self->rebuild_spell_list;
3735}
3736
3737sub remove_spell {
3738 my ($self, $spell) = @_;
3739
3740 delete $self->{spell}->{$spell->{name}};
3741 $self->rebuild_spell_list;
3742}
3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3751#############################################################################
3752
3753package CFClient::UI::Root; 4007package CFPlus::UI::Root;
3754 4008
3755our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3756 4010
3757use List::Util qw(min max); 4011use List::Util qw(min max);
3758 4012
3759use CFClient::OpenGL; 4013use CFPlus::OpenGL;
3760 4014
3761sub new { 4015sub new {
3762 my $class = shift; 4016 my $class = shift;
3763 4017
3764 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3765 visible => 1, 4019 visible => 1,
3766 @_, 4020 @_,
3767 ); 4021 );
3768 4022
3769 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3770 4024
3771 $self 4025 $self
3772} 4026}
3773 4027
3774sub size_request { 4028sub size_request {
… …
3981 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3982 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3983 glLoadIdentity; 4237 glLoadIdentity;
3984 4238
3985 { 4239 {
3986 package CFClient::UI::Base; 4240 package CFPlus::UI::Base;
3987 4241
3988 ($draw_x, $draw_y, $draw_w, $draw_h) = 4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3989 (0, 0, $self->{w}, $self->{h}); 4243 (0, 0, $self->{w}, $self->{h});
3990 }
3991 4244
3992 $self->_draw; 4245 $self->_draw;
4246 }
3993} 4247}
3994 4248
3995############################################################################# 4249#############################################################################
3996 4250
3997package CFClient::UI; 4251package CFPlus::UI;
3998 4252
3999$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
4000$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4001 4255
40021 42561
4003 4257

Diff Legend

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