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.335 by root, Sun Jul 23 16:11:56 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 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 { 552#sub find_widget {
534 my ($self, $x, $y) = @_; 553# in .xs
535
536 return () unless $self->{can_events};
537
538 return $self
539 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542 ()
543}
544 554
545sub set_parent { 555sub set_parent {
546 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
547 557
548 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
550} 560}
551 561
552sub realloc { 562sub realloc {
553 my ($self) = @_; 563 my ($self) = @_;
… …
619 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
622 glEnd; 632 glEnd;
623 glPopMatrix; 633 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 } 635 }
626 636
627 $self->_draw; 637 $self->_draw;
628 glPopMatrix; 638 glPopMatrix;
629} 639}
… …
632 my ($self) = @_; 642 my ($self) = @_;
633 643
634 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
635} 645}
636 646
647my $cntx;#d#
637sub DESTROY { 648sub DESTROY {
638 my ($self) = @_; 649 my ($self) = @_;
639 650
640 return if CFClient::in_destruct; 651 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 652
644 eval { $self->destroy }; 653 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
656 delete $WIDGET{$self+0};
646} 657}
647 658
648############################################################################# 659#############################################################################
649 660
650package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
651 662
652our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
653 664
654use strict; 665use strict;
655use CFClient::OpenGL; 666use CFPlus::OpenGL;
656 667
657sub new { 668sub new {
658 my $class = shift; 669 my $class = shift;
659 670
660 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
691 } 702 }
692} 703}
693 704
694############################################################################# 705#############################################################################
695 706
696package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
697 708
698our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
699 710
700sub new { 711sub new {
701 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
703} 714}
… …
710 721
711sub draw { } 722sub draw { }
712 723
713############################################################################# 724#############################################################################
714 725
715package CFClient::UI::Container; 726package CFPlus::UI::Container;
716 727
717our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
718 729
719sub new { 730sub new {
720 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
721 732
722 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
808 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
809} 820}
810 821
811############################################################################# 822#############################################################################
812 823
813package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
814 825
815our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
816 827
817sub new { 828sub new {
818 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
819 830
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 832
822 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
823} 834}
824 835
825sub add { 836sub add {
… …
832sub remove { 843sub remove {
833 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
834 845
835 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
836 847
837 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 849 unless @{$self->{children}};
839} 850}
840 851
841sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
842 853
… …
854 865
855############################################################################# 866#############################################################################
856 867
857# back-buffered drawing area 868# back-buffered drawing area
858 869
859package CFClient::UI::Window; 870package CFPlus::UI::Window;
860 871
861our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
862 873
863use CFClient::OpenGL; 874use CFPlus::OpenGL;
864 875
865sub new { 876sub new {
866 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
867 878
868 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
890} 901}
891 902
892sub render_child { 903sub render_child {
893 my ($self) = @_; 904 my ($self) = @_;
894 905
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
898 909
899 { 910 {
900 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
901 912
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
904 } 917 }
905
906 $self->_render;
907 }; 918 };
908} 919}
909 920
910sub _draw { 921sub _draw {
911 my ($self) = @_; 922 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 923
915 my $tex = $self->{texture} 924 my $tex = $self->{texture}
916 or return; 925 or return;
917 926
918 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
921 930
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
923 932
924 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
925} 934}
926 935
927############################################################################# 936#############################################################################
928 937
929package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
930 939
940use List::Util qw(min max);
941
931our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
932 943
933sub new { 944sub new {
934 my $class = shift; 945 my $class = shift;
935 946
936 $class->SUPER::new ( 947 $class->SUPER::new (
… …
966} 977}
967 978
968sub set_offset { 979sub set_offset {
969 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
970 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
973 988
989 $self->emit (changed => $x, $y);
974 $self->update; 990 $self->update;
991 }
975} 992}
976 993
977# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 995sub coord2local {
979 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
995 1012
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1015 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1017 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1019 }
1003} 1020}
1004 1021
1005sub _render { 1022sub _render {
1006 my ($self) = @_; 1023 my ($self) = @_;
1007 1024
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1025 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}; 1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1027
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1029
1013 $self->SUPER::_render; 1030 $self->SUPER::_render;
1014} 1031}
1015 1032
1016############################################################################# 1033#############################################################################
1017 1034
1018package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
1019 1036
1020our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
1021 1038
1022sub new { 1039sub new {
1023 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
1024 1041
1025 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
1026 1043
1027 my $self; 1044 my $self;
1028 1045
1029 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
1030 vertical => 1, 1056 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1058 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1061 },
1035 ; 1062 ;
1036 1063
1037 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1039 can_events => 1, 1067 can_events => 1,
1040 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1041 %arg, 1072 %arg,
1042 ); 1073 );
1043 1074
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
1045 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
1046 1092
1047 $self 1093 $self
1048} 1094}
1049 1095
… …
1053 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
1054 1100
1055 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
1056} 1102}
1057 1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
1128sub update {
1129 my ($self) = @_;
1130
1131 $self->update_slider;
1132 $self->SUPER::update;
1133}
1134
1058sub invoke_mouse_wheel { 1135sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1136 my ($self, $ev) = @_;
1060 1137
1061 return 0 unless $ev->{dy}; # only vertical movements 1138 return 0 unless $ev->{dy}; # only vertical movements for now
1062 1139
1063 $self->{slider}->emit (mouse_wheel => $ev); 1140 $self->{vslider}->emit (mouse_wheel => $ev);
1064 1141
1065 1 1142 1
1066} 1143}
1067 1144
1068sub update_slider { 1145sub invoke_button_down {
1069 my ($self) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1070 1147
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1148 if ($ev->{button} == 2) {
1072} 1149 $self->grab_focus;
1073 1150
1074sub update { 1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1075 my ($self) = @_; 1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1076 1156
1077 $self->SUPER::update; 1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1078 1160
1079 $self->update_slider; 1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1080} 1186}
1081 1187
1082sub invoke_size_allocate { 1188sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1084 1190
1085 $self->update_slider; 1191 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1193}
1089 1194
1090############################################################################# 1195#############################################################################
1091 1196
1092package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1093 1198
1094our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1095 1200
1096use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1097 1202
1098sub new { 1203sub new {
1099 my $class = shift; 1204 my $class = shift;
1100 1205
1101 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1128} 1233}
1129 1234
1130############################################################################# 1235#############################################################################
1131 1236
1132package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1133 1238
1134our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1135 1240
1136use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1242
1243sub new {
1244 my ($class, %arg) = @_;
1245
1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1137 1342
1138my $bg = 1343my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1141 1346
1142my @border = 1347my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1348 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); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1145 1354
1146sub new { 1355sub new {
1147 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1148 1357
1149 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1363 min_w => 64,
1155 min_h => 32, 1364 min_h => 32,
1156 %arg, 1365 %arg,
1157 ); 1366 );
1158 1367
1159 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1369 align => 0,
1161 valign => 1, 1370 valign => 1,
1162 text => $self->{title}, 1371 text => $self->{title},
1163 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1164 if exists $self->{title}; 1373 if exists $self->{title};
1165 1374
1166 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1376 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1378 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1379 on_activate => sub { $self->emit ("delete") };
1171 1380
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1382 }
1174 1383
1175 $self 1384 $self
1176} 1385}
1177 1386
1178sub add { 1387sub add {
1179 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1180 1389
1181 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1391 $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}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1393}
1185 1394
1186sub border { 1395sub border {
1187 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1188} 1397}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1506
1298 ! ! $self->{motion} 1507 ! ! $self->{motion}
1299} 1508}
1300 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1301sub _draw { 1518sub _draw {
1302 my ($self) = @_; 1519 my ($self) = @_;
1303 1520
1304 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1305 1522
… …
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1528
1312 my $border = $self->border; 1529 my $border = $self->border;
1313 1530
1314 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319 1550
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1322 1553
1323 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1573 if $self->{close_button};
1343} 1574}
1344 1575
1345############################################################################# 1576#############################################################################
1346 1577
1347package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1348 1579
1349our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1350 1581
1351use List::Util qw(max sum); 1582use List::Util qw(max sum);
1352 1583
1353use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1354 1585
1355sub new { 1586sub new {
1356 my $class = shift; 1587 my $class = shift;
1357 1588
1358 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1359 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1360 @_, 1593 @_,
1361 ) 1594 )
1362} 1595}
1363 1596
1364sub children { 1597sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366} 1599}
1367 1600
1601# TODO: store row/col info in child widget and use standard add/del
1368sub add { 1602sub add {
1369 my ($self) = shift; 1603 my $self = shift;
1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1370 1611
1371 while (@_) { 1612 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1373 $child->set_parent ($self); 1615 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1375 } 1617 }
1376 1618
1377 $self->{force_realloc} = 1; 1619 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1; 1620 $self->{force_size_alloc} = 1;
1379 $self->realloc; 1621 $self->realloc;
1380} 1622}
1381 1623
1382sub remove { 1624sub remove {
1383 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1384 1626
1385 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1386} 1632}
1387 1633
1388# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1389sub clear { 1635sub clear {
1390 my ($self) = @_; 1636 my ($self) = @_;
… …
1439 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1440 1686
1441 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1443 1689
1444 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1445 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1448 1694
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1696
1453 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1454 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1455 1706
1456 my $y; 1707 my $y;
1457 1708
1458 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1459 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1502 } 1753 }
1503} 1754}
1504 1755
1505############################################################################# 1756#############################################################################
1506 1757
1507package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1508 1759
1760use List::Util qw(min max);
1761
1509our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1510 1843
1511sub size_request { 1844sub size_request {
1512 my ($self) = @_; 1845 my ($self) = @_;
1513 1846
1514 $self->{vertical} 1847 $self->{vertical}
… …
1547 $req[$_] += $space * $children[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1881 for 0 .. $#children;
1549 } 1882 }
1550 } 1883 }
1551 1884
1552 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1553 1886
1554 my $pos = 0; 1887 my $pos = 0;
1555 for (0 .. $#children) { 1888 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1895 1
1563} 1896}
1564 1897
1565############################################################################# 1898#############################################################################
1566 1899
1567package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1568 1901
1569our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1570 1903
1571sub new { 1904sub new {
1572 my $class = shift; 1905 my $class = shift;
1573 1906
1574 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1577 ) 1910 )
1578} 1911}
1579 1912
1580############################################################################# 1913#############################################################################
1581 1914
1582package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1583 1916
1584our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1585 1918
1586sub new { 1919sub new {
1587 my $class = shift; 1920 my $class = shift;
1588 1921
1589 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1592 ) 1925 )
1593} 1926}
1594 1927
1595############################################################################# 1928#############################################################################
1596 1929
1597package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1598 1931
1599our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1600 1933
1601use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1602 1935
1603sub new { 1936sub new {
1604 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1605 1938
1606 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1942 #active_bg => none
1610 #font => default_font 1943 #font => default_font
1611 #text => initial text 1944 #text => initial text
1612 #markup => initial narkup 1945 #markup => initial narkup
1613 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1614 ellipsise => 3, # end 1948 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1950 fontsize => 1,
1617 align => -1, 1951 align => -1,
1618 valign => -1, 1952 valign => -1,
1619 padding_x => 2, 1953 padding_x => 2,
1620 padding_y => 2, 1954 padding_y => 2,
1621 can_events => 0, 1955 can_events => 0,
1622 %arg 1956 %arg
1623 ); 1957 );
1624 1958
1625 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1962 $self->{template} = $layout;
1629 } 1963 }
1630 1964
1631 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1769 }; 2103 };
1770 2104
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1773 2107
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2109}
1776 2110
1777############################################################################# 2111#############################################################################
1778 2112
1779package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1780 2114
1781our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1782 2116
1783use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1784 2118
1785sub new { 2119sub new {
1786 my $class = shift; 2120 my $class = shift;
1787 2121
1788 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1792 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1793 can_hover => 1, 2127 can_hover => 1,
1794 can_focus => 1, 2128 can_focus => 1,
1795 valign => 0, 2129 valign => 0,
1796 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1797 #text => ... 2132 #text => ...
1798 #hidden => "*", 2133 #hidden => "*",
1799 @_ 2134 @_
1800 ) 2135 )
1801} 2136}
… …
1846 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1848 2183
1849 my $text = $self->get_text; 2184 my $text = $self->get_text;
1850 2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2187
1851 if ($uni == 8) { 2188 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1860 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2212 $self->emit ('escape');
1865 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2217 } else {
1868 return 0; 2218 return 0;
1869 } 2219 }
1870 2220
1871 $self->_set_text ($text); 2221 $self->_set_text ($text);
1872 2222
1873 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1874 2225
1875 1 2226 1
1876} 2227}
1877 2228
1878sub invoke_focus_in { 2229sub invoke_focus_in {
… …
1940 utf8::encode $text; 2291 utf8::encode $text;
1941 2292
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943 } 2294 }
1944 2295
1945 glColor @{$self->{fg}};
1946 glBegin GL_LINES; 2296 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 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}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2299 glEnd;
1950 } 2300 }
1951} 2301}
1952 2302
2303#############################################################################
2304
1953package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1954 2306
1955our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1956 2308
1957use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1958 2310
1959sub invoke_key_down { 2311sub invoke_key_down {
1960 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1961 2313
1962 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1963 2315
1964 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
1967 2319
1968 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2322 $self->emit (activate => $txt);
1971 $self->update; 2323 $self->update;
1972 2324
1973 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1976 } 2328 }
1977 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2333 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2335 }
1984 2336
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2340
1989 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2351 1
2000} 2352}
2001 2353
2002############################################################################# 2354#############################################################################
2003 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
2004package CFClient::UI::Button; 2395package CFPlus::UI::Button;
2005 2396
2006our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
2007 2398
2008use CFClient::OpenGL; 2399use CFPlus::OpenGL;
2009 2400
2010my @tex = 2401my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
2013 2404
2014sub new { 2405sub new {
2015 my $class = shift; 2406 my $class = shift;
2016 2407
2017 $class->SUPER::new ( 2408 $class->SUPER::new (
2018 padding_x => 4, 2409 padding_x => 4,
2019 padding_y => 4, 2410 padding_y => 4,
2020 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
2021 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
2022 can_hover => 1, 2413 can_hover => 1,
2023 align => 0, 2414 align => 0,
2024 valign => 0, 2415 valign => 0,
2025 can_events => 1, 2416 can_events => 1,
2026 @_ 2417 @_
… …
2044 2435
2045 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
2048 2439
2440 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2442
2051 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2052 2444
2053 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
2054} 2446}
2055 2447
2056############################################################################# 2448#############################################################################
2057 2449
2450package CFPlus::UI::CheckBox;
2451
2452our @ISA = CFPlus::UI::DrawBG::;
2453
2454my @tex =
2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2457
2458use CFPlus::OpenGL;
2459
2460sub new {
2461 my $class = shift;
2462
2463 $class->SUPER::new (
2464 padding_x => 2,
2465 padding_y => 2,
2466 fg => [1, 1, 1],
2467 active_fg => [1, 1, 0],
2468 bg => [0, 0, 0, 0.2],
2469 active_bg => [1, 1, 1, 0.5],
2470 state => 0,
2471 can_hover => 1,
2472 @_
2473 )
2474}
2475
2476sub size_request {
2477 my ($self) = @_;
2478
2479 (6) x 2
2480}
2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
2490sub invoke_button_down {
2491 my ($self, $ev, $x, $y) = @_;
2492
2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2495 $self->toggle;
2496 } else {
2497 return 0
2498 }
2499
2500 1
2501}
2502
2503sub _draw {
2504 my ($self) = @_;
2505
2506 $self->SUPER::_draw;
2507
2508 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2509
2510 my ($w, $h) = @$self{qw(w h)};
2511
2512 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2513
2514 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2515
2516 my $tex = $self->{state} ? $tex[1] : $tex[0];
2517
2518 glEnable GL_TEXTURE_2D;
2519 $tex->draw_quad_alpha (0, 0, $s, $s);
2520 glDisable GL_TEXTURE_2D;
2521}
2522
2523#############################################################################
2524
2525package CFPlus::UI::Image;
2526
2527our @ISA = CFPlus::UI::Base::;
2528
2529use CFPlus::OpenGL;
2530
2531our %texture_cache;
2532
2533sub new {
2534 my $class = shift;
2535
2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
2540
2541 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required";
2543
2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2546
2547 CFPlus::weaken $texture_cache{$self->{path}};
2548
2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2550
2551 $self
2552}
2553
2554sub STORABLE_freeze {
2555 my ($self, $cloning) = @_;
2556
2557 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2559
2560 $self->{path}
2561}
2562
2563sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_;
2565
2566 $self->new (path => $path)
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571
2572 ($self->{tex}{w}, $self->{tex}{h})
2573}
2574
2575sub _draw {
2576 my ($self) = @_;
2577
2578 my $tex = $self->{tex};
2579
2580 my ($w, $h) = ($self->{w}, $self->{h});
2581
2582 if ($self->{rot90}) {
2583 glRotate 90, 0, 0, 1;
2584 glTranslate 0, -$self->{w}, 0;
2585
2586 ($w, $h) = ($h, $w);
2587 }
2588
2589 glEnable GL_TEXTURE_2D;
2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2591
2592 $tex->draw_quad (0, 0, $w, $h);
2593
2594 glDisable GL_TEXTURE_2D;
2595}
2596
2597#############################################################################
2598
2058package CFClient::UI::ImageButton; 2599package CFPlus::UI::ImageButton;
2059 2600
2060our @ISA = CFClient::UI::Image::; 2601our @ISA = CFPlus::UI::Image::;
2061 2602
2062use CFClient::OpenGL; 2603use CFPlus::OpenGL;
2063 2604
2064my %textures; 2605my %textures;
2065 2606
2066sub new { 2607sub new {
2067 my $class = shift; 2608 my $class = shift;
… …
2089 1 2630 1
2090} 2631}
2091 2632
2092############################################################################# 2633#############################################################################
2093 2634
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; 2635package CFPlus::UI::VGauge;
2170 2636
2171our @ISA = CFClient::UI::Base::; 2637our @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 $self->{path}
2202 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2203
2204 $self->{path}
2205}
2206
2207sub STORABLE_attach {
2208 my ($self, $cloning, $path) = @_;
2209
2210 $self->new (path => $path)
2211}
2212
2213sub size_request {
2214 my ($self) = @_;
2215
2216 ($self->{tex}{w}, $self->{tex}{h})
2217}
2218
2219sub _draw {
2220 my ($self) = @_;
2221
2222 my $tex = $self->{tex};
2223
2224 my ($w, $h) = ($self->{w}, $self->{h});
2225
2226 if ($self->{rot90}) {
2227 glRotate 90, 0, 0, 1;
2228 glTranslate 0, -$self->{w}, 0;
2229
2230 ($w, $h) = ($h, $w);
2231 }
2232
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 $tex->draw_quad (0, 0, $w, $h);
2237
2238 glDisable GL_TEXTURE_2D;
2239}
2240
2241#############################################################################
2242
2243package CFClient::UI::VGauge;
2244
2245our @ISA = CFClient::UI::Base::;
2246 2638
2247use List::Util qw(min max); 2639use List::Util qw(min max);
2248 2640
2249use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2250 2642
2251my %tex = ( 2643my %tex = (
2252 food => [ 2644 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2647 ],
2256 grace => [ 2648 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 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/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2651 ],
2260 hp => [ 2652 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2655 ],
2264 mana => [ 2656 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 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/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2659 ],
2268); 2660);
2269 2661
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2374} 2766}
2375 2767
2376############################################################################# 2768#############################################################################
2377 2769
2378package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2379 2771
2380our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2381 2773
2382sub new { 2774sub new {
2383 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2384 2776
2385 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2779 can_hover => 1,
2388 can_events => 1, 2780 can_events => 1,
2389 %arg, 2781 %arg,
2390 ); 2782 );
2391 2783
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $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); 2785 $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"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2787
2396 $self 2788 $self
2397} 2789}
2398 2790
2399sub set_fontsize { 2791sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2421} 2813}
2422 2814
2423############################################################################# 2815#############################################################################
2424 2816
2425package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2426 2818
2427use strict; 2819use strict;
2428 2820
2429use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2430 2822
2431our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2432 2824
2433my @tex = 2825my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2436 2828
2437sub new { 2829sub new {
2438 my $class = shift; 2830 my $class = shift;
2439 2831
… …
2533sub invoke_mouse_wheel { 2925sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2535 2927
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 2933
2540 ! ! $delta 2934 ! ! $delta
2541} 2935}
2542 2936
2543sub update { 2937sub update {
… …
2594 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2595} 2989}
2596 2990
2597############################################################################# 2991#############################################################################
2598 2992
2599package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2600 2994
2601our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2602 2996
2603sub new { 2997sub new {
2604 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2605 2999
2606 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2607 3001
2608 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 3005 to_value => sub { shift },
2612 from_value => sub { shift }, 3006 from_value => sub { shift },
2613 %arg, 3007 %arg,
2614 ); 3008 );
2615 3009
… …
2635sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2637 3031
2638############################################################################# 3032#############################################################################
2639 3033
2640package CFClient::UI::TextScroller; 3034package CFPlus::UI::TextScroller;
2641 3035
2642our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2643 3037
2644use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2645 3039
2646sub new { 3040sub new {
2647 my $class = shift; 3041 my $class = shift;
2648 3042
2649 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3045 can_events => 1,
2652 indent => 0, 3046 indent => 0,
2653 #font => default_font 3047 #font => default_font
2654 @_, 3048 @_,
2655 3049
2656 layout => (new CFClient::Layout), 3050 layout => (new CFPlus::Layout),
2657 par => [], 3051 par => [],
3052 max_par => 0,
2658 height => 0, 3053 height => 0,
2659 children => [ 3054 children => [
2660 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2662 ], 3057 ],
2663 ); 3058 );
2664 3059
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3061
… …
2743 3138
2744 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2746} 3141}
2747 3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
3156}
3157
2748sub clear { 3158sub clear {
2749 my ($self) = @_; 3159 my ($self) = @_;
2750 3160
2751 my (undef, undef, @other) = @{ $self->{children} }; 3161 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other; 3162 $self->remove ($_) for @other;
… …
2755 $self->{height} = 0; 3165 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 3167}
2758 3168
2759sub add_paragraph { 3169sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 3170 my $self = shift;
2761 3171
2762 my ($text, @w) = ref $para ? @$para : $para; 3172 for my $para (@_) {
2763
2764 $para = { 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 3179 w => 1e10,
2766 wrapped => 1, 3180 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 3181 };
2772 3182
2773 $self->add (@w) if @w; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
2775 3190
2776 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2777 $self->update; 3192 $self->update;
2778} 3193}
2779 3194
2780sub scroll_to_bottom { 3195sub scroll_to_bottom {
2781 my ($self) = @_; 3196 my ($self) = @_;
2782 3197
2783 $self->{scroll_to_bottom} = 1; 3198 $self->{scroll_to} = $#{$self->{par}};
2784 $self->update; 3199 $self->update;
2785} 3200}
2786 3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
3224 $self->{height} = $height;
3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3226
3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
3233}
3234
2787sub update { 3235sub update {
2788 my ($self) = @_; 3236 my ($self) = @_;
2789 3237
2790 $self->SUPER::update; 3238 $self->SUPER::update;
2791 3239
2792 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2793 3241
2794 delete $self->{texture}; 3242 delete $self->{texture};
2795 3243
2796 $ROOT->on_post_alloc ($self => sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798 3248
2799 if (delete $self->{need_reflow}) {
2800 my $height = 0;
2801
2802 for my $para (@{$self->{par}}) {
2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804 my $layout = $self->get_layout ($para);
2805 my ($w, $h) = $layout->size;
2806
2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2810 }
2811
2812 $height += $para->{h};
2813 }
2814
2815 $self->{height} = $height;
2816
2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819 delete $self->{texture};
2820 }
2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2828 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2829 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2830 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2831 3262
2832 my $y0 = $top; 3263 my $y0 = $top;
2833 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2834 3265
2835 my $y = 0;
2836
2837 for my $para (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2838 my $h = $para->{h}; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2839 3269
2840 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2841
2842 my $layout = $self->get_layout ($para); 3271 my $layout = $self->get_layout ($para);
2843 3272
2844 $layout->render ($para->{indent}, $y - $y0); 3273 $layout->render ($para->{indent}, $y - $y0);
2845 3274
2846 if (my @w = @{ $para->{widget} }) { 3275 if (my @w = @{ $para->{widget} }) {
… …
2855 $_->draw; 3284 $_->draw;
2856 } 3285 }
2857 } 3286 }
2858 } 3287 }
2859 3288
2860 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2861 } 3291 }
3292
3293 $self->{top_paragraph} = $top_paragraph;
2862 }; 3294 };
2863 }); 3295 });
2864} 3296}
2865 3297
2866sub reconfigure { 3298sub reconfigure {
… …
2884 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2885} 3317}
2886 3318
2887############################################################################# 3319#############################################################################
2888 3320
2889package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2890 3322
2891use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2892 3324
2893our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2894 3326
2895sub moveto { 3327sub moveto {
2896 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2897 3329
2898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2926 glPopMatrix; 3358 glPopMatrix;
2927} 3359}
2928 3360
2929############################################################################# 3361#############################################################################
2930 3362
2931package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2932 3364
2933our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2934 3366
2935sub new { 3367sub new {
2936 my $class = shift; 3368 my $class = shift;
2937 3369
2938 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2950 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2951} 3383}
2952 3384
2953############################################################################# 3385#############################################################################
2954 3386
2955package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2956 3388
2957our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2958 3390
2959use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2960 3392
2961sub new { 3393sub new {
2962 my $class = shift; 3394 my $class = shift;
2963 3395
2964 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2967 ) 3399 )
2968} 3400}
2969 3401
2970sub set_tooltip_from { 3402sub set_tooltip_from {
2971 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2972 3407
2973 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2974 3409
2975 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2980 } 3415 }
2981 3416
2982 $tooltip =~ s/^\n+//; 3417 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//; 3418 $tooltip =~ s/\n+$//;
2984 3419
2985 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2986 markup => $tooltip, 3421 markup => $tooltip,
2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988 fontsize => 0.8, 3423 fontsize => 0.8,
2989 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2990 ellipsise => 0, 3425 ellipsise => 0,
2991 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2992 ); 3427 );
2993} 3428}
2994 3429
… …
3056 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
3057} 3492}
3058 3493
3059############################################################################# 3494#############################################################################
3060 3495
3061package CFClient::UI::Face; 3496package CFPlus::UI::Face;
3062 3497
3063our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
3064 3499
3065use CFClient::OpenGL; 3500use CFPlus::OpenGL;
3066 3501
3067sub new { 3502sub new {
3068 my $class = shift; 3503 my $class = shift;
3069 3504
3070 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
3071 aspect => 1, 3508 aspect => 1,
3072 can_events => 0, 3509 can_events => 0,
3073 @_, 3510 @_,
3074 ); 3511 );
3075 3512
3076 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
3077 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
3078 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3079 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
3080 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081 hard => 1, 3519 parked => 1,
3082 interval => $self->{animspeed},
3083 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
3084 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
3085 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
3086 }, 3528 },
3087 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
3088 } 3533 }
3089 3534
3090 $self 3535 $self
3091} 3536}
3092 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
3093sub size_request { 3568sub size_request {
3094 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
3095} 3584}
3096 3585
3097sub update { 3586sub update {
3098 my ($self) = @_; 3587 my ($self) = @_;
3099 3588
3100 return unless $self->{visible}; 3589 return unless $self->{visible};
3101 3590
3102 $self->SUPER::update; 3591 $self->SUPER::update;
3103} 3592}
3104 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3105sub _draw { 3602sub _draw {
3106 my ($self) = @_; 3603 my ($self) = @_;
3107 3604
3108 return unless $::CONN; 3605 return unless $::CONN;
3109 3606
3110 my $face; 3607 $self->SUPER::_draw;
3111 3608
3112 if ($self->{frame}) {
3113 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3114 3610 or return;
3115 $face = $anim->[ $self->{frame} % @$anim ]
3116 if $anim && @$anim;
3117 }
3118 3611
3119 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3120 3613
3121 if ($tex) { 3614 if ($tex) {
3122 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3124 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3128} 3621}
3129 3622
3130sub destroy { 3623sub destroy {
3131 my ($self) = @_; 3624 my ($self) = @_;
3132 3625
3133 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3134 if $self->{timer}; 3627 if $self->{timer};
3135 3628
3136 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3137} 3630}
3138 3631
3139############################################################################# 3632#############################################################################
3140 3633
3141package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
3142 3635
3143our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
3144 3637
3145# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
3146 3639
3147############################################################################# 3640#############################################################################
3148 3641
3149package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
3150 3643
3151our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
3152 3645
3153use CFClient::OpenGL; 3646use CFPlus::OpenGL;
3154 3647
3155sub new { 3648sub new {
3156 my $class = shift; 3649 my $class = shift;
3157 3650
3158 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3159 items => [], 3652 items => [],
3160 z => 100, 3653 z => 100,
3161 @_, 3654 @_,
3162 ); 3655 );
3163 3656
3164 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3165 3658
3166 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
3167 my ($widget, $cb, $tooltip) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
3168 3661
3169 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
3170 if (!ref $widget) { 3663 if (!ref $widget) {
3171 if ($widget =~ /\t/) { 3664 if ($widget =~ /\t/) {
3172 my ($left, $right) = split /\t/, $widget, 2; 3665 my ($left, $right) = split /\t/, $widget, 2;
3173 3666
3174 $widget = new CFClient::UI::HBox 3667 $widget = new CFPlus::UI::HBox
3175 can_hover => 1, 3668 can_hover => 1,
3176 can_events => 1, 3669 can_events => 1,
3177 tooltip => $tooltip, 3670 tooltip => $tooltip,
3178 children => [ 3671 children => [
3179 (new CFClient::UI::Label markup => $left, expand => 1), 3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3180 (new CFClient::UI::Label markup => $right, align => +1), 3673 (new CFPlus::UI::Label markup => $right, align => +1),
3181 ], 3674 ],
3182 ; 3675 ;
3183 3676
3184 } else { 3677 } else {
3185 $widget = new CFClient::UI::Label 3678 $widget = new CFPlus::UI::Label
3186 can_hover => 1, 3679 can_hover => 1,
3187 can_events => 1, 3680 can_events => 1,
3188 markup => $widget, 3681 markup => $widget,
3189 tooltip => $tooltip; 3682 tooltip => $tooltip;
3190 } 3683 }
… …
3238 1 3731 1
3239} 3732}
3240 3733
3241############################################################################# 3734#############################################################################
3242 3735
3243package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
3244 3737
3245our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
3246 3739
3247sub new { 3740sub new {
3248 my $class = shift; 3741 my $class = shift;
3249 3742
3250 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
3311 $self->{current}->draw; 3804 $self->{current}->draw;
3312} 3805}
3313 3806
3314############################################################################# 3807#############################################################################
3315 3808
3316package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3317 3810
3318our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3319 3812
3320sub new { 3813sub new {
3321 my $class = shift; 3814 my $class = shift;
3322 3815
3323 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3324 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3325 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3326 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3327 @_, 3820 @_,
3328 ); 3821 );
3329 3822
3330 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3334} 3827}
3335 3828
3336sub add { 3829sub add {
3337 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3338 3831
3339 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3340 3833
3341 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3342 markup => $title, 3835 markup => $title,
3343 tooltip => $tooltip, 3836 tooltip => $tooltip,
3344 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3345 ); 3838 );
3346 3839
… …
3360 $self->emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3361} 3854}
3362 3855
3363############################################################################# 3856#############################################################################
3364 3857
3365package CFClient::UI::Combobox; 3858package CFPlus::UI::Selector;
3366 3859
3367use utf8; 3860use utf8;
3368 3861
3369our @ISA = CFClient::UI::Button::; 3862our @ISA = CFPlus::UI::Button::;
3370 3863
3371sub new { 3864sub new {
3372 my $class = shift; 3865 my $class = shift;
3373 3866
3374 my $self = $class->SUPER::new ( 3867 my $self = $class->SUPER::new (
… …
3391 my ($value, $title, $tooltip) = @$_; 3884 my ($value, $title, $tooltip) = @$_;
3392 3885
3393 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3394 } 3887 }
3395 3888
3396 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3397} 3890}
3398 3891
3399sub _set_value { 3892sub _set_value {
3400 my ($self, $value) = @_; 3893 my ($self, $value) = @_;
3401 3894
… …
3416 $self->emit (changed => $value); 3909 $self->emit (changed => $value);
3417} 3910}
3418 3911
3419############################################################################# 3912#############################################################################
3420 3913
3421package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3422 3915
3423our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3424 3917
3425sub new { 3918sub new {
3426 my $class = shift; 3919 my $class = shift;
3427 3920
3428 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3429 fontsize => 0.8, 3922 fontsize => 0.8,
3430 @_, 3923 @_,
3431 ); 3924 );
3432 3925
3433 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3434 3927
3435 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3436 3929
3437 $self 3930 $self
3438} 3931}
… …
3440sub reorder { 3933sub reorder {
3441 my ($self) = @_; 3934 my ($self) = @_;
3442 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3443 3936
3444 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3445 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3446 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3447 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3448 3941
3449 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3450 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3451 } 3944 }
… …
3472 for ($short) { 3965 for ($short) {
3473 s/^\s+//; 3966 s/^\s+//;
3474 s/\s+/ /g; 3967 s/\s+/ /g;
3475 } 3968 }
3476 3969
3477 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3478 markup => $short, 3971 markup => $short,
3479 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3480 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3481 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3482 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3561 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3562} 4055}
3563 4056
3564############################################################################# 4057#############################################################################
3565 4058
3566package CFClient::UI::Inventory;
3567
3568our @ISA = CFClient::UI::Table::;
3569
3570sub new {
3571 my $class = shift;
3572
3573 my $self = $class->SUPER::new (
3574 col_expand => [0, 1, 0],
3575 items => [],
3576 @_,
3577 );
3578
3579 $self->set_sort_order (undef);
3580
3581 $self
3582}
3583
3584sub update_items {
3585 my ($self) = @_;
3586
3587 $self->clear;
3588
3589 my @item = $self->{sort}->(@{ $self->{items} });
3590
3591 my @adds;
3592 my $row = 0;
3593 for my $item ($self->{sort}->(@{ $self->{items} })) {
3594 CFClient::Item::update_widgets $item;
3595
3596 push @adds, 0, $row, $item->{face_widget};
3597 push @adds, 1, $row, $item->{desc_widget};
3598 push @adds, 2, $row, $item->{weight_widget};
3599
3600 $row++;
3601 }
3602
3603 $self->add (@adds);
3604}
3605
3606sub set_sort_order {
3607 my ($self, $order) = @_;
3608
3609 $self->{sort} = $order ||= sub {
3610 sort {
3611 $a->{type} <=> $b->{type}
3612 or $a->{name} cmp $b->{name}
3613 } @_
3614 };
3615
3616 $self->update_items;
3617}
3618
3619sub set_items {
3620 my ($self, $items) = @_;
3621
3622 $self->{items} = [$items ? values %$items : ()];
3623 $self->update_items;
3624}
3625
3626#############################################################################
3627
3628package CFClient::UI::SpellList;
3629
3630our @ISA = CFClient::UI::Table::;
3631
3632sub new {
3633 my $class = shift;
3634
3635 my $self = $class->SUPER::new (
3636 binding => [],
3637 commands => [],
3638 @_,
3639 )
3640}
3641
3642my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3643
3644my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3645 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3646my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3648my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3652my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3654
3655sub rebuild_spell_list {
3656 my ($self) = @_;
3657
3658 $CFClient::UI::ROOT->on_refresh ($self => sub {
3659 $self->clear;
3660
3661 return unless $::CONN;
3662
3663 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3664 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3665 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3666 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3667 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3668
3669 my $row = 0;
3670
3671 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3672 my $spell = $self->{spell}{$_};
3673
3674 $row++;
3675
3676 my $spell_cb = sub {
3677 my ($widget, $ev) = @_;
3678
3679 if ($ev->{button} == 1) {
3680 $::CONN->user_send ("cast $spell->{name}");
3681 } elsif ($ev->{button} == 2) {
3682 $::CONN->user_send ("invoke $spell->{name}");
3683 } elsif ($ev->{button} == 3) {
3684 (new CFClient::UI::Menu
3685 items => [
3686 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3687 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3688 ],
3689 )->popup ($ev);
3690 } else {
3691 return 0;
3692 }
3693
3694 1
3695 };
3696
3697 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3698
3699 #TODO: add path info to tooltip
3700 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3701
3702 $self->add (0, $row, new CFClient::UI::Face
3703 face => $spell->{face},
3704 can_hover => 1,
3705 can_events => 1,
3706 tooltip => $tooltip,
3707 on_button_down => $spell_cb,
3708 );
3709
3710 $self->add (1, $row, new CFClient::UI::Label
3711 expand => 1,
3712 text => $spell->{name},
3713 can_hover => 1,
3714 can_events => 1,
3715 tooltip => $tooltip,
3716 on_button_down => $spell_cb,
3717 );
3718
3719 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3720 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3721 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3722 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3723 }
3724 });
3725}
3726
3727sub add_spell {
3728 my ($self, $spell) = @_;
3729
3730 $self->{spell}->{$spell->{name}} = $spell;
3731 $self->rebuild_spell_list;
3732}
3733
3734sub remove_spell {
3735 my ($self, $spell) = @_;
3736
3737 delete $self->{spell}->{$spell->{name}};
3738 $self->rebuild_spell_list;
3739}
3740
3741sub clear_spells {
3742 my ($self) = @_;
3743
3744 $self->{spell} = {};
3745 $self->rebuild_spell_list;
3746}
3747
3748#############################################################################
3749
3750package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3751 4060
3752our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3753 4062
3754use List::Util qw(min max); 4063use List::Util qw(min max);
3755 4064
3756use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3757 4066
3758sub new { 4067sub new {
3759 my $class = shift; 4068 my $class = shift;
3760 4069
3761 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3762 visible => 1, 4071 visible => 1,
3763 @_, 4072 @_,
3764 ); 4073 );
3765 4074
3766 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3767 4076
3768 $self 4077 $self
3769} 4078}
3770 4079
3771sub size_request { 4080sub size_request {
… …
3940 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3941 4250
3942 $w = max $widget->{min_w}, $w; 4251 $w = max $widget->{min_w}, $w;
3943 $h = max $widget->{min_h}, $h; 4252 $h = max $widget->{min_h}, $h;
3944 4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
3945 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3947 4259
3948 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3949 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
… …
3962 4274
3963 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3964 $_->() 4276 $_->()
3965 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3966 } 4278 }
3967
3968 4279
3969 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3970 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3971 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3972 4283
… …
3975 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3976 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3977 glLoadIdentity; 4288 glLoadIdentity;
3978 4289
3979 { 4290 {
3980 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3981 4292
3982 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3983 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3984 }
3985 4295
3986 $self->_draw; 4296 $self->_draw;
4297 }
3987} 4298}
3988 4299
3989############################################################################# 4300#############################################################################
3990 4301
3991package CFClient::UI; 4302package CFPlus::UI;
3992 4303
3993$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3994$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3995 4306
39961 43071
3997 4308

Diff Legend

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