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.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 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 {
432 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
433 441
442 Carp::confess unless $self->{parent};#d#
443
434 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435} 445}
436 446
437# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
438sub coord2global { 448sub coord2global {
439 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
450
451 Carp::confess unless $self->{parent};#d#
440 452
441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442} 454}
443 455
444sub invoke_focus_in { 456sub invoke_focus_in {
… …
492 504
493sub connect { 505sub connect {
494 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
495 507
496 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
497} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
498 528
499sub emit { 529sub emit {
500 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
501 531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
502 my @append 534 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event") 535 = $has_coords{$signal}
504 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
505 : (); 537 : ();
506 538
507 #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#
508 540
509 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
511 || ($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
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
513} 550}
514 551
515sub find_widget { 552sub find_widget {
516 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
517 554
… …
525} 562}
526 563
527sub set_parent { 564sub set_parent {
528 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
529 566
530 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
531 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
532} 569}
533 570
534sub realloc { 571sub realloc {
535 my ($self) = @_; 572 my ($self) = @_;
… …
601 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
602 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
603 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
604 glEnd; 641 glEnd;
605 glPopMatrix; 642 glPopMatrix;
606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
607 } 644 }
608 645
609 $self->_draw; 646 $self->_draw;
610 glPopMatrix; 647 glPopMatrix;
611} 648}
… …
614 my ($self) = @_; 651 my ($self) = @_;
615 652
616 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
617} 654}
618 655
656my $cntx;#d#
619sub DESTROY { 657sub DESTROY {
620 my ($self) = @_; 658 my ($self) = @_;
621 659
622 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
623
624 delete $WIDGET{$self+0};
625 661
626 eval { $self->destroy }; 662 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
628} 666}
629 667
630############################################################################# 668#############################################################################
631 669
632package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
633 671
634our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
635 673
636use strict; 674use strict;
637use CFClient::OpenGL; 675use CFPlus::OpenGL;
638 676
639sub new { 677sub new {
640 my $class = shift; 678 my $class = shift;
641 679
642 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
673 } 711 }
674} 712}
675 713
676############################################################################# 714#############################################################################
677 715
678package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
679 717
680our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
681 719
682sub new { 720sub new {
683 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
684 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
685} 723}
… …
692 730
693sub draw { } 731sub draw { }
694 732
695############################################################################# 733#############################################################################
696 734
697package CFClient::UI::Container; 735package CFPlus::UI::Container;
698 736
699our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
700 738
701sub new { 739sub new {
702 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
703 741
704 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
713 if $children; 751 if $children;
714 752
715 $self 753 $self
716} 754}
717 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
718sub add { 764sub add {
719 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
720 766
721 $_->set_parent ($self) 767 $_->set_parent ($self)
722 for @widgets; 768 for @widgets;
… …
782 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
783} 829}
784 830
785############################################################################# 831#############################################################################
786 832
787package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
788 834
789our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
790 836
791sub new { 837sub new {
792 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
793 839
794 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795 841
796 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
797} 843}
798 844
799sub add { 845sub add {
… …
806sub remove { 852sub remove {
807 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
808 854
809 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
810 856
811 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
812 unless @{$self->{children}}; 858 unless @{$self->{children}};
813} 859}
814 860
815sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
816 862
… …
828 874
829############################################################################# 875#############################################################################
830 876
831# back-buffered drawing area 877# back-buffered drawing area
832 878
833package CFClient::UI::Window; 879package CFPlus::UI::Window;
834 880
835our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
836 882
837use CFClient::OpenGL; 883use CFPlus::OpenGL;
838 884
839sub new { 885sub new {
840 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
841 887
842 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
864} 910}
865 911
866sub render_child { 912sub render_child {
867 my ($self) = @_; 913 my ($self) = @_;
868 914
869 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
870 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
871 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
872 918
873 { 919 {
874 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
875 921
876 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
878 } 926 }
879
880 $self->_render;
881 }; 927 };
882} 928}
883 929
884sub _draw { 930sub _draw {
885 my ($self) = @_; 931 my ($self) = @_;
886
887 my ($w, $h) = @$self{qw(w h)};
888 932
889 my $tex = $self->{texture} 933 my $tex = $self->{texture}
890 or return; 934 or return;
891 935
892 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
895 939
896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
897 941
898 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
899} 943}
900 944
901############################################################################# 945#############################################################################
902 946
903package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
904 948
949use List::Util qw(min max);
950
905our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
906 952
907sub new { 953sub new {
908 my $class = shift; 954 my $class = shift;
909 955
910 $class->SUPER::new ( 956 $class->SUPER::new (
… …
940} 986}
941 987
942sub set_offset { 988sub set_offset {
943 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
944 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
945 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
946 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
947 997
998 $self->emit (changed => $x, $y);
948 $self->update; 999 $self->update;
1000 }
949} 1001}
950 1002
951# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
952sub coord2local { 1004sub coord2local {
953 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
970 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
972 ) { 1024 ) {
973 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974 } else { 1026 } else {
975 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
976 } 1028 }
977} 1029}
978 1030
979sub _render { 1031sub _render {
980 my ($self) = @_; 1032 my ($self) = @_;
981 1033
982 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
983 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984 1036
985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986 1038
987 $self->SUPER::_render; 1039 $self->SUPER::_render;
988} 1040}
989 1041
990############################################################################# 1042#############################################################################
991 1043
992package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
993 1045
994our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
995 1047
996sub new { 1048sub new {
997 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
998 1050
999 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1000 1052
1001 my $self; 1053 my $self;
1002 1054
1003 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1004 vertical => 1, 1065 vertical => 1,
1005 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1006 on_changed => sub { 1067 on_changed => sub {
1007 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008 }, 1070 },
1009 ; 1071 ;
1010 1072
1011 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1012 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1013 can_events => 1, 1076 can_events => 1,
1014 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1015 %arg, 1081 %arg,
1016 ); 1082 );
1017 1083
1018 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
1019 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1020 1101
1021 $self 1102 $self
1022} 1103}
1023 1104
… …
1027 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1028 1109
1029 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1030} 1111}
1031 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1032sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1034 1146
1035 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1036 1148
1037 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1038 1150
1039 1 1151 1
1040} 1152}
1041 1153
1042sub update_slider { 1154sub invoke_button_down {
1043 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1044 1156
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1046} 1158 $self->grab_focus;
1047 1159
1048sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1049 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1050 1165
1051 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1052 1169
1053 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1054} 1195}
1055 1196
1056sub invoke_size_allocate { 1197sub invoke_size_allocate {
1057 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1058 1199
1059 $self->update_slider; 1200 $self->update_slider;
1060
1061 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1062} 1202}
1063 1203
1064############################################################################# 1204#############################################################################
1065 1205
1066package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1067 1207
1068our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1069 1209
1070use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1071 1211
1072sub new { 1212sub new {
1073 my $class = shift; 1213 my $class = shift;
1074 1214
1075 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1101 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1102} 1242}
1103 1243
1104############################################################################# 1244#############################################################################
1105 1245
1106package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1107 1247
1108our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1109 1249
1110use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1251
1252sub new {
1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1111 1351
1112my $bg = 1352my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1115 1355
1116my @border = 1356my @border =
1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1119 1363
1120sub new { 1364sub new {
1121 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1122 1366
1123 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
… …
1128 min_w => 64, 1372 min_w => 64,
1129 min_h => 32, 1373 min_h => 32,
1130 %arg, 1374 %arg,
1131 ); 1375 );
1132 1376
1133 $self->{title_widget} = new CFClient::UI::Label 1377 $self->{title_widget} = new CFPlus::UI::Label
1134 align => 0, 1378 align => 0,
1135 valign => 1, 1379 valign => 1,
1136 text => $self->{title}, 1380 text => $self->{title},
1137 fontsize => $self->{border}, 1381 fontsize => $self->{border},
1138 if exists $self->{title}; 1382 if exists $self->{title};
1139 1383
1140 if ($self->{has_close_button}) { 1384 if ($self->{has_close_button}) {
1141 $self->{close_button} = 1385 $self->{close_button} =
1142 new CFClient::UI::ImageButton 1386 new CFPlus::UI::ImageButton
1143 path => 'x1_close.png', 1387 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") }; 1388 on_activate => sub { $self->emit ("delete") };
1145 1389
1146 $self->CFClient::UI::Container::add ($self->{close_button}); 1390 $self->CFPlus::UI::Container::add ($self->{close_button});
1147 } 1391 }
1148 1392
1149 $self 1393 $self
1150} 1394}
1151 1395
1152sub add { 1396sub add {
1153 my ($self, @widgets) = @_; 1397 my ($self, @widgets) = @_;
1154 1398
1155 $self->SUPER::add (@widgets); 1399 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1400 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1401 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158} 1402}
1159 1403
1160sub border { 1404sub border {
1161 int $_[0]{border} * $::FONTSIZE 1405 int $_[0]{border} * $::FONTSIZE
1162} 1406}
… …
1270 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1514 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271 1515
1272 ! ! $self->{motion} 1516 ! ! $self->{motion}
1273} 1517}
1274 1518
1519sub invoke_visibility_change {
1520 my ($self, $visible) = @_;
1521
1522 delete $self->{motion} unless $visible;
1523
1524 0
1525}
1526
1275sub _draw { 1527sub _draw {
1276 my ($self) = @_; 1528 my ($self) = @_;
1277 1529
1278 my $child = $self->{children}[0]; 1530 my $child = $self->{children}[0];
1279 1531
… …
1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1285 1537
1286 my $border = $self->border; 1538 my $border = $self->border;
1287 1539
1288 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1289 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1292 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1293 1559
1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1295 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1296 1562
1297 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1316 if $self->{close_button}; 1582 if $self->{close_button};
1317} 1583}
1318 1584
1319############################################################################# 1585#############################################################################
1320 1586
1321package CFClient::UI::Table; 1587package CFPlus::UI::Table;
1322 1588
1323our @ISA = CFClient::UI::Base::; 1589our @ISA = CFPlus::UI::Base::;
1324 1590
1325use List::Util qw(max sum); 1591use List::Util qw(max sum);
1326 1592
1327use CFClient::OpenGL; 1593use CFPlus::OpenGL;
1328 1594
1329sub new { 1595sub new {
1330 my $class = shift; 1596 my $class = shift;
1331 1597
1332 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1333 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1334 @_, 1602 @_,
1335 ) 1603 )
1336} 1604}
1337 1605
1338sub children { 1606sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340} 1608}
1341 1609
1610# TODO: store row/col info in child widget and use standard add/del
1342sub add { 1611sub add {
1343 my ($self, $x, $y, $child) = @_; 1612 my $self = shift;
1344 1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1620
1621 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1345 $child->set_parent ($self); 1624 $child->set_parent ($self);
1346 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1626 }
1347 1627
1628 $self->{force_realloc} = 1;
1629 $self->{force_size_alloc} = 1;
1348 $self->realloc; 1630 $self->realloc;
1349} 1631}
1350 1632
1351sub remove { 1633sub remove {
1352 my ($self, $child) = @_; 1634 my ($self, $child) = @_;
1353 1635
1354 # TODO: not yet implemented 1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1355} 1641}
1356 1642
1357# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1358sub clear { 1644sub clear {
1359 my ($self) = @_; 1645 my ($self) = @_;
… …
1408 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1409 1695
1410 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1411 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1412 1698
1413 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1414 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1415 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1416 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1417 1703
1418 # linearly scale sizes
1419 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421 1705
1422 CFClient::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1423 CFClient::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1424 1715
1425 my $y; 1716 my $y;
1426 1717
1427 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
1428 my $row = $self->{children}[$r] 1719 my $row = $self->{children}[$r]
… …
1471 } 1762 }
1472} 1763}
1473 1764
1474############################################################################# 1765#############################################################################
1475 1766
1476package CFClient::UI::Box; 1767package CFPlus::UI::Fixed;
1477 1768
1769use List::Util qw(min max);
1770
1478our @ISA = CFClient::UI::Container::; 1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1845}
1846
1847#############################################################################
1848
1849package CFPlus::UI::Box;
1850
1851our @ISA = CFPlus::UI::Container::;
1479 1852
1480sub size_request { 1853sub size_request {
1481 my ($self) = @_; 1854 my ($self) = @_;
1482 1855
1483 $self->{vertical} 1856 $self->{vertical}
… …
1516 $req[$_] += $space * $children[$_]{expand} 1889 $req[$_] += $space * $children[$_]{expand}
1517 for 0 .. $#children; 1890 for 0 .. $#children;
1518 } 1891 }
1519 } 1892 }
1520 1893
1521 CFClient::UI::harmonize \@req; 1894 CFPlus::UI::harmonize \@req;
1522 1895
1523 my $pos = 0; 1896 my $pos = 0;
1524 for (0 .. $#children) { 1897 for (0 .. $#children) {
1525 my $alloc = $req[$_]; 1898 my $alloc = $req[$_];
1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1899 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1531 1 1904 1
1532} 1905}
1533 1906
1534############################################################################# 1907#############################################################################
1535 1908
1536package CFClient::UI::HBox; 1909package CFPlus::UI::HBox;
1537 1910
1538our @ISA = CFClient::UI::Box::; 1911our @ISA = CFPlus::UI::Box::;
1539 1912
1540sub new { 1913sub new {
1541 my $class = shift; 1914 my $class = shift;
1542 1915
1543 $class->SUPER::new ( 1916 $class->SUPER::new (
… …
1546 ) 1919 )
1547} 1920}
1548 1921
1549############################################################################# 1922#############################################################################
1550 1923
1551package CFClient::UI::VBox; 1924package CFPlus::UI::VBox;
1552 1925
1553our @ISA = CFClient::UI::Box::; 1926our @ISA = CFPlus::UI::Box::;
1554 1927
1555sub new { 1928sub new {
1556 my $class = shift; 1929 my $class = shift;
1557 1930
1558 $class->SUPER::new ( 1931 $class->SUPER::new (
… …
1561 ) 1934 )
1562} 1935}
1563 1936
1564############################################################################# 1937#############################################################################
1565 1938
1566package CFClient::UI::Label; 1939package CFPlus::UI::Label;
1567 1940
1568our @ISA = CFClient::UI::DrawBG::; 1941our @ISA = CFPlus::UI::DrawBG::;
1569 1942
1570use CFClient::OpenGL; 1943use CFPlus::OpenGL;
1571 1944
1572sub new { 1945sub new {
1573 my ($class, %arg) = @_; 1946 my ($class, %arg) = @_;
1574 1947
1575 my $self = $class->SUPER::new ( 1948 my $self = $class->SUPER::new (
… …
1578 #active_bg => none 1951 #active_bg => none
1579 #font => default_font 1952 #font => default_font
1580 #text => initial text 1953 #text => initial text
1581 #markup => initial narkup 1954 #markup => initial narkup
1582 #max_w => maximum pixel width 1955 #max_w => maximum pixel width
1956 #style => 0, # render flags
1583 ellipsise => 3, # end 1957 ellipsise => 3, # end
1584 layout => (new CFClient::Layout), 1958 layout => (new CFPlus::Layout),
1585 fontsize => 1, 1959 fontsize => 1,
1586 align => -1, 1960 align => -1,
1587 valign => -1, 1961 valign => -1,
1588 padding_x => 2, 1962 padding_x => 2,
1589 padding_y => 2, 1963 padding_y => 2,
1590 can_events => 0, 1964 can_events => 0,
1591 %arg 1965 %arg
1592 ); 1966 );
1593 1967
1594 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1595 my $layout = new CFClient::Layout; 1969 my $layout = new CFPlus::Layout;
1596 $layout->set_text (delete $self->{template}); 1970 $layout->set_text (delete $self->{template});
1597 $self->{template} = $layout; 1971 $self->{template} = $layout;
1598 } 1972 }
1599 1973
1600 if (exists $self->{markup}) { 1974 if (exists $self->{markup}) {
… …
1602 } else { 1976 } else {
1603 $self->set_text (delete $self->{text}); 1977 $self->set_text (delete $self->{text});
1604 } 1978 }
1605 1979
1606 $self 1980 $self
1607}
1608
1609sub escape($) {
1610 local $_ = $_[0];
1611
1612 s/&/&amp;/g;
1613 s/>/&gt;/g;
1614 s/</&lt;/g;
1615
1616 $_
1617} 1981}
1618 1982
1619sub update { 1983sub update {
1620 my ($self) = @_; 1984 my ($self) = @_;
1621 1985
… …
1748 }; 2112 };
1749 2113
1750 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2114 my $w = List::Util::min $self->{w} + 4, $size->[0];
1751 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2115 my $h = List::Util::min $self->{h} + 2, $size->[1];
1752 2116
1753 $self->{layout}->render ($self->{ox}, $self->{oy}); 2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754} 2118}
1755 2119
1756############################################################################# 2120#############################################################################
1757 2121
1758package CFClient::UI::EntryBase; 2122package CFPlus::UI::EntryBase;
1759 2123
1760our @ISA = CFClient::UI::Label::; 2124our @ISA = CFPlus::UI::Label::;
1761 2125
1762use CFClient::OpenGL; 2126use CFPlus::OpenGL;
1763 2127
1764sub new { 2128sub new {
1765 my $class = shift; 2129 my $class = shift;
1766 2130
1767 $class->SUPER::new ( 2131 $class->SUPER::new (
… …
1771 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1772 can_hover => 1, 2136 can_hover => 1,
1773 can_focus => 1, 2137 can_focus => 1,
1774 valign => 0, 2138 valign => 0,
1775 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1776 #text => ... 2141 #text => ...
1777 #hidden => "*", 2142 #hidden => "*",
1778 @_ 2143 @_
1779 ) 2144 )
1780} 2145}
… …
1825 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1826 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1827 2192
1828 my $text = $self->get_text; 2193 my $text = $self->get_text;
1829 2194
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2196
1830 if ($uni == 8) { 2197 if ($uni == 8) {
1831 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1833 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1834 } elsif ($sym == CFClient::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1835 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1836 } elsif ($sym == CFClient::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1837 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1838 } elsif ($sym == CFClient::SDLK_HOME) { 2205 } elsif ($sym == CFPlus::SDLK_HOME) {
2206 # what a hack
2207 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1
2210 : 0;
2211 } elsif ($sym == CFPlus::SDLK_END) {
2212 # uh, again
2213 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2215 ? $self->{cursor} + length $1
2216 : length $self->{text};
2217 } elsif ($uni == 21) { # ctrl-u
2218 $text = "";
1839 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1840 } elsif ($sym == CFClient::SDLK_END) {
1841 $self->{cursor} = length $text;
1842 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1843 $self->emit ('escape'); 2221 $self->emit ('escape');
1844 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1845 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else { 2226 } else {
1847 return 0; 2227 return 0;
1848 } 2228 }
1849 2229
1850 $self->_set_text ($text); 2230 $self->_set_text ($text);
1851 2231
1852 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1853 2234
1854 1 2235 1
1855} 2236}
1856 2237
1857sub invoke_focus_in { 2238sub invoke_focus_in {
… …
1919 utf8::encode $text; 2300 utf8::encode $text;
1920 2301
1921 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922 } 2303 }
1923 2304
1924 glColor @{$self->{fg}};
1925 glBegin GL_LINES; 2305 glBegin GL_LINES;
1926 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928 glEnd; 2308 glEnd;
1929 } 2309 }
1930} 2310}
1931 2311
2312#############################################################################
2313
1932package CFClient::UI::Entry; 2314package CFPlus::UI::Entry;
1933 2315
1934our @ISA = CFClient::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1935 2317
1936use CFClient::OpenGL; 2318use CFPlus::OpenGL;
1937 2319
1938sub invoke_key_down { 2320sub invoke_key_down {
1939 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1940 2322
1941 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1942 2324
1943 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1944 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1945 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1946 2328
1947 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1948 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1949 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
1950 $self->update; 2332 $self->update;
1951 2333
1952 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == CFPlus::SDLK_UP) {
1953 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1954 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1955 } 2337 }
1956 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1957 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1959 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1960 } 2342 }
1961 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1962 } 2344 }
1963 2345
1964 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
1965 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1966 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967 2349
1968 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1969 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1978 1 2360 1
1979} 2361}
1980 2362
1981############################################################################# 2363#############################################################################
1982 2364
2365package CFPlus::UI::TextEdit;
2366
2367our @ISA = CFPlus::UI::EntryBase::;
2368
2369use CFPlus::OpenGL;
2370
2371sub move_cursor_ver {
2372 my ($self, $dy) = @_;
2373
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375
2376 $y += $dy;
2377
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2379 $self->{cursor} = $index;
2380 delete $self->{cur_h};
2381 $self->update;
2382 return;
2383 }
2384}
2385
2386sub invoke_key_down {
2387 my ($self, $ev) = @_;
2388
2389 my $sym = $ev->{sym};
2390
2391 if ($sym == CFPlus::SDLK_UP) {
2392 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1);
2395 } else {
2396 return $self->SUPER::invoke_key_down ($ev)
2397 }
2398
2399 1
2400}
2401
2402#############################################################################
2403
1983package CFClient::UI::Button; 2404package CFPlus::UI::Button;
1984 2405
1985our @ISA = CFClient::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
1986 2407
1987use CFClient::OpenGL; 2408use CFPlus::OpenGL;
1988 2409
1989my @tex = 2410my @tex =
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
1992 2413
1993sub new { 2414sub new {
1994 my $class = shift; 2415 my $class = shift;
1995 2416
1996 $class->SUPER::new ( 2417 $class->SUPER::new (
1997 padding_x => 4, 2418 padding_x => 4,
1998 padding_y => 4, 2419 padding_y => 4,
1999 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
2000 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
2001 can_hover => 1, 2422 can_hover => 1,
2002 align => 0, 2423 align => 0,
2003 valign => 0, 2424 valign => 0,
2004 can_events => 1, 2425 can_events => 1,
2005 @_ 2426 @_
… …
2023 2444
2024 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2027 2448
2449 my $tex = $tex[$GRAB == $self];
2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2029 2451
2030 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2031 2453
2032 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2033} 2455}
2034 2456
2035############################################################################# 2457#############################################################################
2036 2458
2459package CFPlus::UI::CheckBox;
2460
2461our @ISA = CFPlus::UI::DrawBG::;
2462
2463my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2466
2467use CFPlus::OpenGL;
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2473 padding_x => 2,
2474 padding_y => 2,
2475 fg => [1, 1, 1],
2476 active_fg => [1, 1, 0],
2477 bg => [0, 0, 0, 0.2],
2478 active_bg => [1, 1, 1, 0.5],
2479 state => 0,
2480 can_hover => 1,
2481 @_
2482 )
2483}
2484
2485sub size_request {
2486 my ($self) = @_;
2487
2488 (6) x 2
2489}
2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
2499sub invoke_button_down {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2504 $self->toggle;
2505 } else {
2506 return 0
2507 }
2508
2509 1
2510}
2511
2512sub _draw {
2513 my ($self) = @_;
2514
2515 $self->SUPER::_draw;
2516
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2518
2519 my ($w, $h) = @$self{qw(w h)};
2520
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522
2523 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2524
2525 my $tex = $self->{state} ? $tex[1] : $tex[0];
2526
2527 glEnable GL_TEXTURE_2D;
2528 $tex->draw_quad_alpha (0, 0, $s, $s);
2529 glDisable GL_TEXTURE_2D;
2530}
2531
2532#############################################################################
2533
2534package CFPlus::UI::Image;
2535
2536our @ISA = CFPlus::UI::Base::;
2537
2538use CFPlus::OpenGL;
2539
2540our %texture_cache;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 @_,
2548 );
2549
2550 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required";
2552
2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2555
2556 CFPlus::weaken $texture_cache{$self->{path}};
2557
2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2559
2560 $self
2561}
2562
2563sub STORABLE_freeze {
2564 my ($self, $cloning) = @_;
2565
2566 $self->{path}
2567 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2568
2569 $self->{path}
2570}
2571
2572sub STORABLE_attach {
2573 my ($self, $cloning, $path) = @_;
2574
2575 $self->new (path => $path)
2576}
2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 ($self->{tex}{w}, $self->{tex}{h})
2582}
2583
2584sub _draw {
2585 my ($self) = @_;
2586
2587 my $tex = $self->{tex};
2588
2589 my ($w, $h) = ($self->{w}, $self->{h});
2590
2591 if ($self->{rot90}) {
2592 glRotate 90, 0, 0, 1;
2593 glTranslate 0, -$self->{w}, 0;
2594
2595 ($w, $h) = ($h, $w);
2596 }
2597
2598 glEnable GL_TEXTURE_2D;
2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2600
2601 $tex->draw_quad (0, 0, $w, $h);
2602
2603 glDisable GL_TEXTURE_2D;
2604}
2605
2606#############################################################################
2607
2037package CFClient::UI::ImageButton; 2608package CFPlus::UI::ImageButton;
2038 2609
2039our @ISA = CFClient::UI::Image::; 2610our @ISA = CFPlus::UI::Image::;
2040 2611
2041use CFClient::OpenGL; 2612use CFPlus::OpenGL;
2042 2613
2043my %textures; 2614my %textures;
2044 2615
2045sub new { 2616sub new {
2046 my $class = shift; 2617 my $class = shift;
… …
2068 1 2639 1
2069} 2640}
2070 2641
2071############################################################################# 2642#############################################################################
2072 2643
2073package CFClient::UI::CheckBox;
2074
2075our @ISA = CFClient::UI::DrawBG::;
2076
2077my @tex =
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081use CFClient::OpenGL;
2082
2083sub new {
2084 my $class = shift;
2085
2086 $class->SUPER::new (
2087 padding_x => 2,
2088 padding_y => 2,
2089 fg => [1, 1, 1],
2090 active_fg => [1, 1, 0],
2091 bg => [0, 0, 0, 0.2],
2092 active_bg => [1, 1, 1, 0.5],
2093 state => 0,
2094 can_hover => 1,
2095 @_
2096 )
2097}
2098
2099sub size_request {
2100 my ($self) = @_;
2101
2102 (6) x 2
2103}
2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2113sub invoke_button_down {
2114 my ($self, $ev, $x, $y) = @_;
2115
2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118 $self->toggle;
2119 } else {
2120 return 0
2121 }
2122
2123 1
2124}
2125
2126sub _draw {
2127 my ($self) = @_;
2128
2129 $self->SUPER::_draw;
2130
2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133 my ($w, $h) = @$self{qw(w h)};
2134
2135 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141 glEnable GL_TEXTURE_2D;
2142 $tex->draw_quad_alpha (0, 0, $s, $s);
2143 glDisable GL_TEXTURE_2D;
2144}
2145
2146#############################################################################
2147
2148package CFClient::UI::Image; 2644package CFPlus::UI::VGauge;
2149 2645
2150our @ISA = CFClient::UI::Base::; 2646our @ISA = CFPlus::UI::Base::;
2151
2152use CFClient::OpenGL;
2153
2154our %texture_cache;
2155
2156sub new {
2157 my $class = shift;
2158
2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2163
2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2166
2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174 $self
2175}
2176
2177sub size_request {
2178 my ($self) = @_;
2179
2180 ($self->{tex}{w}, $self->{tex}{h})
2181}
2182
2183sub _draw {
2184 my ($self) = @_;
2185
2186 my $tex = $self->{tex};
2187
2188 my ($w, $h) = ($self->{w}, $self->{h});
2189
2190 if ($self->{rot90}) {
2191 glRotate 90, 0, 0, 1;
2192 glTranslate 0, -$self->{w}, 0;
2193
2194 ($w, $h) = ($h, $w);
2195 }
2196
2197 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200 $tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::VGauge;
2208
2209our @ISA = CFClient::UI::Base::;
2210 2647
2211use List::Util qw(min max); 2648use List::Util qw(min max);
2212 2649
2213use CFClient::OpenGL; 2650use CFPlus::OpenGL;
2214 2651
2215my %tex = ( 2652my %tex = (
2216 food => [ 2653 food => [
2217 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2655 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219 ], 2656 ],
2220 grace => [ 2657 grace => [
2221 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2659 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223 ], 2660 ],
2224 hp => [ 2661 hp => [
2225 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2663 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227 ], 2664 ],
2228 mana => [ 2665 mana => [
2229 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2667 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231 ], 2668 ],
2232); 2669);
2233 2670
2234# eg. VGauge->new (gauge => 'food'), default gauge: food 2671# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2337 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2338} 2775}
2339 2776
2340############################################################################# 2777#############################################################################
2341 2778
2342package CFClient::UI::Gauge; 2779package CFPlus::UI::Gauge;
2343 2780
2344our @ISA = CFClient::UI::VBox::; 2781our @ISA = CFPlus::UI::VBox::;
2345 2782
2346sub new { 2783sub new {
2347 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2348 2785
2349 my $self = $class->SUPER::new ( 2786 my $self = $class->SUPER::new (
… …
2351 can_hover => 1, 2788 can_hover => 1,
2352 can_events => 1, 2789 can_events => 1,
2353 %arg, 2790 %arg,
2354 ); 2791 );
2355 2792
2356 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2793 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2794 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2795 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359 2796
2360 $self 2797 $self
2361} 2798}
2362 2799
2363sub set_fontsize { 2800sub set_fontsize {
… …
2384 $self->{value}->set_text ($val); 2821 $self->{value}->set_text ($val);
2385} 2822}
2386 2823
2387############################################################################# 2824#############################################################################
2388 2825
2389package CFClient::UI::Slider; 2826package CFPlus::UI::Slider;
2390 2827
2391use strict; 2828use strict;
2392 2829
2393use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2394 2831
2395our @ISA = CFClient::UI::DrawBG::; 2832our @ISA = CFPlus::UI::DrawBG::;
2396 2833
2397my @tex = 2834my @tex =
2398 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2835 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399 qw(s1_slider.png s1_slider_bg.png); 2836 qw(s1_slider.png s1_slider_bg.png);
2400 2837
2401sub new { 2838sub new {
2402 my $class = shift; 2839 my $class = shift;
2403 2840
… …
2497sub invoke_mouse_wheel { 2934sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_; 2935 my ($self, $ev) = @_;
2499 2936
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501 2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503 2942
2504 ! ! $delta 2943 ! ! $delta
2505} 2944}
2506 2945
2507sub update { 2946sub update {
… …
2558 glDisable GL_TEXTURE_2D; 2997 glDisable GL_TEXTURE_2D;
2559} 2998}
2560 2999
2561############################################################################# 3000#############################################################################
2562 3001
2563package CFClient::UI::ValSlider; 3002package CFPlus::UI::ValSlider;
2564 3003
2565our @ISA = CFClient::UI::HBox::; 3004our @ISA = CFPlus::UI::HBox::;
2566 3005
2567sub new { 3006sub new {
2568 my ($class, %arg) = @_; 3007 my ($class, %arg) = @_;
2569 3008
2570 my $range = delete $arg{range}; 3009 my $range = delete $arg{range};
2571 3010
2572 my $self = $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
2573 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3012 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3013 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575 to_value => sub { shift }, 3014 to_value => sub { shift },
2576 from_value => sub { shift }, 3015 from_value => sub { shift },
2577 %arg, 3016 %arg,
2578 ); 3017 );
2579 3018
… …
2599sub set_range { shift->{slider}->set_range (@_) } 3038sub set_range { shift->{slider}->set_range (@_) }
2600sub set_value { shift->{slider}->set_value (@_) } 3039sub set_value { shift->{slider}->set_value (@_) }
2601 3040
2602############################################################################# 3041#############################################################################
2603 3042
2604package CFClient::UI::TextScroller; 3043package CFPlus::UI::TextScroller;
2605 3044
2606our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFPlus::UI::HBox::;
2607 3046
2608use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2609 3048
2610sub new { 3049sub new {
2611 my $class = shift; 3050 my $class = shift;
2612 3051
2613 my $self = $class->SUPER::new ( 3052 my $self = $class->SUPER::new (
… …
2615 can_events => 1, 3054 can_events => 1,
2616 indent => 0, 3055 indent => 0,
2617 #font => default_font 3056 #font => default_font
2618 @_, 3057 @_,
2619 3058
2620 layout => (new CFClient::Layout), 3059 layout => (new CFPlus::Layout),
2621 par => [], 3060 par => [],
3061 max_par => 0,
2622 height => 0, 3062 height => 0,
2623 children => [ 3063 children => [
2624 (new CFClient::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2625 (new CFClient::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2626 ], 3066 ],
2627 ); 3067 );
2628 3068
2629 $self->{children}[1]->connect (changed => sub { $self->update }); 3069 $self->{children}[1]->connect (changed => sub { $self->update });
2630 3070
… …
2707 3147
2708 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2709 $self->{children}[1]->set_value ($offset); 3149 $self->{children}[1]->set_value ($offset);
2710} 3150}
2711 3151
3152sub current_paragraph {
3153 my ($self) = @_;
3154
3155 $self->{top_paragraph} - 1
3156}
3157
3158sub scroll_to {
3159 my ($self, $para) = @_;
3160
3161 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3162
3163 $self->{scroll_to} = $para;
3164 $self->update;
3165}
3166
2712sub clear { 3167sub clear {
2713 my ($self) = @_; 3168 my ($self) = @_;
2714 3169
2715 my (undef, undef, @other) = @{ $self->{children} }; 3170 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other; 3171 $self->remove ($_) for @other;
… …
2719 $self->{height} = 0; 3174 $self->{height} = 0;
2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3175 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721} 3176}
2722 3177
2723sub add_paragraph { 3178sub add_paragraph {
2724 my ($self, $color, $para, $indent) = @_; 3179 my $self = shift;
2725 3180
2726 my ($text, @w) = ref $para ? @$para : $para; 3181 for my $para (@_) {
2727
2728 $para = { 3182 $para = {
3183 fg => [1, 1, 1, 1],
3184 indent => 0,
3185 markup => "",
3186 widget => [],
3187 ref $para ? %$para : (markup => $para),
2729 w => 1e10, 3188 w => 1e10,
2730 wrapped => 1, 3189 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2735 }; 3190 };
2736 3191
2737 $self->add (@w) if @w; 3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738 push @{$self->{par}}, $para; 3193 push @{$self->{par}}, $para;
3194 }
3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
3198 }
2739 3199
2740 $self->{need_reflow}++; 3200 $self->{need_reflow}++;
2741 $self->update; 3201 $self->update;
2742} 3202}
2743 3203
2744sub scroll_to_bottom { 3204sub scroll_to_bottom {
2745 my ($self) = @_; 3205 my ($self) = @_;
2746 3206
2747 $self->{scroll_to_bottom} = 1; 3207 $self->{scroll_to} = $#{$self->{par}};
2748 $self->update; 3208 $self->update;
2749} 3209}
2750 3210
3211sub force_uptodate {
3212 my ($self) = @_;
3213
3214 if (delete $self->{need_reflow}) {
3215 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3216
3217 my $height = 0;
3218
3219 for my $para (@{$self->{par}}) {
3220 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3221 my $layout = $self->get_layout ($para);
3222 my ($w, $h) = $layout->size;
3223
3224 $para->{w} = $w + $para->{indent};
3225 $para->{h} = $h;
3226 $para->{wrapped} = $layout->has_wrapped;
3227 }
3228
3229 $para->{y} = $height;
3230 $height += $para->{h};
3231 }
3232
3233 $self->{height} = $height;
3234 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3235
3236 delete $self->{texture};
3237 }
3238
3239 if (my $paridx = delete $self->{scroll_to}) {
3240 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3241 }
3242}
3243
2751sub update { 3244sub update {
2752 my ($self) = @_; 3245 my ($self) = @_;
2753 3246
2754 $self->SUPER::update; 3247 $self->SUPER::update;
2755 3248
2756 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2757 3250
2758 delete $self->{texture}; 3251 delete $self->{texture};
2759 3252
2760 $ROOT->on_post_alloc ($self => sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762 3257
2763 if (delete $self->{need_reflow}) {
2764 my $height = 0;
2765
2766 for my $para (@{$self->{par}}) {
2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768 my $layout = $self->get_layout ($para);
2769 my ($w, $h) = $layout->size;
2770
2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2774 }
2775
2776 $height += $para->{h};
2777 }
2778
2779 $self->{height} = $height;
2780
2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791 glClearColor 0, 0, 0, 0; 3259 glClearColor 0, 0, 0, 0;
2792 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2793 3261
3262 package CFPlus::UI::Base;
3263 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3264 (0, 0, $self->{w}, $self->{h});
3265
3266 my $top = int $self->{children}[1]{range}[0];
3267
3268 my $paridx = 0;
3269 my $top_paragraph;
2794 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2795 3271
2796 my $y0 = $top; 3272 my $y0 = $top;
2797 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2798 3274
2799 my $y = 0;
2800
2801 for my $para (@{$self->{par}}) { 3275 for my $para (@{$self->{par}}) {
2802 my $h = $para->{h}; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2803 3278
2804 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2805
2806 my $layout = $self->get_layout ($para); 3280 my $layout = $self->get_layout ($para);
2807 3281
2808 $layout->render ($para->{indent}, $y - $y0); 3282 $layout->render ($para->{indent}, $y - $y0);
2809 3283
2810 if (my @w = @{ $para->{widget} }) { 3284 if (my @w = @{ $para->{widget} }) {
… …
2819 $_->draw; 3293 $_->draw;
2820 } 3294 }
2821 } 3295 }
2822 } 3296 }
2823 3297
2824 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2825 } 3300 }
3301
3302 $self->{top_paragraph} = $top_paragraph;
2826 }; 3303 };
2827 }); 3304 });
2828} 3305}
2829 3306
2830sub reconfigure { 3307sub reconfigure {
… …
2848 $self->{children}[1]->draw; 3325 $self->{children}[1]->draw;
2849} 3326}
2850 3327
2851############################################################################# 3328#############################################################################
2852 3329
2853package CFClient::UI::Animator; 3330package CFPlus::UI::Animator;
2854 3331
2855use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2856 3333
2857our @ISA = CFClient::UI::Bin::; 3334our @ISA = CFPlus::UI::Bin::;
2858 3335
2859sub moveto { 3336sub moveto {
2860 my ($self, $x, $y) = @_; 3337 my ($self, $x, $y) = @_;
2861 3338
2862 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3339 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2890 glPopMatrix; 3367 glPopMatrix;
2891} 3368}
2892 3369
2893############################################################################# 3370#############################################################################
2894 3371
2895package CFClient::UI::Flopper; 3372package CFPlus::UI::Flopper;
2896 3373
2897our @ISA = CFClient::UI::Button::; 3374our @ISA = CFPlus::UI::Button::;
2898 3375
2899sub new { 3376sub new {
2900 my $class = shift; 3377 my $class = shift;
2901 3378
2902 my $self = $class->SUPER::new ( 3379 my $self = $class->SUPER::new (
… …
2914 $self->{other}->toggle_visibility; 3391 $self->{other}->toggle_visibility;
2915} 3392}
2916 3393
2917############################################################################# 3394#############################################################################
2918 3395
2919package CFClient::UI::Tooltip; 3396package CFPlus::UI::Tooltip;
2920 3397
2921our @ISA = CFClient::UI::Bin::; 3398our @ISA = CFPlus::UI::Bin::;
2922 3399
2923use CFClient::OpenGL; 3400use CFPlus::OpenGL;
2924 3401
2925sub new { 3402sub new {
2926 my $class = shift; 3403 my $class = shift;
2927 3404
2928 $class->SUPER::new ( 3405 $class->SUPER::new (
… …
2931 ) 3408 )
2932} 3409}
2933 3410
2934sub set_tooltip_from { 3411sub set_tooltip_from {
2935 my ($self, $widget) = @_; 3412 my ($self, $widget) = @_;
3413
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
2936 3416
2937 my $tooltip = $widget->{tooltip}; 3417 my $tooltip = $widget->{tooltip};
2938 3418
2939 if ($ENV{CFPLUS_DEBUG} & 2) { 3419 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n" 3420 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2944 } 3424 }
2945 3425
2946 $tooltip =~ s/^\n+//; 3426 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//; 3427 $tooltip =~ s/\n+$//;
2948 3428
2949 $self->add (new CFClient::UI::Label 3429 $self->add (new CFPlus::UI::Label
2950 markup => $tooltip, 3430 markup => $tooltip,
2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952 fontsize => 0.8, 3432 fontsize => 0.8,
2953 fg => [0, 0, 0, 1], 3433 style => 1, # FLAG_INVERSE
2954 ellipsise => 0, 3434 ellipsise => 0,
2955 font => ($widget->{tooltip_font} || $::FONT_PROP), 3435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2956 ); 3436 );
2957} 3437}
2958 3438
… …
2977 3457
2978 $self->{root}->on_post_alloc ("move_$self" => sub { 3458 $self->{root}->on_post_alloc ("move_$self" => sub {
2979 my $widget = $self->{owner} 3459 my $widget = $self->{owner}
2980 or return; 3460 or return;
2981 3461
3462 if ($widget->{visible}) {
2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3463 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983 3464
2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3465 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985 if $x + $self->{w} > $self->{root}{w}; 3466 if $x + $self->{w} > $self->{root}{w};
2986 3467
2987 $self->move_abs ($x, $y); 3468 $self->move_abs ($x, $y);
3469 } else {
3470 $self->hide;
3471 }
2988 }); 3472 });
2989} 3473}
2990 3474
2991sub _draw { 3475sub _draw {
2992 my ($self) = @_; 3476 my ($self) = @_;
… …
3016 $self->SUPER::_draw; 3500 $self->SUPER::_draw;
3017} 3501}
3018 3502
3019############################################################################# 3503#############################################################################
3020 3504
3021package CFClient::UI::Face; 3505package CFPlus::UI::Face;
3022 3506
3023our @ISA = CFClient::UI::Base::; 3507our @ISA = CFPlus::UI::DrawBG::;
3024 3508
3025use CFClient::OpenGL; 3509use CFPlus::OpenGL;
3026 3510
3027sub new { 3511sub new {
3028 my $class = shift; 3512 my $class = shift;
3029 3513
3030 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
3031 aspect => 1, 3517 aspect => 1,
3032 can_events => 0, 3518 can_events => 0,
3033 @_, 3519 @_,
3034 ); 3520 );
3035 3521
3036 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
3037 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
3038 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3039 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
3040 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041 hard => 1, 3528 parked => 1,
3042 interval => $self->{animspeed},
3043 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
3044 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
3045 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
3046 }, 3537 },
3047 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
3048 } 3542 }
3049 3543
3050 $self 3544 $self
3051} 3545}
3052 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3053sub size_request { 3577sub size_request {
3054 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
3055} 3593}
3056 3594
3057sub update { 3595sub update {
3058 my ($self) = @_; 3596 my ($self) = @_;
3059 3597
3060 return unless $self->{visible}; 3598 return unless $self->{visible};
3061 3599
3062 $self->SUPER::update; 3600 $self->SUPER::update;
3063} 3601}
3064 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3065sub _draw { 3611sub _draw {
3066 my ($self) = @_; 3612 my ($self) = @_;
3067 3613
3068 return unless $::CONN; 3614 return unless $::CONN;
3069 3615
3070 my $face; 3616 $self->SUPER::_draw;
3071 3617
3072 if ($self->{frame}) {
3073 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
3074 3619 or return;
3075 $face = $anim->[ $self->{frame} % @$anim ]
3076 if $anim && @$anim;
3077 }
3078 3620
3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
3080 3622
3081 if ($tex) { 3623 if ($tex) {
3082 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
… …
3088} 3630}
3089 3631
3090sub destroy { 3632sub destroy {
3091 my ($self) = @_; 3633 my ($self) = @_;
3092 3634
3093 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3094 if $self->{timer}; 3636 if $self->{timer};
3095 3637
3096 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3097} 3639}
3098 3640
3099############################################################################# 3641#############################################################################
3100 3642
3101package CFClient::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
3102 3644
3103our @ISA = CFClient::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
3104 3646
3105# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
3106 3648
3107############################################################################# 3649#############################################################################
3108 3650
3109package CFClient::UI::Menu; 3651package CFPlus::UI::Menu;
3110 3652
3111our @ISA = CFClient::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
3112 3654
3113use CFClient::OpenGL; 3655use CFPlus::OpenGL;
3114 3656
3115sub new { 3657sub new {
3116 my $class = shift; 3658 my $class = shift;
3117 3659
3118 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3119 items => [], 3661 items => [],
3120 z => 100, 3662 z => 100,
3121 @_, 3663 @_,
3122 ); 3664 );
3123 3665
3124 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3666 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125 3667
3126 for my $item (@{ $self->{items} }) { 3668 for my $item (@{ $self->{items} }) {
3127 my ($widget, $cb, $tooltip) = @$item; 3669 my ($widget, $cb, $tooltip) = @$item;
3128 3670
3129 # handle various types of items, only text for now 3671 # handle various types of items, only text for now
3130 if (!ref $widget) { 3672 if (!ref $widget) {
3131 if ($widget =~ /\t/) { 3673 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2; 3674 my ($left, $right) = split /\t/, $widget, 2;
3133 3675
3134 $widget = new CFClient::UI::HBox 3676 $widget = new CFPlus::UI::HBox
3135 can_hover => 1, 3677 can_hover => 1,
3136 can_events => 1, 3678 can_events => 1,
3137 tooltip => $tooltip, 3679 tooltip => $tooltip,
3138 children => [ 3680 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1), 3681 (new CFPlus::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1), 3682 (new CFPlus::UI::Label markup => $right, align => +1),
3141 ], 3683 ],
3142 ; 3684 ;
3143 3685
3144 } else { 3686 } else {
3145 $widget = new CFClient::UI::Label 3687 $widget = new CFPlus::UI::Label
3146 can_hover => 1, 3688 can_hover => 1,
3147 can_events => 1, 3689 can_events => 1,
3148 markup => $widget, 3690 markup => $widget,
3149 tooltip => $tooltip; 3691 tooltip => $tooltip;
3150 } 3692 }
… …
3198 1 3740 1
3199} 3741}
3200 3742
3201############################################################################# 3743#############################################################################
3202 3744
3203package CFClient::UI::Multiplexer; 3745package CFPlus::UI::Multiplexer;
3204 3746
3205our @ISA = CFClient::UI::Container::; 3747our @ISA = CFPlus::UI::Container::;
3206 3748
3207sub new { 3749sub new {
3208 my $class = shift; 3750 my $class = shift;
3209 3751
3210 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
… …
3271 $self->{current}->draw; 3813 $self->{current}->draw;
3272} 3814}
3273 3815
3274############################################################################# 3816#############################################################################
3275 3817
3276package CFClient::UI::Notebook; 3818package CFPlus::UI::Notebook;
3277 3819
3278our @ISA = CFClient::UI::VBox::; 3820our @ISA = CFPlus::UI::VBox::;
3279 3821
3280sub new { 3822sub new {
3281 my $class = shift; 3823 my $class = shift;
3282 3824
3283 my $self = $class->SUPER::new ( 3825 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar), 3826 buttonbar => (new CFPlus::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self 3828 # filter => # will be put between multiplexer and $self
3287 @_, 3829 @_,
3288 ); 3830 );
3289 3831
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3294} 3836}
3295 3837
3296sub add { 3838sub add {
3297 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3298 3840
3299 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3300 3842
3301 $self->{buttonbar}->add (new CFClient::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3302 markup => $title, 3844 markup => $title,
3303 tooltip => $tooltip, 3845 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
3305 ); 3847 );
3306 3848
… …
3320 $self->emit (page_changed => $self->{multiplexer}{current}); 3862 $self->emit (page_changed => $self->{multiplexer}{current});
3321} 3863}
3322 3864
3323############################################################################# 3865#############################################################################
3324 3866
3325package CFClient::UI::Combobox; 3867package CFPlus::UI::Selector;
3326 3868
3327use utf8; 3869use utf8;
3328 3870
3329our @ISA = CFClient::UI::Button::; 3871our @ISA = CFPlus::UI::Button::;
3330 3872
3331sub new { 3873sub new {
3332 my $class = shift; 3874 my $class = shift;
3333 3875
3334 my $self = $class->SUPER::new ( 3876 my $self = $class->SUPER::new (
… …
3351 my ($value, $title, $tooltip) = @$_; 3893 my ($value, $title, $tooltip) = @$_;
3352 3894
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3895 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 } 3896 }
3355 3897
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3898 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357} 3899}
3358 3900
3359sub _set_value { 3901sub _set_value {
3360 my ($self, $value) = @_; 3902 my ($self, $value) = @_;
3361 3903
… …
3376 $self->emit (changed => $value); 3918 $self->emit (changed => $value);
3377} 3919}
3378 3920
3379############################################################################# 3921#############################################################################
3380 3922
3381package CFClient::UI::Statusbox; 3923package CFPlus::UI::Statusbox;
3382 3924
3383our @ISA = CFClient::UI::VBox::; 3925our @ISA = CFPlus::UI::VBox::;
3384 3926
3385sub new { 3927sub new {
3386 my $class = shift; 3928 my $class = shift;
3387 3929
3388 my $self = $class->SUPER::new ( 3930 my $self = $class->SUPER::new (
3389 fontsize => 0.8, 3931 fontsize => 0.8,
3390 @_, 3932 @_,
3391 ); 3933 );
3392 3934
3393 Scalar::Util::weaken (my $this = $self); 3935 CFPlus::weaken (my $this = $self);
3394 3936
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396 3938
3397 $self 3939 $self
3398} 3940}
… …
3400sub reorder { 3942sub reorder {
3401 my ($self) = @_; 3943 my ($self) = @_;
3402 my $NOW = Time::HiRes::time; 3944 my $NOW = Time::HiRes::time;
3403 3945
3404 # freeze display when hovering over any label 3946 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner} 3947 return if $CFPlus::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3948 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} }; 3949 values %{ $self->{item} };
3408 3950
3409 while (my ($k, $v) = each %{ $self->{item} }) { 3951 while (my ($k, $v) = each %{ $self->{item} }) {
3410 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3952 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411 } 3953 }
… …
3432 for ($short) { 3974 for ($short) {
3433 s/^\s+//; 3975 s/^\s+//;
3434 s/\s+/ /g; 3976 s/\s+/ /g;
3435 } 3977 }
3436 3978
3437 new CFClient::UI::Label 3979 new CFPlus::UI::Label
3438 markup => $short, 3980 markup => $short,
3439 tooltip => $item->{tooltip}, 3981 tooltip => $item->{tooltip},
3440 tooltip_font => $::FONT_PROP, 3982 tooltip_font => $::FONT_PROP,
3441 tooltip_width => 0.67, 3983 tooltip_width => 0.67,
3442 fontsize => $item->{fontsize} || $self->{fontsize}, 3984 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3521 $self->SUPER::destroy; 4063 $self->SUPER::destroy;
3522} 4064}
3523 4065
3524############################################################################# 4066#############################################################################
3525 4067
3526package CFClient::UI::Inventory;
3527
3528our @ISA = CFClient::UI::Table::;
3529
3530sub new {
3531 my $class = shift;
3532
3533 my $self = $class->SUPER::new (
3534 col_expand => [0, 1, 0],
3535 @_,
3536 );
3537
3538 $self
3539}
3540
3541sub set_items {
3542 my ($self, $items) = @_;
3543
3544 $self->clear;
3545 return unless $items;
3546
3547 my @items = sort {
3548 ($a->{type} <=> $b->{type})
3549 or ($a->{name} cmp $b->{name})
3550 } values %$items;
3551
3552 $self->{real_items} = \@items;
3553
3554 my $row = 0;
3555 for my $item (@items) {
3556 CFClient::Item::update_widgets $item;
3557
3558 $self->add (0, $row, $item->{face_widget});
3559 $self->add (1, $row, $item->{desc_widget});
3560 $self->add (2, $row, $item->{weight_widget});
3561
3562 $row++;
3563 }
3564}
3565
3566#############################################################################
3567
3568package CFClient::UI::SpellList;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
3578 @_,
3579 )
3580}
3581
3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3667sub add_spell {
3668 my ($self, $spell) = @_;
3669
3670 $self->{spell}->{$spell->{name}} = $spell;
3671 $self->rebuild_spell_list;
3672}
3673
3674sub remove_spell {
3675 my ($self, $spell) = @_;
3676
3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3688#############################################################################
3689
3690package CFClient::UI::Root; 4068package CFPlus::UI::Root;
3691 4069
3692our @ISA = CFClient::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3693 4071
3694use List::Util qw(min max); 4072use List::Util qw(min max);
3695 4073
3696use CFClient::OpenGL; 4074use CFPlus::OpenGL;
3697 4075
3698sub new { 4076sub new {
3699 my $class = shift; 4077 my $class = shift;
3700 4078
3701 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3702 visible => 1, 4080 visible => 1,
3703 @_, 4081 @_,
3704 ); 4082 );
3705 4083
3706 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3707 4085
3708 $self 4086 $self
3709} 4087}
3710 4088
3711sub size_request { 4089sub size_request {
… …
3880 $h = 0 if $h < 0; 4258 $h = 0 if $h < 0;
3881 4259
3882 $w = max $widget->{min_w}, $w; 4260 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h; 4261 $h = max $widget->{min_h}, $h;
3884 4262
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887 4268
3888 $w = int $w + 0.5; 4269 $w = int $w + 0.5;
3889 $h = int $h + 0.5; 4270 $h = int $h + 0.5;
… …
3902 4283
3903 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3904 $_->() 4285 $_->()
3905 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3906 } 4287 }
3907
3908 4288
3909 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3911 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3912 4292
… …
3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4295 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916 glMatrixMode GL_MODELVIEW; 4296 glMatrixMode GL_MODELVIEW;
3917 glLoadIdentity; 4297 glLoadIdentity;
3918 4298
3919 { 4299 {
3920 package CFClient::UI::Base; 4300 package CFPlus::UI::Base;
3921 4301
3922 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
3924 }
3925 4304
3926 $self->_draw; 4305 $self->_draw;
4306 }
3927} 4307}
3928 4308
3929############################################################################# 4309#############################################################################
3930 4310
3931package CFClient::UI; 4311package CFPlus::UI;
3932 4312
3933$ROOT = new CFClient::UI::Root; 4313$ROOT = new CFPlus::UI::Root;
3934$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4314$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935 4315
39361 43161
3937 4317

Diff Legend

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