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.376 by root, Mon Jul 16 20:20:23 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
96 99
97sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
98 my ($ev) = @_; 101 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
100 103
101 unless ($BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
103 108
104 $GRAB = $widget; 109 $GRAB = $widget;
105 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
106 111
107 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
108 } 113 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0; 118 $ev->{dx} = 0;
… …
207 reconfigure_widgets; 210 reconfigure_widgets;
208} 211}
209 212
210############################################################################# 213#############################################################################
211 214
212package CFClient::UI::Event; 215package CFPlus::UI::Event;
213 216
214sub xy { 217sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 219}
217 220
218############################################################################# 221#############################################################################
219 222
220package CFClient::UI::Base; 223package CFPlus::UI::Base;
221 224
222use strict; 225use strict;
223 226
224use CFClient::OpenGL; 227use CFPlus::OpenGL;
225 228
226sub new { 229sub new {
227 my $class = shift; 230 my $class = shift;
228 231
229 my $self = bless { 232 my $self = bless {
… …
234 h => undef, 237 h => undef,
235 can_events => 1, 238 can_events => 1,
236 @_ 239 @_
237 }, $class; 240 }, $class;
238 241
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 243
241 for (keys %$self) { 244 for (keys %$self) {
242 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
244 } 247 }
245 } 248 }
246 249
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 255
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 258
256 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
261 264
262sub destroy { 265sub destroy {
263 my ($self) = @_; 266 my ($self) = @_;
264 267
265 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
266 %$self = (); 270 %$self = ();
267} 271}
268 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
269sub show { 277sub show {
270 my ($self) = @_; 278 my ($self) = @_;
271 279
272 return if $self->{parent}; 280 return if $self->{parent};
273 281
274 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
275} 283}
276 284
277sub set_visible { 285sub set_visible {
278 my ($self) = @_; 286 my ($self) = @_;
279 287
… …
300 delete $self->{root}; 308 delete $self->{root};
301 309
302 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
304 312
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
307 315
308 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
310} 318}
… …
312sub set_visibility { 320sub set_visibility {
313 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
314 322
315 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
316 324
317 $visible ? $self->hide 325 $visible ? $self->show
318 : $self->show; 326 : $self->hide;
319} 327}
320 328
321sub toggle_visibility { 329sub toggle_visibility {
322 my ($self) = @_; 330 my ($self) = @_;
323 331
… …
367 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
368 376
369 if ($self->{aspect}) { 377 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
371 379
372 $w = List::Util::min $w, 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
945 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
946 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
947 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
948 $self->update; 995 $self->update;
949} 996}
950 997
951# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
952sub coord2local { 999sub coord2local {
… …
970 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
972 ) { 1019 ) {
973 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974 } else { 1021 } else {
975 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
976 } 1023 }
977} 1024}
978 1025
979sub _render { 1026sub _render {
980 my ($self) = @_; 1027 my ($self) = @_;
981 1028
982 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
983 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984 1031
985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986 1033
987 $self->SUPER::_render; 1034 $self->SUPER::_render;
988} 1035}
989 1036
990############################################################################# 1037#############################################################################
991 1038
992package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
993 1040
994our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
995 1042
996sub new { 1043sub new {
997 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
998 1045
999 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1000 1047
1001 my $self; 1048 my $self;
1002 1049
1003 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
1004 vertical => 1, 1060 vertical => 1,
1005 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1006 on_changed => sub { 1062 on_changed => sub {
1007 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008 }, 1065 },
1009 ; 1066 ;
1010 1067
1011 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1012 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1013 can_events => 1, 1071 can_events => 1,
1014 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1015 %arg, 1076 %arg,
1016 ); 1077 );
1017 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
1018 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
1019 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
1020 1095
1021 $self 1096 $self
1022} 1097}
1023 1098
… …
1027 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1028 1103
1029 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1030} 1105}
1031 1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136}
1137
1032sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1034 1140
1035 return 0 unless $ev->{dy}; # only vertical movements 1141 return 0 unless $ev->{dy}; # only vertical movements for now
1036 1142
1037 $self->{slider}->emit (mouse_wheel => $ev); 1143 $self->{vslider}->emit (mouse_wheel => $ev);
1038 1144
1039 1 1145 1
1040} 1146}
1041 1147
1042sub update_slider { 1148sub invoke_button_down {
1043 my ($self) = @_; 1149 my ($self, $ev, $x, $y) = @_;
1044 1150
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1151 if ($ev->{button} == 2) {
1046} 1152 $self->grab_focus;
1047 1153
1048sub update { 1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1049 my ($self) = @_; 1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1050 1159
1051 $self->SUPER::update; 1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1052 1163
1053 $self->update_slider; 1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1054} 1189}
1055 1190
1056sub invoke_size_allocate { 1191sub invoke_size_allocate {
1057 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1058 1193
1059 $self->update_slider; 1194 $self->update_slider;
1060
1061 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1062} 1196}
1063 1197
1064############################################################################# 1198#############################################################################
1065 1199
1066package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1067 1201
1068our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1069 1203
1070use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1071 1205
1072sub new { 1206sub new {
1073 my $class = shift; 1207 my $class = shift;
1074 1208
1075 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1101 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1102} 1236}
1103 1237
1104############################################################################# 1238#############################################################################
1105 1239
1106package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1107 1241
1108our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1109 1243
1110use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1111 1345
1112my $bg = 1346my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1115 1349
1116my @border = 1350my @border =
1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 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); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119 1353
1120sub new { 1354sub new {
1121 my ($class, %arg) = @_; 1355 my ($class, %arg) = @_;
1122 1356
… …
1128 min_w => 64, 1362 min_w => 64,
1129 min_h => 32, 1363 min_h => 32,
1130 %arg, 1364 %arg,
1131 ); 1365 );
1132 1366
1133 $self->{title_widget} = new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
1134 align => 0, 1368 align => 0,
1135 valign => 1, 1369 valign => 1,
1136 text => $self->{title}, 1370 text => $self->{title},
1137 fontsize => $self->{border}, 1371 fontsize => $self->{border},
1138 if exists $self->{title}; 1372 if exists $self->{title};
1139 1373
1140 if ($self->{has_close_button}) { 1374 if ($self->{has_close_button}) {
1141 $self->{close_button} = 1375 $self->{close_button} =
1142 new CFClient::UI::ImageButton 1376 new CFPlus::UI::ImageButton
1143 path => 'x1_close.png', 1377 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") }; 1378 on_activate => sub { $self->emit ("delete") };
1145 1379
1146 $self->CFClient::UI::Container::add ($self->{close_button}); 1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1147 } 1381 }
1148 1382
1149 $self 1383 $self
1150} 1384}
1151 1385
1152sub add { 1386sub add {
1153 my ($self, @widgets) = @_; 1387 my ($self, @widgets) = @_;
1154 1388
1155 $self->SUPER::add (@widgets); 1389 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1390 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158} 1392}
1159 1393
1160sub border { 1394sub border {
1161 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
1162} 1396}
… …
1270 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271 1505
1272 ! ! $self->{motion} 1506 ! ! $self->{motion}
1273} 1507}
1274 1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1515}
1516
1275sub _draw { 1517sub _draw {
1276 my ($self) = @_; 1518 my ($self) = @_;
1277 1519
1278 my $child = $self->{children}[0]; 1520 my $child = $self->{children}[0];
1279 1521
… …
1316 if $self->{close_button}; 1558 if $self->{close_button};
1317} 1559}
1318 1560
1319############################################################################# 1561#############################################################################
1320 1562
1321package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1322 1564
1323our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1324 1566
1325use List::Util qw(max sum); 1567use List::Util qw(max sum);
1326 1568
1327use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1328 1570
1329sub new { 1571sub new {
1330 my $class = shift; 1572 my $class = shift;
1331 1573
1332 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1333 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1334 @_, 1578 @_,
1335 ) 1579 )
1336} 1580}
1337 1581
1338sub children { 1582sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340} 1584}
1341 1585
1586# TODO: store row/col info in child widget and use standard add/del
1342sub add { 1587sub add {
1343 my ($self, $x, $y, $child) = @_; 1588 my ($self) = shift;
1344 1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1345 $child->set_parent ($self); 1592 $child->set_parent ($self);
1346 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1594 }
1347 1595
1596 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1;
1348 $self->realloc; 1598 $self->realloc;
1349} 1599}
1350 1600
1351sub remove { 1601sub remove {
1352 my ($self, $child) = @_; 1602 my ($self, $child) = @_;
1353 1603
1354 # TODO: not yet implemented 1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1355} 1609}
1356 1610
1357# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1358sub clear { 1612sub clear {
1359 my ($self) = @_; 1613 my ($self) = @_;
… …
1408 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1409 1663
1410 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1411 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1412 1666
1413 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1414 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1415 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1416 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1417 1671
1418 # linearly scale sizes
1419 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421 1673
1422 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1423 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1424 1683
1425 my $y; 1684 my $y;
1426 1685
1427 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1428 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1471 } 1730 }
1472} 1731}
1473 1732
1474############################################################################# 1733#############################################################################
1475 1734
1476package CFClient::UI::Box; 1735package CFPlus::UI::Fixed;
1477 1736
1737use List::Util qw(min max);
1738
1478our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1479 1820
1480sub size_request { 1821sub size_request {
1481 my ($self) = @_; 1822 my ($self) = @_;
1482 1823
1483 $self->{vertical} 1824 $self->{vertical}
… …
1516 $req[$_] += $space * $children[$_]{expand} 1857 $req[$_] += $space * $children[$_]{expand}
1517 for 0 .. $#children; 1858 for 0 .. $#children;
1518 } 1859 }
1519 } 1860 }
1520 1861
1521 CFClient::UI::harmonize \@req; 1862 CFPlus::UI::harmonize \@req;
1522 1863
1523 my $pos = 0; 1864 my $pos = 0;
1524 for (0 .. $#children) { 1865 for (0 .. $#children) {
1525 my $alloc = $req[$_]; 1866 my $alloc = $req[$_];
1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1531 1 1872 1
1532} 1873}
1533 1874
1534############################################################################# 1875#############################################################################
1535 1876
1536package CFClient::UI::HBox; 1877package CFPlus::UI::HBox;
1537 1878
1538our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1539 1880
1540sub new { 1881sub new {
1541 my $class = shift; 1882 my $class = shift;
1542 1883
1543 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1546 ) 1887 )
1547} 1888}
1548 1889
1549############################################################################# 1890#############################################################################
1550 1891
1551package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1552 1893
1553our @ISA = CFClient::UI::Box::; 1894our @ISA = CFPlus::UI::Box::;
1554 1895
1555sub new { 1896sub new {
1556 my $class = shift; 1897 my $class = shift;
1557 1898
1558 $class->SUPER::new ( 1899 $class->SUPER::new (
… …
1561 ) 1902 )
1562} 1903}
1563 1904
1564############################################################################# 1905#############################################################################
1565 1906
1566package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1567 1908
1568our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1569 1910
1570use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1571 1912
1572sub new { 1913sub new {
1573 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1574 1915
1575 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1578 #active_bg => none 1919 #active_bg => none
1579 #font => default_font 1920 #font => default_font
1580 #text => initial text 1921 #text => initial text
1581 #markup => initial narkup 1922 #markup => initial narkup
1582 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1583 ellipsise => 3, # end 1925 ellipsise => 3, # end
1584 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1585 fontsize => 1, 1927 fontsize => 1,
1586 align => -1, 1928 align => -1,
1587 valign => -1, 1929 valign => -1,
1588 padding_x => 2, 1930 padding_x => 2,
1589 padding_y => 2, 1931 padding_y => 2,
1590 can_events => 0, 1932 can_events => 0,
1591 %arg 1933 %arg
1592 ); 1934 );
1593 1935
1594 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1595 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1596 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1597 $self->{template} = $layout; 1939 $self->{template} = $layout;
1598 } 1940 }
1599 1941
1600 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1602 } else { 1944 } else {
1603 $self->set_text (delete $self->{text}); 1945 $self->set_text (delete $self->{text});
1604 } 1946 }
1605 1947
1606 $self 1948 $self
1607}
1608
1609sub escape($) {
1610 local $_ = $_[0];
1611
1612 s/&/&amp;/g;
1613 s/>/&gt;/g;
1614 s/</&lt;/g;
1615
1616 $_
1617} 1949}
1618 1950
1619sub update { 1951sub update {
1620 my ($self) = @_; 1952 my ($self) = @_;
1621 1953
… …
1748 }; 2080 };
1749 2081
1750 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
1751 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
1752 2084
1753 $self->{layout}->render ($self->{ox}, $self->{oy}); 2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754} 2086}
1755 2087
1756############################################################################# 2088#############################################################################
1757 2089
1758package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1759 2091
1760our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1761 2093
1762use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1763 2095
1764sub new { 2096sub new {
1765 my $class = shift; 2097 my $class = shift;
1766 2098
1767 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1771 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1772 can_hover => 1, 2104 can_hover => 1,
1773 can_focus => 1, 2105 can_focus => 1,
1774 valign => 0, 2106 valign => 0,
1775 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1776 #text => ... 2109 #text => ...
1777 #hidden => "*", 2110 #hidden => "*",
1778 @_ 2111 @_
1779 ) 2112 )
1780} 2113}
… …
1825 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1826 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1827 2160
1828 my $text = $self->get_text; 2161 my $text = $self->get_text;
1829 2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2164
1830 if ($uni == 8) { 2165 if ($uni == 8) {
1831 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1833 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1834 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1835 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1836 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1837 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1838 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1839 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1840 } elsif ($sym == CFClient::SDLK_END) {
1841 $self->{cursor} = length $text;
1842 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1843 $self->emit ('escape'); 2189 $self->emit ('escape');
1844 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1845 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else { 2194 } else {
1847 return 0; 2195 return 0;
1848 } 2196 }
1849 2197
1850 $self->_set_text ($text); 2198 $self->_set_text ($text);
1851 2199
1852 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1853 2202
1854 1 2203 1
1855} 2204}
1856 2205
1857sub invoke_focus_in { 2206sub invoke_focus_in {
… …
1919 utf8::encode $text; 2268 utf8::encode $text;
1920 2269
1921 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922 } 2271 }
1923 2272
1924 glColor @{$self->{fg}};
1925 glBegin GL_LINES; 2273 glBegin GL_LINES;
1926 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928 glEnd; 2276 glEnd;
1929 } 2277 }
1930} 2278}
1931 2279
2280#############################################################################
2281
1932package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1933 2283
1934our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1935 2285
1936use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1937 2287
1938sub invoke_key_down { 2288sub invoke_key_down {
1939 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1940 2290
1941 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1942 2292
1943 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1944 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1945 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
1946 2296
1947 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1948 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1949 $self->emit (activate => $txt); 2299 $self->emit (activate => $txt);
1950 $self->update; 2300 $self->update;
1951 2301
1952 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1953 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1954 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1955 } 2305 }
1956 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1957 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1959 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1960 } 2310 }
1961 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1962 } 2312 }
1963 2313
1964 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1965 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1966 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967 2317
1968 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1969 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1978 1 2328 1
1979} 2329}
1980 2330
1981############################################################################# 2331#############################################################################
1982 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1983package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1984 2373
1985our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1986 2375
1987use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1988 2377
1989my @tex = 2378my @tex =
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1992 2381
1993sub new { 2382sub new {
1994 my $class = shift; 2383 my $class = shift;
1995 2384
… …
2032 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
2033} 2422}
2034 2423
2035############################################################################# 2424#############################################################################
2036 2425
2426package CFPlus::UI::CheckBox;
2427
2428our @ISA = CFPlus::UI::DrawBG::;
2429
2430my @tex =
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2433
2434use CFPlus::OpenGL;
2435
2436sub new {
2437 my $class = shift;
2438
2439 $class->SUPER::new (
2440 padding_x => 2,
2441 padding_y => 2,
2442 fg => [1, 1, 1],
2443 active_fg => [1, 1, 0],
2444 bg => [0, 0, 0, 0.2],
2445 active_bg => [1, 1, 1, 0.5],
2446 state => 0,
2447 can_hover => 1,
2448 @_
2449 )
2450}
2451
2452sub size_request {
2453 my ($self) = @_;
2454
2455 (6) x 2
2456}
2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
2466sub invoke_button_down {
2467 my ($self, $ev, $x, $y) = @_;
2468
2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2471 $self->toggle;
2472 } else {
2473 return 0
2474 }
2475
2476 1
2477}
2478
2479sub _draw {
2480 my ($self) = @_;
2481
2482 $self->SUPER::_draw;
2483
2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2485
2486 my ($w, $h) = @$self{qw(w h)};
2487
2488 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2489
2490 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2491
2492 my $tex = $self->{state} ? $tex[1] : $tex[0];
2493
2494 glEnable GL_TEXTURE_2D;
2495 $tex->draw_quad_alpha (0, 0, $s, $s);
2496 glDisable GL_TEXTURE_2D;
2497}
2498
2499#############################################################################
2500
2501package CFPlus::UI::Image;
2502
2503our @ISA = CFPlus::UI::Base::;
2504
2505use CFPlus::OpenGL;
2506
2507our %texture_cache;
2508
2509sub new {
2510 my $class = shift;
2511
2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
2516
2517 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required";
2519
2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2522
2523 CFPlus::weaken $texture_cache{$self->{path}};
2524
2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2526
2527 $self
2528}
2529
2530sub STORABLE_freeze {
2531 my ($self, $cloning) = @_;
2532
2533 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2535
2536 $self->{path}
2537}
2538
2539sub STORABLE_attach {
2540 my ($self, $cloning, $path) = @_;
2541
2542 $self->new (path => $path)
2543}
2544
2545sub size_request {
2546 my ($self) = @_;
2547
2548 ($self->{tex}{w}, $self->{tex}{h})
2549}
2550
2551sub _draw {
2552 my ($self) = @_;
2553
2554 my $tex = $self->{tex};
2555
2556 my ($w, $h) = ($self->{w}, $self->{h});
2557
2558 if ($self->{rot90}) {
2559 glRotate 90, 0, 0, 1;
2560 glTranslate 0, -$self->{w}, 0;
2561
2562 ($w, $h) = ($h, $w);
2563 }
2564
2565 glEnable GL_TEXTURE_2D;
2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2567
2568 $tex->draw_quad (0, 0, $w, $h);
2569
2570 glDisable GL_TEXTURE_2D;
2571}
2572
2573#############################################################################
2574
2037package CFClient::UI::ImageButton; 2575package CFPlus::UI::ImageButton;
2038 2576
2039our @ISA = CFClient::UI::Image::; 2577our @ISA = CFPlus::UI::Image::;
2040 2578
2041use CFClient::OpenGL; 2579use CFPlus::OpenGL;
2042 2580
2043my %textures; 2581my %textures;
2044 2582
2045sub new { 2583sub new {
2046 my $class = shift; 2584 my $class = shift;
… …
2068 1 2606 1
2069} 2607}
2070 2608
2071############################################################################# 2609#############################################################################
2072 2610
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; 2611package CFPlus::UI::VGauge;
2149 2612
2150our @ISA = CFClient::UI::Base::; 2613our @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 2614
2211use List::Util qw(min max); 2615use List::Util qw(min max);
2212 2616
2213use CFClient::OpenGL; 2617use CFPlus::OpenGL;
2214 2618
2215my %tex = ( 2619my %tex = (
2216 food => [ 2620 food => [
2217 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219 ], 2623 ],
2220 grace => [ 2624 grace => [
2221 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 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/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223 ], 2627 ],
2224 hp => [ 2628 hp => [
2225 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227 ], 2631 ],
2228 mana => [ 2632 mana => [
2229 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 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/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231 ], 2635 ],
2232); 2636);
2233 2637
2234# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2337 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2338} 2742}
2339 2743
2340############################################################################# 2744#############################################################################
2341 2745
2342package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2343 2747
2344our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2345 2749
2346sub new { 2750sub new {
2347 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2348 2752
2349 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2351 can_hover => 1, 2755 can_hover => 1,
2352 can_events => 1, 2756 can_events => 1,
2353 %arg, 2757 %arg,
2354 ); 2758 );
2355 2759
2356 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359 2763
2360 $self 2764 $self
2361} 2765}
2362 2766
2363sub set_fontsize { 2767sub set_fontsize {
… …
2384 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2385} 2789}
2386 2790
2387############################################################################# 2791#############################################################################
2388 2792
2389package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2390 2794
2391use strict; 2795use strict;
2392 2796
2393use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2394 2798
2395our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2396 2800
2397my @tex = 2801my @tex =
2398 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2400 2804
2401sub new { 2805sub new {
2402 my $class = shift; 2806 my $class = shift;
2403 2807
… …
2497sub invoke_mouse_wheel { 2901sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_; 2902 my ($self, $ev) = @_;
2499 2903
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501 2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503 2909
2504 ! ! $delta 2910 ! ! $delta
2505} 2911}
2506 2912
2507sub update { 2913sub update {
… …
2558 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2559} 2965}
2560 2966
2561############################################################################# 2967#############################################################################
2562 2968
2563package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2564 2970
2565our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2566 2972
2567sub new { 2973sub new {
2568 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2569 2975
2570 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2571 2977
2572 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2573 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575 to_value => sub { shift }, 2981 to_value => sub { shift },
2576 from_value => sub { shift }, 2982 from_value => sub { shift },
2577 %arg, 2983 %arg,
2578 ); 2984 );
2579 2985
… …
2599sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2600sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2601 3007
2602############################################################################# 3008#############################################################################
2603 3009
2604package CFClient::UI::TextScroller; 3010package CFPlus::UI::TextScroller;
2605 3011
2606our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2607 3013
2608use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2609 3015
2610sub new { 3016sub new {
2611 my $class = shift; 3017 my $class = shift;
2612 3018
2613 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
… …
2615 can_events => 1, 3021 can_events => 1,
2616 indent => 0, 3022 indent => 0,
2617 #font => default_font 3023 #font => default_font
2618 @_, 3024 @_,
2619 3025
2620 layout => (new CFClient::Layout), 3026 layout => (new CFPlus::Layout),
2621 par => [], 3027 par => [],
3028 max_par => 0,
2622 height => 0, 3029 height => 0,
2623 children => [ 3030 children => [
2624 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2625 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2626 ], 3033 ],
2627 ); 3034 );
2628 3035
2629 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2630 3037
… …
2707 3114
2708 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2709 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2710} 3117}
2711 3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
3132}
3133
2712sub clear { 3134sub clear {
2713 my ($self) = @_; 3135 my ($self) = @_;
2714 3136
2715 my (undef, undef, @other) = @{ $self->{children} }; 3137 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other; 3138 $self->remove ($_) for @other;
… …
2719 $self->{height} = 0; 3141 $self->{height} = 0;
2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721} 3143}
2722 3144
2723sub add_paragraph { 3145sub add_paragraph {
2724 my ($self, $color, $para, $indent) = @_; 3146 my $self = shift;
2725 3147
2726 my ($text, @w) = ref $para ? @$para : $para; 3148 for my $para (@_) {
2727
2728 $para = { 3149 $para = {
3150 fg => [1, 1, 1, 1],
3151 indent => 0,
3152 markup => "",
3153 widget => [],
3154 ref $para ? %$para : (markup => $para),
2729 w => 1e10, 3155 w => 1e10,
2730 wrapped => 1, 3156 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2735 }; 3157 };
2736 3158
2737 $self->add (@w) if @w; 3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738 push @{$self->{par}}, $para; 3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
2739 3166
2740 $self->{need_reflow}++; 3167 $self->{need_reflow}++;
2741 $self->update; 3168 $self->update;
2742} 3169}
2743 3170
2744sub scroll_to_bottom { 3171sub scroll_to_bottom {
2745 my ($self) = @_; 3172 my ($self) = @_;
2746 3173
2747 $self->{scroll_to_bottom} = 1; 3174 $self->{scroll_to} = $#{$self->{par}};
2748 $self->update; 3175 $self->update;
2749} 3176}
2750 3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
3200 $self->{height} = $height;
3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3202
3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
3209}
3210
2751sub update { 3211sub update {
2752 my ($self) = @_; 3212 my ($self) = @_;
2753 3213
2754 $self->SUPER::update; 3214 $self->SUPER::update;
2755 3215
2756 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2757 3217
2758 delete $self->{texture}; 3218 delete $self->{texture};
2759 3219
2760 $ROOT->on_post_alloc ($self => sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762 3224
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 { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791 glClearColor 0, 0, 0, 0; 3226 glClearColor 0, 0, 0, 0;
2792 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2793 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2794 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2795 3238
2796 my $y0 = $top; 3239 my $y0 = $top;
2797 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2798 3241
2799 my $y = 0;
2800
2801 for my $para (@{$self->{par}}) { 3242 for my $para (@{$self->{par}}) {
2802 my $h = $para->{h}; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2803 3245
2804 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2805
2806 my $layout = $self->get_layout ($para); 3247 my $layout = $self->get_layout ($para);
2807 3248
2808 $layout->render ($para->{indent}, $y - $y0); 3249 $layout->render ($para->{indent}, $y - $y0);
2809 3250
2810 if (my @w = @{ $para->{widget} }) { 3251 if (my @w = @{ $para->{widget} }) {
… …
2819 $_->draw; 3260 $_->draw;
2820 } 3261 }
2821 } 3262 }
2822 } 3263 }
2823 3264
2824 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2825 } 3267 }
3268
3269 $self->{top_paragraph} = $top_paragraph;
2826 }; 3270 };
2827 }); 3271 });
2828} 3272}
2829 3273
2830sub reconfigure { 3274sub reconfigure {
… …
2848 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2849} 3293}
2850 3294
2851############################################################################# 3295#############################################################################
2852 3296
2853package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2854 3298
2855use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2856 3300
2857our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2858 3302
2859sub moveto { 3303sub moveto {
2860 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2861 3305
2862 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2890 glPopMatrix; 3334 glPopMatrix;
2891} 3335}
2892 3336
2893############################################################################# 3337#############################################################################
2894 3338
2895package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2896 3340
2897our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2898 3342
2899sub new { 3343sub new {
2900 my $class = shift; 3344 my $class = shift;
2901 3345
2902 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
… …
2914 $self->{other}->toggle_visibility; 3358 $self->{other}->toggle_visibility;
2915} 3359}
2916 3360
2917############################################################################# 3361#############################################################################
2918 3362
2919package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2920 3364
2921our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2922 3366
2923use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2924 3368
2925sub new { 3369sub new {
2926 my $class = shift; 3370 my $class = shift;
2927 3371
2928 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2931 ) 3375 )
2932} 3376}
2933 3377
2934sub set_tooltip_from { 3378sub set_tooltip_from {
2935 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
2936 3383
2937 my $tooltip = $widget->{tooltip}; 3384 my $tooltip = $widget->{tooltip};
2938 3385
2939 if ($ENV{CFPLUS_DEBUG} & 2) { 3386 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n" 3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2944 } 3391 }
2945 3392
2946 $tooltip =~ s/^\n+//; 3393 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//; 3394 $tooltip =~ s/\n+$//;
2948 3395
2949 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2950 markup => $tooltip, 3397 markup => $tooltip,
2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952 fontsize => 0.8, 3399 fontsize => 0.8,
2953 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2954 ellipsise => 0, 3401 ellipsise => 0,
2955 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2956 ); 3403 );
2957} 3404}
2958 3405
… …
2977 3424
2978 $self->{root}->on_post_alloc ("move_$self" => sub { 3425 $self->{root}->on_post_alloc ("move_$self" => sub {
2979 my $widget = $self->{owner} 3426 my $widget = $self->{owner}
2980 or return; 3427 or return;
2981 3428
3429 if ($widget->{visible}) {
2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3430 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983 3431
2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3432 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985 if $x + $self->{w} > $self->{root}{w}; 3433 if $x + $self->{w} > $self->{root}{w};
2986 3434
2987 $self->move_abs ($x, $y); 3435 $self->move_abs ($x, $y);
3436 } else {
3437 $self->hide;
3438 }
2988 }); 3439 });
2989} 3440}
2990 3441
2991sub _draw { 3442sub _draw {
2992 my ($self) = @_; 3443 my ($self) = @_;
… …
3016 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
3017} 3468}
3018 3469
3019############################################################################# 3470#############################################################################
3020 3471
3021package CFClient::UI::Face; 3472package CFPlus::UI::Face;
3022 3473
3023our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
3024 3475
3025use CFClient::OpenGL; 3476use CFPlus::OpenGL;
3026 3477
3027sub new { 3478sub new {
3028 my $class = shift; 3479 my $class = shift;
3029 3480
3030 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
3031 aspect => 1, 3484 aspect => 1,
3032 can_events => 0, 3485 can_events => 0,
3033 @_, 3486 @_,
3034 ); 3487 );
3035 3488
3036 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
3037 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
3038 3491
3039 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
3040 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041 hard => 1, 3494 hard => 1,
3042 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
3043 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
3044 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
3045 $widget->update; 3501 $self->update;
3046 }, 3502 },
3047 ); 3503 );
3504
3505 $self->update_face;
3048 } 3506 }
3049 3507
3050 $self 3508 $self
3051} 3509}
3052 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
3053sub size_request { 3524sub size_request {
3054 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
3055} 3540}
3056 3541
3057sub update { 3542sub update {
3058 my ($self) = @_; 3543 my ($self) = @_;
3059 3544
… …
3065sub _draw { 3550sub _draw {
3066 my ($self) = @_; 3551 my ($self) = @_;
3067 3552
3068 return unless $::CONN; 3553 return unless $::CONN;
3069 3554
3070 my $face; 3555 $self->SUPER::_draw;
3071 3556
3072 if ($self->{frame}) {
3073 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
3074 3558 or return;
3075 $face = $anim->[ $self->{frame} % @$anim ]
3076 if $anim && @$anim;
3077 }
3078 3559
3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
3080 3561
3081 if ($tex) { 3562 if ($tex) {
3082 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
… …
3096 $self->SUPER::destroy; 3577 $self->SUPER::destroy;
3097} 3578}
3098 3579
3099############################################################################# 3580#############################################################################
3100 3581
3101package CFClient::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
3102 3583
3103our @ISA = CFClient::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
3104 3585
3105# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
3106 3587
3107############################################################################# 3588#############################################################################
3108 3589
3109package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
3110 3591
3111our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
3112 3593
3113use CFClient::OpenGL; 3594use CFPlus::OpenGL;
3114 3595
3115sub new { 3596sub new {
3116 my $class = shift; 3597 my $class = shift;
3117 3598
3118 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
3119 items => [], 3600 items => [],
3120 z => 100, 3601 z => 100,
3121 @_, 3602 @_,
3122 ); 3603 );
3123 3604
3124 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125 3606
3126 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
3127 my ($widget, $cb, $tooltip) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
3128 3609
3129 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
3130 if (!ref $widget) { 3611 if (!ref $widget) {
3131 if ($widget =~ /\t/) { 3612 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2; 3613 my ($left, $right) = split /\t/, $widget, 2;
3133 3614
3134 $widget = new CFClient::UI::HBox 3615 $widget = new CFPlus::UI::HBox
3135 can_hover => 1, 3616 can_hover => 1,
3136 can_events => 1, 3617 can_events => 1,
3137 tooltip => $tooltip, 3618 tooltip => $tooltip,
3138 children => [ 3619 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1), 3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1), 3621 (new CFPlus::UI::Label markup => $right, align => +1),
3141 ], 3622 ],
3142 ; 3623 ;
3143 3624
3144 } else { 3625 } else {
3145 $widget = new CFClient::UI::Label 3626 $widget = new CFPlus::UI::Label
3146 can_hover => 1, 3627 can_hover => 1,
3147 can_events => 1, 3628 can_events => 1,
3148 markup => $widget, 3629 markup => $widget,
3149 tooltip => $tooltip; 3630 tooltip => $tooltip;
3150 } 3631 }
… …
3198 1 3679 1
3199} 3680}
3200 3681
3201############################################################################# 3682#############################################################################
3202 3683
3203package CFClient::UI::Multiplexer; 3684package CFPlus::UI::Multiplexer;
3204 3685
3205our @ISA = CFClient::UI::Container::; 3686our @ISA = CFPlus::UI::Container::;
3206 3687
3207sub new { 3688sub new {
3208 my $class = shift; 3689 my $class = shift;
3209 3690
3210 my $self = $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
… …
3271 $self->{current}->draw; 3752 $self->{current}->draw;
3272} 3753}
3273 3754
3274############################################################################# 3755#############################################################################
3275 3756
3276package CFClient::UI::Notebook; 3757package CFPlus::UI::Notebook;
3277 3758
3278our @ISA = CFClient::UI::VBox::; 3759our @ISA = CFPlus::UI::VBox::;
3279 3760
3280sub new { 3761sub new {
3281 my $class = shift; 3762 my $class = shift;
3282 3763
3283 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar), 3765 buttonbar => (new CFPlus::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self 3767 # filter => # will be put between multiplexer and $self
3287 @_, 3768 @_,
3288 ); 3769 );
3289 3770
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3294} 3775}
3295 3776
3296sub add { 3777sub add {
3297 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3298 3779
3299 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3300 3781
3301 $self->{buttonbar}->add (new CFClient::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3302 markup => $title, 3783 markup => $title,
3303 tooltip => $tooltip, 3784 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
3305 ); 3786 );
3306 3787
… …
3320 $self->emit (page_changed => $self->{multiplexer}{current}); 3801 $self->emit (page_changed => $self->{multiplexer}{current});
3321} 3802}
3322 3803
3323############################################################################# 3804#############################################################################
3324 3805
3325package CFClient::UI::Combobox; 3806package CFPlus::UI::Selector;
3326 3807
3327use utf8; 3808use utf8;
3328 3809
3329our @ISA = CFClient::UI::Button::; 3810our @ISA = CFPlus::UI::Button::;
3330 3811
3331sub new { 3812sub new {
3332 my $class = shift; 3813 my $class = shift;
3333 3814
3334 my $self = $class->SUPER::new ( 3815 my $self = $class->SUPER::new (
… …
3351 my ($value, $title, $tooltip) = @$_; 3832 my ($value, $title, $tooltip) = @$_;
3352 3833
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 } 3835 }
3355 3836
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357} 3838}
3358 3839
3359sub _set_value { 3840sub _set_value {
3360 my ($self, $value) = @_; 3841 my ($self, $value) = @_;
3361 3842
… …
3376 $self->emit (changed => $value); 3857 $self->emit (changed => $value);
3377} 3858}
3378 3859
3379############################################################################# 3860#############################################################################
3380 3861
3381package CFClient::UI::Statusbox; 3862package CFPlus::UI::Statusbox;
3382 3863
3383our @ISA = CFClient::UI::VBox::; 3864our @ISA = CFPlus::UI::VBox::;
3384 3865
3385sub new { 3866sub new {
3386 my $class = shift; 3867 my $class = shift;
3387 3868
3388 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3389 fontsize => 0.8, 3870 fontsize => 0.8,
3390 @_, 3871 @_,
3391 ); 3872 );
3392 3873
3393 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3394 3875
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396 3877
3397 $self 3878 $self
3398} 3879}
… …
3400sub reorder { 3881sub reorder {
3401 my ($self) = @_; 3882 my ($self) = @_;
3402 my $NOW = Time::HiRes::time; 3883 my $NOW = Time::HiRes::time;
3403 3884
3404 # freeze display when hovering over any label 3885 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner} 3886 return if $CFPlus::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} }; 3888 values %{ $self->{item} };
3408 3889
3409 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
3410 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411 } 3892 }
… …
3432 for ($short) { 3913 for ($short) {
3433 s/^\s+//; 3914 s/^\s+//;
3434 s/\s+/ /g; 3915 s/\s+/ /g;
3435 } 3916 }
3436 3917
3437 new CFClient::UI::Label 3918 new CFPlus::UI::Label
3438 markup => $short, 3919 markup => $short,
3439 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
3440 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
3441 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
3442 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3521 $self->SUPER::destroy; 4002 $self->SUPER::destroy;
3522} 4003}
3523 4004
3524############################################################################# 4005#############################################################################
3525 4006
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; 4007package CFPlus::UI::Root;
3691 4008
3692our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3693 4010
3694use List::Util qw(min max); 4011use List::Util qw(min max);
3695 4012
3696use CFClient::OpenGL; 4013use CFPlus::OpenGL;
3697 4014
3698sub new { 4015sub new {
3699 my $class = shift; 4016 my $class = shift;
3700 4017
3701 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3702 visible => 1, 4019 visible => 1,
3703 @_, 4020 @_,
3704 ); 4021 );
3705 4022
3706 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3707 4024
3708 $self 4025 $self
3709} 4026}
3710 4027
3711sub size_request { 4028sub size_request {
… …
3880 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
3881 4198
3882 $w = max $widget->{min_w}, $w; 4199 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h; 4200 $h = max $widget->{min_h}, $h;
3884 4201
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887 4207
3888 $w = int $w + 0.5; 4208 $w = int $w + 0.5;
3889 $h = int $h + 0.5; 4209 $h = int $h + 0.5;
… …
3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3917 glLoadIdentity; 4237 glLoadIdentity;
3918 4238
3919 { 4239 {
3920 package CFClient::UI::Base; 4240 package CFPlus::UI::Base;
3921 4241
3922 ($draw_x, $draw_y, $draw_w, $draw_h) = 4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h}); 4243 (0, 0, $self->{w}, $self->{h});
3924 }
3925 4244
3926 $self->_draw; 4245 $self->_draw;
4246 }
3927} 4247}
3928 4248
3929############################################################################# 4249#############################################################################
3930 4250
3931package CFClient::UI; 4251package CFPlus::UI;
3932 4252
3933$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
3934$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935 4255
39361 42561
3937 4257

Diff Legend

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