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.334 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36: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 scroll_x => 0,
1067 scroll_y => 1,
1039 can_events => 1, 1068 can_events => 1,
1040 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1041 %arg, 1073 %arg,
1042 ); 1074 );
1043 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
1045 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1046 1085
1047 $self 1086 $self
1048} 1087}
1049 1088
… …
1056} 1095}
1057 1096
1058sub invoke_mouse_wheel { 1097sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1098 my ($self, $ev) = @_;
1060 1099
1061 return 0 unless $ev->{dy}; # only vertical movements 1100 return 0 unless $ev->{dy}; # only vertical movements for now
1062 1101
1063 $self->{slider}->emit (mouse_wheel => $ev); 1102 $self->{vslider}->emit (mouse_wheel => $ev);
1064 1103
1065 1 1104 1
1066} 1105}
1067 1106
1068sub update_slider { 1107sub update_slider {
1069 my ($self) = @_; 1108 my ($self) = @_;
1070 1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 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]); 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 }
1072} 1129}
1073 1130
1074sub update { 1131sub update {
1075 my ($self) = @_; 1132 my ($self) = @_;
1076 1133
1077 $self->SUPER::update; 1134 $self->SUPER::update;
1078
1079 $self->update_slider; 1135 $self->update_slider;
1080} 1136}
1081 1137
1082sub invoke_size_allocate { 1138sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1084 1140
1085 $self->update_slider; 1141 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1142 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1143}
1089 1144
1090############################################################################# 1145#############################################################################
1091 1146
1092package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
1093 1148
1094our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
1095 1150
1096use CFClient::OpenGL; 1151use CFPlus::OpenGL;
1097 1152
1098sub new { 1153sub new {
1099 my $class = shift; 1154 my $class = shift;
1100 1155
1101 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
1128} 1183}
1129 1184
1130############################################################################# 1185#############################################################################
1131 1186
1132package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1133 1188
1134our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1135 1190
1136use CFClient::OpenGL; 1191use CFPlus::OpenGL;
1192
1193sub new {
1194 my ($class, %arg) = @_;
1195
1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1137 1292
1138my $bg = 1293my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1295 mipmap => 1, wrap => 1;
1141 1296
1142my @border = 1297my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1298 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); 1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145 1300
1146sub new { 1301sub new {
1147 my ($class, %arg) = @_; 1302 my ($class, %arg) = @_;
1148 1303
… …
1154 min_w => 64, 1309 min_w => 64,
1155 min_h => 32, 1310 min_h => 32,
1156 %arg, 1311 %arg,
1157 ); 1312 );
1158 1313
1159 $self->{title_widget} = new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1315 align => 0,
1161 valign => 1, 1316 valign => 1,
1162 text => $self->{title}, 1317 text => $self->{title},
1163 fontsize => $self->{border}, 1318 fontsize => $self->{border},
1164 if exists $self->{title}; 1319 if exists $self->{title};
1165 1320
1166 if ($self->{has_close_button}) { 1321 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1322 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1323 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1324 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1325 on_activate => sub { $self->emit ("delete") };
1171 1326
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1328 }
1174 1329
1175 $self 1330 $self
1176} 1331}
1177 1332
1178sub add { 1333sub add {
1179 my ($self, @widgets) = @_; 1334 my ($self, @widgets) = @_;
1180 1335
1181 $self->SUPER::add (@widgets); 1336 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1337 $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}; 1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1339}
1185 1340
1186sub border { 1341sub border {
1187 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1188} 1343}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1452
1298 ! ! $self->{motion} 1453 ! ! $self->{motion}
1299} 1454}
1300 1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1462}
1463
1301sub _draw { 1464sub _draw {
1302 my ($self) = @_; 1465 my ($self) = @_;
1303 1466
1304 my $child = $self->{children}[0]; 1467 my $child = $self->{children}[0];
1305 1468
… …
1342 if $self->{close_button}; 1505 if $self->{close_button};
1343} 1506}
1344 1507
1345############################################################################# 1508#############################################################################
1346 1509
1347package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1348 1511
1349our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1350 1513
1351use List::Util qw(max sum); 1514use List::Util qw(max sum);
1352 1515
1353use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1354 1517
1355sub new { 1518sub new {
1356 my $class = shift; 1519 my $class = shift;
1357 1520
1358 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1359 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1360 @_, 1525 @_,
1361 ) 1526 )
1362} 1527}
1363 1528
1364sub children { 1529sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366} 1531}
1367 1532
1533# TODO: store row/col info in child widget and use standard add/del
1368sub add { 1534sub add {
1369 my ($self) = shift; 1535 my ($self) = shift;
1370 1536
1371 while (@_) { 1537 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self); 1539 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1375 } 1541 }
1376 1542
1377 $self->{force_realloc} = 1; 1543 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1; 1544 $self->{force_size_alloc} = 1;
1379 $self->realloc; 1545 $self->realloc;
1380} 1546}
1381 1547
1382sub remove { 1548sub remove {
1383 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1384 1550
1385 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1386} 1556}
1387 1557
1388# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1389sub clear { 1559sub clear {
1390 my ($self) = @_; 1560 my ($self) = @_;
… …
1439 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1440 1610
1441 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1443 1613
1444 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1445 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1448 1618
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1620
1453 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1454 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1455 1630
1456 my $y; 1631 my $y;
1457 1632
1458 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1459 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1502 } 1677 }
1503} 1678}
1504 1679
1505############################################################################# 1680#############################################################################
1506 1681
1507package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1508 1683
1684use List::Util qw(min max);
1685
1509our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1510 1767
1511sub size_request { 1768sub size_request {
1512 my ($self) = @_; 1769 my ($self) = @_;
1513 1770
1514 $self->{vertical} 1771 $self->{vertical}
… …
1547 $req[$_] += $space * $children[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1805 for 0 .. $#children;
1549 } 1806 }
1550 } 1807 }
1551 1808
1552 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1553 1810
1554 my $pos = 0; 1811 my $pos = 0;
1555 for (0 .. $#children) { 1812 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1819 1
1563} 1820}
1564 1821
1565############################################################################# 1822#############################################################################
1566 1823
1567package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1568 1825
1569our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1570 1827
1571sub new { 1828sub new {
1572 my $class = shift; 1829 my $class = shift;
1573 1830
1574 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1577 ) 1834 )
1578} 1835}
1579 1836
1580############################################################################# 1837#############################################################################
1581 1838
1582package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1583 1840
1584our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1585 1842
1586sub new { 1843sub new {
1587 my $class = shift; 1844 my $class = shift;
1588 1845
1589 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1592 ) 1849 )
1593} 1850}
1594 1851
1595############################################################################# 1852#############################################################################
1596 1853
1597package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1598 1855
1599our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1600 1857
1601use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1602 1859
1603sub new { 1860sub new {
1604 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1605 1862
1606 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1866 #active_bg => none
1610 #font => default_font 1867 #font => default_font
1611 #text => initial text 1868 #text => initial text
1612 #markup => initial narkup 1869 #markup => initial narkup
1613 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1614 ellipsise => 3, # end 1872 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1874 fontsize => 1,
1617 align => -1, 1875 align => -1,
1618 valign => -1, 1876 valign => -1,
1619 padding_x => 2, 1877 padding_x => 2,
1620 padding_y => 2, 1878 padding_y => 2,
1621 can_events => 0, 1879 can_events => 0,
1622 %arg 1880 %arg
1623 ); 1881 );
1624 1882
1625 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1886 $self->{template} = $layout;
1629 } 1887 }
1630 1888
1631 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1769 }; 2027 };
1770 2028
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1773 2031
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2033}
1776 2034
1777############################################################################# 2035#############################################################################
1778 2036
1779package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1780 2038
1781our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1782 2040
1783use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1784 2042
1785sub new { 2043sub new {
1786 my $class = shift; 2044 my $class = shift;
1787 2045
1788 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1792 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1793 can_hover => 1, 2051 can_hover => 1,
1794 can_focus => 1, 2052 can_focus => 1,
1795 valign => 0, 2053 valign => 0,
1796 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1797 #text => ... 2056 #text => ...
1798 #hidden => "*", 2057 #hidden => "*",
1799 @_ 2058 @_
1800 ) 2059 )
1801} 2060}
… …
1846 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1848 2107
1849 my $text = $self->get_text; 2108 my $text = $self->get_text;
1850 2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2111
1851 if ($uni == 8) { 2112 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1860 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2136 $self->emit ('escape');
1865 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2141 } else {
1868 return 0; 2142 return 0;
1869 } 2143 }
1870 2144
1871 $self->_set_text ($text); 2145 $self->_set_text ($text);
1872 2146
1873 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1874 2149
1875 1 2150 1
1876} 2151}
1877 2152
1878sub invoke_focus_in { 2153sub invoke_focus_in {
… …
1940 utf8::encode $text; 2215 utf8::encode $text;
1941 2216
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943 } 2218 }
1944 2219
1945 glColor @{$self->{fg}};
1946 glBegin GL_LINES; 2220 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 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}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2223 glEnd;
1950 } 2224 }
1951} 2225}
1952 2226
2227#############################################################################
2228
1953package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1954 2230
1955our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1956 2232
1957use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1958 2234
1959sub invoke_key_down { 2235sub invoke_key_down {
1960 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1961 2237
1962 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1963 2239
1964 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
1967 2243
1968 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2246 $self->emit (activate => $txt);
1971 $self->update; 2247 $self->update;
1972 2248
1973 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1976 } 2252 }
1977 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2257 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2259 }
1984 2260
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2264
1989 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2275 1
2000} 2276}
2001 2277
2002############################################################################# 2278#############################################################################
2003 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
2004package CFClient::UI::Button; 2319package CFPlus::UI::Button;
2005 2320
2006our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
2007 2322
2008use CFClient::OpenGL; 2323use CFPlus::OpenGL;
2009 2324
2010my @tex = 2325my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
2013 2328
2014sub new { 2329sub new {
2015 my $class = shift; 2330 my $class = shift;
2016 2331
… …
2053 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
2054} 2369}
2055 2370
2056############################################################################# 2371#############################################################################
2057 2372
2373package CFPlus::UI::CheckBox;
2374
2375our @ISA = CFPlus::UI::DrawBG::;
2376
2377my @tex =
2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2380
2381use CFPlus::OpenGL;
2382
2383sub new {
2384 my $class = shift;
2385
2386 $class->SUPER::new (
2387 padding_x => 2,
2388 padding_y => 2,
2389 fg => [1, 1, 1],
2390 active_fg => [1, 1, 0],
2391 bg => [0, 0, 0, 0.2],
2392 active_bg => [1, 1, 1, 0.5],
2393 state => 0,
2394 can_hover => 1,
2395 @_
2396 )
2397}
2398
2399sub size_request {
2400 my ($self) = @_;
2401
2402 (6) x 2
2403}
2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
2413sub invoke_button_down {
2414 my ($self, $ev, $x, $y) = @_;
2415
2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2418 $self->toggle;
2419 } else {
2420 return 0
2421 }
2422
2423 1
2424}
2425
2426sub _draw {
2427 my ($self) = @_;
2428
2429 $self->SUPER::_draw;
2430
2431 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2432
2433 my ($w, $h) = @$self{qw(w h)};
2434
2435 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2436
2437 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2438
2439 my $tex = $self->{state} ? $tex[1] : $tex[0];
2440
2441 glEnable GL_TEXTURE_2D;
2442 $tex->draw_quad_alpha (0, 0, $s, $s);
2443 glDisable GL_TEXTURE_2D;
2444}
2445
2446#############################################################################
2447
2448package CFPlus::UI::Image;
2449
2450our @ISA = CFPlus::UI::Base::;
2451
2452use CFPlus::OpenGL;
2453
2454our %texture_cache;
2455
2456sub new {
2457 my $class = shift;
2458
2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
2463
2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
2466
2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2469
2470 CFPlus::weaken $texture_cache{$self->{path}};
2471
2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2473
2474 $self
2475}
2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
2492sub size_request {
2493 my ($self) = @_;
2494
2495 ($self->{tex}{w}, $self->{tex}{h})
2496}
2497
2498sub _draw {
2499 my ($self) = @_;
2500
2501 my $tex = $self->{tex};
2502
2503 my ($w, $h) = ($self->{w}, $self->{h});
2504
2505 if ($self->{rot90}) {
2506 glRotate 90, 0, 0, 1;
2507 glTranslate 0, -$self->{w}, 0;
2508
2509 ($w, $h) = ($h, $w);
2510 }
2511
2512 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514
2515 $tex->draw_quad (0, 0, $w, $h);
2516
2517 glDisable GL_TEXTURE_2D;
2518}
2519
2520#############################################################################
2521
2058package CFClient::UI::ImageButton; 2522package CFPlus::UI::ImageButton;
2059 2523
2060our @ISA = CFClient::UI::Image::; 2524our @ISA = CFPlus::UI::Image::;
2061 2525
2062use CFClient::OpenGL; 2526use CFPlus::OpenGL;
2063 2527
2064my %textures; 2528my %textures;
2065 2529
2066sub new { 2530sub new {
2067 my $class = shift; 2531 my $class = shift;
… …
2089 1 2553 1
2090} 2554}
2091 2555
2092############################################################################# 2556#############################################################################
2093 2557
2094package CFClient::UI::CheckBox;
2095
2096our @ISA = CFClient::UI::DrawBG::;
2097
2098my @tex =
2099 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2100 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2101
2102use CFClient::OpenGL;
2103
2104sub new {
2105 my $class = shift;
2106
2107 $class->SUPER::new (
2108 padding_x => 2,
2109 padding_y => 2,
2110 fg => [1, 1, 1],
2111 active_fg => [1, 1, 0],
2112 bg => [0, 0, 0, 0.2],
2113 active_bg => [1, 1, 1, 0.5],
2114 state => 0,
2115 can_hover => 1,
2116 @_
2117 )
2118}
2119
2120sub size_request {
2121 my ($self) = @_;
2122
2123 (6) x 2
2124}
2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
2134sub invoke_button_down {
2135 my ($self, $ev, $x, $y) = @_;
2136
2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2139 $self->toggle;
2140 } else {
2141 return 0
2142 }
2143
2144 1
2145}
2146
2147sub _draw {
2148 my ($self) = @_;
2149
2150 $self->SUPER::_draw;
2151
2152 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2153
2154 my ($w, $h) = @$self{qw(w h)};
2155
2156 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2157
2158 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2159
2160 my $tex = $self->{state} ? $tex[1] : $tex[0];
2161
2162 glEnable GL_TEXTURE_2D;
2163 $tex->draw_quad_alpha (0, 0, $s, $s);
2164 glDisable GL_TEXTURE_2D;
2165}
2166
2167#############################################################################
2168
2169package CFClient::UI::Image; 2558package CFPlus::UI::VGauge;
2170 2559
2171our @ISA = CFClient::UI::Base::; 2560our @ISA = CFPlus::UI::Base::;
2172
2173use CFClient::OpenGL;
2174
2175our %texture_cache;
2176
2177sub new {
2178 my $class = shift;
2179
2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
2184
2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2187
2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195 $self
2196}
2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 warn "freeze<$self>\n";#d#
2202
2203 $self->{path}
2204 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206 $self->{path}
2207}
2208
2209sub STORABLE_attach {
2210 my ($self, $cloning, $path) = @_;
2211 warn "attach<@_>\n";#d#
2212
2213 $self->new (path => $path)
2214}
2215
2216sub size_request {
2217 my ($self) = @_;
2218
2219 ($self->{tex}{w}, $self->{tex}{h})
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224
2225 my $tex = $self->{tex};
2226
2227 my ($w, $h) = ($self->{w}, $self->{h});
2228
2229 if ($self->{rot90}) {
2230 glRotate 90, 0, 0, 1;
2231 glTranslate 0, -$self->{w}, 0;
2232
2233 ($w, $h) = ($h, $w);
2234 }
2235
2236 glEnable GL_TEXTURE_2D;
2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2238
2239 $tex->draw_quad (0, 0, $w, $h);
2240
2241 glDisable GL_TEXTURE_2D;
2242}
2243
2244#############################################################################
2245
2246package CFClient::UI::VGauge;
2247
2248our @ISA = CFClient::UI::Base::;
2249 2561
2250use List::Util qw(min max); 2562use List::Util qw(min max);
2251 2563
2252use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2253 2565
2254my %tex = ( 2566my %tex = (
2255 food => [ 2567 food => [
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2258 ], 2570 ],
2259 grace => [ 2571 grace => [
2260 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2262 ], 2574 ],
2263 hp => [ 2575 hp => [
2264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2265 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2266 ], 2578 ],
2267 mana => [ 2579 mana => [
2268 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2269 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2270 ], 2582 ],
2271); 2583);
2272 2584
2273# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2376 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2377} 2689}
2378 2690
2379############################################################################# 2691#############################################################################
2380 2692
2381package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2382 2694
2383our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2384 2696
2385sub new { 2697sub new {
2386 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2387 2699
2388 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2390 can_hover => 1, 2702 can_hover => 1,
2391 can_events => 1, 2703 can_events => 1,
2392 %arg, 2704 %arg,
2393 ); 2705 );
2394 2706
2395 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2396 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2708 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2397 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2398 2710
2399 $self 2711 $self
2400} 2712}
2401 2713
2402sub set_fontsize { 2714sub set_fontsize {
… …
2423 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2424} 2736}
2425 2737
2426############################################################################# 2738#############################################################################
2427 2739
2428package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2429 2741
2430use strict; 2742use strict;
2431 2743
2432use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2433 2745
2434our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2435 2747
2436my @tex = 2748my @tex =
2437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2438 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2439 2751
2440sub new { 2752sub new {
2441 my $class = shift; 2753 my $class = shift;
2442 2754
… …
2536sub invoke_mouse_wheel { 2848sub invoke_mouse_wheel {
2537 my ($self, $ev) = @_; 2849 my ($self, $ev) = @_;
2538 2850
2539 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2540 2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2541 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2542 2856
2543 ! ! $delta 2857 ! ! $delta
2544} 2858}
2545 2859
2546sub update { 2860sub update {
… …
2597 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2598} 2912}
2599 2913
2600############################################################################# 2914#############################################################################
2601 2915
2602package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2603 2917
2604our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2605 2919
2606sub new { 2920sub new {
2607 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2608 2922
2609 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2610 2924
2611 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2612 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2613 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2614 to_value => sub { shift }, 2928 to_value => sub { shift },
2615 from_value => sub { shift }, 2929 from_value => sub { shift },
2616 %arg, 2930 %arg,
2617 ); 2931 );
2618 2932
… …
2638sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2639sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2640 2954
2641############################################################################# 2955#############################################################################
2642 2956
2643package CFClient::UI::TextScroller; 2957package CFPlus::UI::TextScroller;
2644 2958
2645our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2646 2960
2647use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2648 2962
2649sub new { 2963sub new {
2650 my $class = shift; 2964 my $class = shift;
2651 2965
2652 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
… …
2654 can_events => 1, 2968 can_events => 1,
2655 indent => 0, 2969 indent => 0,
2656 #font => default_font 2970 #font => default_font
2657 @_, 2971 @_,
2658 2972
2659 layout => (new CFClient::Layout), 2973 layout => (new CFPlus::Layout),
2660 par => [], 2974 par => [],
2975 max_par => 0,
2661 height => 0, 2976 height => 0,
2662 children => [ 2977 children => [
2663 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2664 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2665 ], 2980 ],
2666 ); 2981 );
2667 2982
2668 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2669 2984
… …
2746 3061
2747 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2748 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2749} 3064}
2750 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2751sub clear { 3081sub clear {
2752 my ($self) = @_; 3082 my ($self) = @_;
2753 3083
2754 my (undef, undef, @other) = @{ $self->{children} }; 3084 my (undef, undef, @other) = @{ $self->{children} };
2755 $self->remove ($_) for @other; 3085 $self->remove ($_) for @other;
… …
2758 $self->{height} = 0; 3088 $self->{height} = 0;
2759 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2760} 3090}
2761 3091
2762sub add_paragraph { 3092sub add_paragraph {
2763 my ($self, $color, $para, $indent) = @_; 3093 my $self = shift;
2764 3094
2765 my ($text, @w) = ref $para ? @$para : $para; 3095 for my $para (@_) {
2766
2767 $para = { 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
2768 w => 1e10, 3102 w => 1e10,
2769 wrapped => 1, 3103 wrapped => 1,
2770 fg => $color,
2771 indent => $indent,
2772 markup => $text,
2773 widget => \@w,
2774 }; 3104 };
2775 3105
2776 $self->add (@w) if @w; 3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2777 push @{$self->{par}}, $para; 3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
2778 3113
2779 $self->{need_reflow}++; 3114 $self->{need_reflow}++;
2780 $self->update; 3115 $self->update;
2781} 3116}
2782 3117
2783sub scroll_to_bottom { 3118sub scroll_to_bottom {
2784 my ($self) = @_; 3119 my ($self) = @_;
2785 3120
2786 $self->{scroll_to_bottom} = 1; 3121 $self->{scroll_to} = $#{$self->{par}};
2787 $self->update; 3122 $self->update;
2788} 3123}
2789 3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
3147 $self->{height} = $height;
3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3149
3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
3156}
3157
2790sub update { 3158sub update {
2791 my ($self) = @_; 3159 my ($self) = @_;
2792 3160
2793 $self->SUPER::update; 3161 $self->SUPER::update;
2794 3162
2795 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2796 3164
2797 delete $self->{texture}; 3165 delete $self->{texture};
2798 3166
2799 $ROOT->on_post_alloc ($self => sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2800 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2801 3171
2802 if (delete $self->{need_reflow}) {
2803 my $height = 0;
2804
2805 for my $para (@{$self->{par}}) {
2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2807 my $layout = $self->get_layout ($para);
2808 my ($w, $h) = $layout->size;
2809
2810 $para->{w} = $w + $para->{indent};
2811 $para->{h} = $h;
2812 $para->{wrapped} = $layout->has_wrapped;
2813 }
2814
2815 $height += $para->{h};
2816 }
2817
2818 $self->{height} = $height;
2819
2820 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2821
2822 delete $self->{texture};
2823 }
2824
2825 if (delete $self->{scroll_to_bottom}) {
2826 $self->{children}[1]->set_value (1e10);
2827 }
2828
2829 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2830 glClearColor 0, 0, 0, 0; 3173 glClearColor 0, 0, 0, 0;
2831 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2832 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2833 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2834 3185
2835 my $y0 = $top; 3186 my $y0 = $top;
2836 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2837 3188
2838 my $y = 0;
2839
2840 for my $para (@{$self->{par}}) { 3189 for my $para (@{$self->{par}}) {
2841 my $h = $para->{h}; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2842 3192
2843 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2844
2845 my $layout = $self->get_layout ($para); 3194 my $layout = $self->get_layout ($para);
2846 3195
2847 $layout->render ($para->{indent}, $y - $y0); 3196 $layout->render ($para->{indent}, $y - $y0);
2848 3197
2849 if (my @w = @{ $para->{widget} }) { 3198 if (my @w = @{ $para->{widget} }) {
… …
2858 $_->draw; 3207 $_->draw;
2859 } 3208 }
2860 } 3209 }
2861 } 3210 }
2862 3211
2863 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2864 } 3214 }
3215
3216 $self->{top_paragraph} = $top_paragraph;
2865 }; 3217 };
2866 }); 3218 });
2867} 3219}
2868 3220
2869sub reconfigure { 3221sub reconfigure {
… …
2887 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2888} 3240}
2889 3241
2890############################################################################# 3242#############################################################################
2891 3243
2892package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2893 3245
2894use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2895 3247
2896our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2897 3249
2898sub moveto { 3250sub moveto {
2899 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2900 3252
2901 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2929 glPopMatrix; 3281 glPopMatrix;
2930} 3282}
2931 3283
2932############################################################################# 3284#############################################################################
2933 3285
2934package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2935 3287
2936our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2937 3289
2938sub new { 3290sub new {
2939 my $class = shift; 3291 my $class = shift;
2940 3292
2941 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2953 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2954} 3306}
2955 3307
2956############################################################################# 3308#############################################################################
2957 3309
2958package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2959 3311
2960our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2961 3313
2962use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2963 3315
2964sub new { 3316sub new {
2965 my $class = shift; 3317 my $class = shift;
2966 3318
2967 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2970 ) 3322 )
2971} 3323}
2972 3324
2973sub set_tooltip_from { 3325sub set_tooltip_from {
2974 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2975 3330
2976 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2977 3332
2978 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2979 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2983 } 3338 }
2984 3339
2985 $tooltip =~ s/^\n+//; 3340 $tooltip =~ s/^\n+//;
2986 $tooltip =~ s/\n+$//; 3341 $tooltip =~ s/\n+$//;
2987 3342
2988 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2989 markup => $tooltip, 3344 markup => $tooltip,
2990 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2991 fontsize => 0.8, 3346 fontsize => 0.8,
2992 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2993 ellipsise => 0, 3348 ellipsise => 0,
2994 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2995 ); 3350 );
2996} 3351}
2997 3352
… …
3059 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
3060} 3415}
3061 3416
3062############################################################################# 3417#############################################################################
3063 3418
3064package CFClient::UI::Face; 3419package CFPlus::UI::Face;
3065 3420
3066our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
3067 3422
3068use CFClient::OpenGL; 3423use CFPlus::OpenGL;
3069 3424
3070sub new { 3425sub new {
3071 my $class = shift; 3426 my $class = shift;
3072 3427
3073 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
3074 aspect => 1, 3431 aspect => 1,
3075 can_events => 0, 3432 can_events => 0,
3076 @_, 3433 @_,
3077 ); 3434 );
3078 3435
3079 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
3080 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
3081 3438
3082 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
3083 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3084 hard => 1, 3441 hard => 1,
3085 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
3086 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
3087 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
3088 $widget->update; 3448 $self->update;
3089 }, 3449 },
3090 ); 3450 );
3451
3452 $self->update_face;
3091 } 3453 }
3092 3454
3093 $self 3455 $self
3094} 3456}
3095 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
3096sub size_request { 3471sub size_request {
3097 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
3098} 3487}
3099 3488
3100sub update { 3489sub update {
3101 my ($self) = @_; 3490 my ($self) = @_;
3102 3491
… …
3108sub _draw { 3497sub _draw {
3109 my ($self) = @_; 3498 my ($self) = @_;
3110 3499
3111 return unless $::CONN; 3500 return unless $::CONN;
3112 3501
3113 my $face; 3502 $self->SUPER::_draw;
3114 3503
3115 if ($self->{frame}) {
3116 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
3117 3505 or return;
3118 $face = $anim->[ $self->{frame} % @$anim ]
3119 if $anim && @$anim;
3120 }
3121 3506
3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
3123 3508
3124 if ($tex) { 3509 if ($tex) {
3125 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3127 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
… …
3139 $self->SUPER::destroy; 3524 $self->SUPER::destroy;
3140} 3525}
3141 3526
3142############################################################################# 3527#############################################################################
3143 3528
3144package CFClient::UI::Buttonbar; 3529package CFPlus::UI::Buttonbar;
3145 3530
3146our @ISA = CFClient::UI::HBox::; 3531our @ISA = CFPlus::UI::HBox::;
3147 3532
3148# TODO: should actualyl wrap buttons and other goodies. 3533# TODO: should actually wrap buttons and other goodies.
3149 3534
3150############################################################################# 3535#############################################################################
3151 3536
3152package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
3153 3538
3154our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
3155 3540
3156use CFClient::OpenGL; 3541use CFPlus::OpenGL;
3157 3542
3158sub new { 3543sub new {
3159 my $class = shift; 3544 my $class = shift;
3160 3545
3161 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
3162 items => [], 3547 items => [],
3163 z => 100, 3548 z => 100,
3164 @_, 3549 @_,
3165 ); 3550 );
3166 3551
3167 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3168 3553
3169 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
3170 my ($widget, $cb, $tooltip) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
3171 3556
3172 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
3173 if (!ref $widget) { 3558 if (!ref $widget) {
3174 if ($widget =~ /\t/) { 3559 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2; 3560 my ($left, $right) = split /\t/, $widget, 2;
3176 3561
3177 $widget = new CFClient::UI::HBox 3562 $widget = new CFPlus::UI::HBox
3178 can_hover => 1, 3563 can_hover => 1,
3179 can_events => 1, 3564 can_events => 1,
3180 tooltip => $tooltip, 3565 tooltip => $tooltip,
3181 children => [ 3566 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1), 3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1), 3568 (new CFPlus::UI::Label markup => $right, align => +1),
3184 ], 3569 ],
3185 ; 3570 ;
3186 3571
3187 } else { 3572 } else {
3188 $widget = new CFClient::UI::Label 3573 $widget = new CFPlus::UI::Label
3189 can_hover => 1, 3574 can_hover => 1,
3190 can_events => 1, 3575 can_events => 1,
3191 markup => $widget, 3576 markup => $widget,
3192 tooltip => $tooltip; 3577 tooltip => $tooltip;
3193 } 3578 }
… …
3241 1 3626 1
3242} 3627}
3243 3628
3244############################################################################# 3629#############################################################################
3245 3630
3246package CFClient::UI::Multiplexer; 3631package CFPlus::UI::Multiplexer;
3247 3632
3248our @ISA = CFClient::UI::Container::; 3633our @ISA = CFPlus::UI::Container::;
3249 3634
3250sub new { 3635sub new {
3251 my $class = shift; 3636 my $class = shift;
3252 3637
3253 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
… …
3314 $self->{current}->draw; 3699 $self->{current}->draw;
3315} 3700}
3316 3701
3317############################################################################# 3702#############################################################################
3318 3703
3319package CFClient::UI::Notebook; 3704package CFPlus::UI::Notebook;
3320 3705
3321our @ISA = CFClient::UI::VBox::; 3706our @ISA = CFPlus::UI::VBox::;
3322 3707
3323sub new { 3708sub new {
3324 my $class = shift; 3709 my $class = shift;
3325 3710
3326 my $self = $class->SUPER::new ( 3711 my $self = $class->SUPER::new (
3327 buttonbar => (new CFClient::UI::Buttonbar), 3712 buttonbar => (new CFPlus::UI::Buttonbar),
3328 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3329 # filter => # will be put between multiplexer and $self 3714 # filter => # will be put between multiplexer and $self
3330 @_, 3715 @_,
3331 ); 3716 );
3332 3717
3333 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3337} 3722}
3338 3723
3339sub add { 3724sub add {
3340 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3341 3726
3342 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3343 3728
3344 $self->{buttonbar}->add (new CFClient::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3345 markup => $title, 3730 markup => $title,
3346 tooltip => $tooltip, 3731 tooltip => $tooltip,
3347 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
3348 ); 3733 );
3349 3734
… …
3363 $self->emit (page_changed => $self->{multiplexer}{current}); 3748 $self->emit (page_changed => $self->{multiplexer}{current});
3364} 3749}
3365 3750
3366############################################################################# 3751#############################################################################
3367 3752
3368package CFClient::UI::Combobox; 3753package CFPlus::UI::Selector;
3369 3754
3370use utf8; 3755use utf8;
3371 3756
3372our @ISA = CFClient::UI::Button::; 3757our @ISA = CFPlus::UI::Button::;
3373 3758
3374sub new { 3759sub new {
3375 my $class = shift; 3760 my $class = shift;
3376 3761
3377 my $self = $class->SUPER::new ( 3762 my $self = $class->SUPER::new (
… …
3394 my ($value, $title, $tooltip) = @$_; 3779 my ($value, $title, $tooltip) = @$_;
3395 3780
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 } 3782 }
3398 3783
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400} 3785}
3401 3786
3402sub _set_value { 3787sub _set_value {
3403 my ($self, $value) = @_; 3788 my ($self, $value) = @_;
3404 3789
… …
3419 $self->emit (changed => $value); 3804 $self->emit (changed => $value);
3420} 3805}
3421 3806
3422############################################################################# 3807#############################################################################
3423 3808
3424package CFClient::UI::Statusbox; 3809package CFPlus::UI::Statusbox;
3425 3810
3426our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3427 3812
3428sub new { 3813sub new {
3429 my $class = shift; 3814 my $class = shift;
3430 3815
3431 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3432 fontsize => 0.8, 3817 fontsize => 0.8,
3433 @_, 3818 @_,
3434 ); 3819 );
3435 3820
3436 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3437 3822
3438 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439 3824
3440 $self 3825 $self
3441} 3826}
… …
3443sub reorder { 3828sub reorder {
3444 my ($self) = @_; 3829 my ($self) = @_;
3445 my $NOW = Time::HiRes::time; 3830 my $NOW = Time::HiRes::time;
3446 3831
3447 # freeze display when hovering over any label 3832 # freeze display when hovering over any label
3448 return if $CFClient::UI::TOOLTIP->{owner} 3833 return if $CFPlus::UI::TOOLTIP->{owner}
3449 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3450 values %{ $self->{item} }; 3835 values %{ $self->{item} };
3451 3836
3452 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
3453 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3454 } 3839 }
… …
3475 for ($short) { 3860 for ($short) {
3476 s/^\s+//; 3861 s/^\s+//;
3477 s/\s+/ /g; 3862 s/\s+/ /g;
3478 } 3863 }
3479 3864
3480 new CFClient::UI::Label 3865 new CFPlus::UI::Label
3481 markup => $short, 3866 markup => $short,
3482 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
3483 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
3484 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
3485 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3564 $self->SUPER::destroy; 3949 $self->SUPER::destroy;
3565} 3950}
3566 3951
3567############################################################################# 3952#############################################################################
3568 3953
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; 3954package CFPlus::UI::Root;
3754 3955
3755our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3756 3957
3757use List::Util qw(min max); 3958use List::Util qw(min max);
3758 3959
3759use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3760 3961
3761sub new { 3962sub new {
3762 my $class = shift; 3963 my $class = shift;
3763 3964
3764 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3765 visible => 1, 3966 visible => 1,
3766 @_, 3967 @_,
3767 ); 3968 );
3768 3969
3769 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3770 3971
3771 $self 3972 $self
3772} 3973}
3773 3974
3774sub size_request { 3975sub size_request {
… …
3943 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
3944 4145
3945 $w = max $widget->{min_w}, $w; 4146 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h; 4147 $h = max $widget->{min_h}, $h;
3947 4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
3948 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3950 4154
3951 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3952 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
… …
3978 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3979 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3980 glLoadIdentity; 4184 glLoadIdentity;
3981 4185
3982 { 4186 {
3983 package CFClient::UI::Base; 4187 package CFPlus::UI::Base;
3984 4188
3985 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3986 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
3987 }
3988 4191
3989 $self->_draw; 4192 $self->_draw;
4193 }
3990} 4194}
3991 4195
3992############################################################################# 4196#############################################################################
3993 4197
3994package CFClient::UI; 4198package CFPlus::UI;
3995 4199
3996$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3997$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3998 4202
39991 42031
4000 4204

Diff Legend

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