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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
96 99
97sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
98 my ($ev) = @_; 101 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
100 103
101 unless ($BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
103 108
104 $GRAB = $widget; 109 $GRAB = $widget;
105 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
106 111
107 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
108 } 113 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0; 118 $ev->{dx} = 0;
… …
207 reconfigure_widgets; 210 reconfigure_widgets;
208} 211}
209 212
210############################################################################# 213#############################################################################
211 214
212package CFClient::UI::Event; 215package CFPlus::UI::Event;
213 216
214sub xy { 217sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 219}
217 220
218############################################################################# 221#############################################################################
219 222
220package CFClient::UI::Base; 223package CFPlus::UI::Base;
221 224
222use strict; 225use strict;
223 226
224use CFClient::OpenGL; 227use CFPlus::OpenGL;
225 228
226sub new { 229sub new {
227 my $class = shift; 230 my $class = shift;
228 231
229 my $self = bless { 232 my $self = bless {
… …
234 h => undef, 237 h => undef,
235 can_events => 1, 238 can_events => 1,
236 @_ 239 @_
237 }, $class; 240 }, $class;
238 241
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 243
241 for (keys %$self) { 244 for (keys %$self) {
242 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
244 } 247 }
245 } 248 }
246 249
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 255
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 258
256 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
261 264
262sub destroy { 265sub destroy {
263 my ($self) = @_; 266 my ($self) = @_;
264 267
265 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
266 %$self = (); 270 %$self = ();
267} 271}
268 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
269sub show { 277sub show {
270 my ($self) = @_; 278 my ($self) = @_;
271 279
272 return if $self->{parent}; 280 return if $self->{parent};
273 281
274 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
275} 283}
276 284
277sub set_visible { 285sub set_visible {
278 my ($self) = @_; 286 my ($self) = @_;
279 287
… …
300 delete $self->{root}; 308 delete $self->{root};
301 309
302 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
304 312
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
307 315
308 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
310} 318}
… …
312sub set_visibility { 320sub set_visibility {
313 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
314 322
315 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
316 324
317 $visible ? $self->hide 325 $visible ? $self->show
318 : $self->show; 326 : $self->hide;
319} 327}
320 328
321sub toggle_visibility { 329sub toggle_visibility {
322 my ($self) = @_; 330 my ($self) = @_;
323 331
… …
367 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
368 376
369 if ($self->{aspect}) { 377 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
371 379
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 382
375 # use alignment to adjust x, y 383 # use alignment to adjust x, y
376 384
377 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
419 427
420 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
421 429
422 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
423 431
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 435 }
428} 436}
429 437
430# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
431sub coord2local { 439sub coord2local {
… …
497sub connect { 505sub connect {
498 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
499 507
500 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
501 509
502 defined wantarray and CFClient::guard { 510 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
505 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
506} 520}
507 521
508my %has_coords = ( 522my %has_coords = (
509 button_down => 1, 523 button_down => 1,
510 button_up => 1, 524 button_up => 1,
… …
513); 527);
514 528
515sub emit { 529sub emit {
516 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
517 531
518 # I do not really like this solution, but I dislike duplication 532 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
520 my @append 534 my @append
521 = $has_coords{$signal} 535 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
523 : (); 537 : ();
524 538
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 540
527 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 550}
532 551
533sub find_widget { 552sub find_widget {
534 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
535 554
… …
543} 562}
544 563
545sub set_parent { 564sub set_parent {
546 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
547 566
548 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
550} 569}
551 570
552sub realloc { 571sub realloc {
553 my ($self) = @_; 572 my ($self) = @_;
… …
619 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
622 glEnd; 641 glEnd;
623 glPopMatrix; 642 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 } 644 }
626 645
627 $self->_draw; 646 $self->_draw;
628 glPopMatrix; 647 glPopMatrix;
629} 648}
… …
632 my ($self) = @_; 651 my ($self) = @_;
633 652
634 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
635} 654}
636 655
656my $cntx;#d#
637sub DESTROY { 657sub DESTROY {
638 my ($self) = @_; 658 my ($self) = @_;
639 659
640 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 661
644 eval { $self->destroy }; 662 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
646} 666}
647 667
648############################################################################# 668#############################################################################
649 669
650package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
651 671
652our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
653 673
654use strict; 674use strict;
655use CFClient::OpenGL; 675use CFPlus::OpenGL;
656 676
657sub new { 677sub new {
658 my $class = shift; 678 my $class = shift;
659 679
660 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
691 } 711 }
692} 712}
693 713
694############################################################################# 714#############################################################################
695 715
696package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
697 717
698our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
699 719
700sub new { 720sub new {
701 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
703} 723}
… …
710 730
711sub draw { } 731sub draw { }
712 732
713############################################################################# 733#############################################################################
714 734
715package CFClient::UI::Container; 735package CFPlus::UI::Container;
716 736
717our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
718 738
719sub new { 739sub new {
720 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
721 741
722 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
808 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
809} 829}
810 830
811############################################################################# 831#############################################################################
812 832
813package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
814 834
815our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
816 836
817sub new { 837sub new {
818 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
819 839
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 841
822 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
823} 843}
824 844
825sub add { 845sub add {
… …
832sub remove { 852sub remove {
833 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
834 854
835 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
836 856
837 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 858 unless @{$self->{children}};
839} 859}
840 860
841sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
842 862
… …
854 874
855############################################################################# 875#############################################################################
856 876
857# back-buffered drawing area 877# back-buffered drawing area
858 878
859package CFClient::UI::Window; 879package CFPlus::UI::Window;
860 880
861our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
862 882
863use CFClient::OpenGL; 883use CFPlus::OpenGL;
864 884
865sub new { 885sub new {
866 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
867 887
868 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
890} 910}
891 911
892sub render_child { 912sub render_child {
893 my ($self) = @_; 913 my ($self) = @_;
894 914
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
898 918
899 { 919 {
900 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
901 921
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
904 } 926 }
905
906 $self->_render;
907 }; 927 };
908} 928}
909 929
910sub _draw { 930sub _draw {
911 my ($self) = @_; 931 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 932
915 my $tex = $self->{texture} 933 my $tex = $self->{texture}
916 or return; 934 or return;
917 935
918 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
921 939
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
923 941
924 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
925} 943}
926 944
927############################################################################# 945#############################################################################
928 946
929package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
930 948
949use List::Util qw(min max);
950
931our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
932 952
933sub new { 953sub new {
934 my $class = shift; 954 my $class = shift;
935 955
936 $class->SUPER::new ( 956 $class->SUPER::new (
… …
966} 986}
967 987
968sub set_offset { 988sub set_offset {
969 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
970 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
973 997
998 $self->emit (changed => $x, $y);
974 $self->update; 999 $self->update;
1000 }
975} 1001}
976 1002
977# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 1004sub coord2local {
979 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1024 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1026 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1028 }
1003} 1029}
1004 1030
1005sub _render { 1031sub _render {
1006 my ($self) = @_; 1032 my ($self) = @_;
1007 1033
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1036
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1038
1013 $self->SUPER::_render; 1039 $self->SUPER::_render;
1014} 1040}
1015 1041
1016############################################################################# 1042#############################################################################
1017 1043
1018package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1019 1045
1020our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1021 1047
1022sub new { 1048sub new {
1023 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1024 1050
1025 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1026 1052
1027 my $self; 1053 my $self;
1028 1054
1029 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1030 vertical => 1, 1065 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1067 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1070 },
1035 ; 1071 ;
1036 1072
1037 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1039 can_events => 1, 1076 can_events => 1,
1040 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1041 %arg, 1081 %arg,
1042 ); 1082 );
1043 1083
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
1045 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1046 1101
1047 $self 1102 $self
1048} 1103}
1049 1104
… …
1053 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1054 1109
1055 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1056} 1111}
1057 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1058sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1060 1146
1061 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1062 1148
1063 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1064 1150
1065 1 1151 1
1066} 1152}
1067 1153
1068sub update_slider { 1154sub invoke_button_down {
1069 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1070 1156
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1072} 1158 $self->grab_focus;
1073 1159
1074sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1075 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1076 1165
1077 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1078 1169
1079 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1080} 1195}
1081 1196
1082sub invoke_size_allocate { 1197sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1084 1199
1085 $self->update_slider; 1200 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1202}
1089 1203
1090############################################################################# 1204#############################################################################
1091 1205
1092package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1093 1207
1094our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1095 1209
1096use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1097 1211
1098sub new { 1212sub new {
1099 my $class = shift; 1213 my $class = shift;
1100 1214
1101 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1128} 1242}
1129 1243
1130############################################################################# 1244#############################################################################
1131 1245
1132package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1133 1247
1134our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1135 1249
1136use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1251
1252sub new {
1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1137 1351
1138my $bg = 1352my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1141 1355
1142my @border = 1356my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1145 1363
1146sub new { 1364sub new {
1147 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1148 1366
1149 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1372 min_w => 64,
1155 min_h => 32, 1373 min_h => 32,
1156 %arg, 1374 %arg,
1157 ); 1375 );
1158 1376
1159 $self->{title_widget} = new CFClient::UI::Label 1377 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1378 align => 0,
1161 valign => 1, 1379 valign => 1,
1162 text => $self->{title}, 1380 text => $self->{title},
1163 fontsize => $self->{border}, 1381 fontsize => $self->{border},
1164 if exists $self->{title}; 1382 if exists $self->{title};
1165 1383
1166 if ($self->{has_close_button}) { 1384 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1385 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1386 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1387 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1388 on_activate => sub { $self->emit ("delete") };
1171 1389
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1390 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1391 }
1174 1392
1175 $self 1393 $self
1176} 1394}
1177 1395
1178sub add { 1396sub add {
1179 my ($self, @widgets) = @_; 1397 my ($self, @widgets) = @_;
1180 1398
1181 $self->SUPER::add (@widgets); 1399 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1400 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1401 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1402}
1185 1403
1186sub border { 1404sub border {
1187 int $_[0]{border} * $::FONTSIZE 1405 int $_[0]{border} * $::FONTSIZE
1188} 1406}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1514 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1515
1298 ! ! $self->{motion} 1516 ! ! $self->{motion}
1299} 1517}
1300 1518
1519sub invoke_visibility_change {
1520 my ($self, $visible) = @_;
1521
1522 delete $self->{motion} unless $visible;
1523
1524 0
1525}
1526
1301sub _draw { 1527sub _draw {
1302 my ($self) = @_; 1528 my ($self) = @_;
1303 1529
1304 my $child = $self->{children}[0]; 1530 my $child = $self->{children}[0];
1305 1531
… …
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1537
1312 my $border = $self->border; 1538 my $border = $self->border;
1313 1539
1314 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319 1559
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1322 1562
1323 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1582 if $self->{close_button};
1343} 1583}
1344 1584
1345############################################################################# 1585#############################################################################
1346 1586
1347package CFClient::UI::Table; 1587package CFPlus::UI::Table;
1348 1588
1349our @ISA = CFClient::UI::Base::; 1589our @ISA = CFPlus::UI::Base::;
1350 1590
1351use List::Util qw(max sum); 1591use List::Util qw(max sum);
1352 1592
1353use CFClient::OpenGL; 1593use CFPlus::OpenGL;
1354 1594
1355sub new { 1595sub new {
1356 my $class = shift; 1596 my $class = shift;
1357 1597
1358 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1359 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1360 @_, 1602 @_,
1361 ) 1603 )
1362} 1604}
1363 1605
1364sub children { 1606sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366} 1608}
1367 1609
1610# TODO: store row/col info in child widget and use standard add/del
1368sub add { 1611sub add {
1369 my ($self) = shift; 1612 my $self = shift;
1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1370 1620
1371 while (@_) { 1621 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1373 $child->set_parent ($self); 1624 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1375 } 1626 }
1376 1627
1377 $self->{force_realloc} = 1; 1628 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1; 1629 $self->{force_size_alloc} = 1;
1379 $self->realloc; 1630 $self->realloc;
1380} 1631}
1381 1632
1382sub remove { 1633sub remove {
1383 my ($self, $child) = @_; 1634 my ($self, $child) = @_;
1384 1635
1385 # TODO: not yet implemented 1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1386} 1641}
1387 1642
1388# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1389sub clear { 1644sub clear {
1390 my ($self) = @_; 1645 my ($self) = @_;
… …
1439 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1440 1695
1441 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1443 1698
1444 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1445 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1448 1703
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1705
1453 CFClient::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1454 CFClient::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1455 1715
1456 my $y; 1716 my $y;
1457 1717
1458 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
1459 my $row = $self->{children}[$r] 1719 my $row = $self->{children}[$r]
… …
1502 } 1762 }
1503} 1763}
1504 1764
1505############################################################################# 1765#############################################################################
1506 1766
1507package CFClient::UI::Box; 1767package CFPlus::UI::Fixed;
1508 1768
1769use List::Util qw(min max);
1770
1509our @ISA = CFClient::UI::Container::; 1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1845}
1846
1847#############################################################################
1848
1849package CFPlus::UI::Box;
1850
1851our @ISA = CFPlus::UI::Container::;
1510 1852
1511sub size_request { 1853sub size_request {
1512 my ($self) = @_; 1854 my ($self) = @_;
1513 1855
1514 $self->{vertical} 1856 $self->{vertical}
… …
1547 $req[$_] += $space * $children[$_]{expand} 1889 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1890 for 0 .. $#children;
1549 } 1891 }
1550 } 1892 }
1551 1893
1552 CFClient::UI::harmonize \@req; 1894 CFPlus::UI::harmonize \@req;
1553 1895
1554 my $pos = 0; 1896 my $pos = 0;
1555 for (0 .. $#children) { 1897 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1898 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1899 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1904 1
1563} 1905}
1564 1906
1565############################################################################# 1907#############################################################################
1566 1908
1567package CFClient::UI::HBox; 1909package CFPlus::UI::HBox;
1568 1910
1569our @ISA = CFClient::UI::Box::; 1911our @ISA = CFPlus::UI::Box::;
1570 1912
1571sub new { 1913sub new {
1572 my $class = shift; 1914 my $class = shift;
1573 1915
1574 $class->SUPER::new ( 1916 $class->SUPER::new (
… …
1577 ) 1919 )
1578} 1920}
1579 1921
1580############################################################################# 1922#############################################################################
1581 1923
1582package CFClient::UI::VBox; 1924package CFPlus::UI::VBox;
1583 1925
1584our @ISA = CFClient::UI::Box::; 1926our @ISA = CFPlus::UI::Box::;
1585 1927
1586sub new { 1928sub new {
1587 my $class = shift; 1929 my $class = shift;
1588 1930
1589 $class->SUPER::new ( 1931 $class->SUPER::new (
… …
1592 ) 1934 )
1593} 1935}
1594 1936
1595############################################################################# 1937#############################################################################
1596 1938
1597package CFClient::UI::Label; 1939package CFPlus::UI::Label;
1598 1940
1599our @ISA = CFClient::UI::DrawBG::; 1941our @ISA = CFPlus::UI::DrawBG::;
1600 1942
1601use CFClient::OpenGL; 1943use CFPlus::OpenGL;
1602 1944
1603sub new { 1945sub new {
1604 my ($class, %arg) = @_; 1946 my ($class, %arg) = @_;
1605 1947
1606 my $self = $class->SUPER::new ( 1948 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1951 #active_bg => none
1610 #font => default_font 1952 #font => default_font
1611 #text => initial text 1953 #text => initial text
1612 #markup => initial narkup 1954 #markup => initial narkup
1613 #max_w => maximum pixel width 1955 #max_w => maximum pixel width
1956 #style => 0, # render flags
1614 ellipsise => 3, # end 1957 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1958 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1959 fontsize => 1,
1617 align => -1, 1960 align => -1,
1618 valign => -1, 1961 valign => -1,
1619 padding_x => 2, 1962 padding_x => 2,
1620 padding_y => 2, 1963 padding_y => 2,
1621 can_events => 0, 1964 can_events => 0,
1622 %arg 1965 %arg
1623 ); 1966 );
1624 1967
1625 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1969 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1970 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1971 $self->{template} = $layout;
1629 } 1972 }
1630 1973
1631 if (exists $self->{markup}) { 1974 if (exists $self->{markup}) {
… …
1769 }; 2112 };
1770 2113
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2114 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2115 my $h = List::Util::min $self->{h} + 2, $size->[1];
1773 2116
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2118}
1776 2119
1777############################################################################# 2120#############################################################################
1778 2121
1779package CFClient::UI::EntryBase; 2122package CFPlus::UI::EntryBase;
1780 2123
1781our @ISA = CFClient::UI::Label::; 2124our @ISA = CFPlus::UI::Label::;
1782 2125
1783use CFClient::OpenGL; 2126use CFPlus::OpenGL;
1784 2127
1785sub new { 2128sub new {
1786 my $class = shift; 2129 my $class = shift;
1787 2130
1788 $class->SUPER::new ( 2131 $class->SUPER::new (
… …
1792 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1793 can_hover => 1, 2136 can_hover => 1,
1794 can_focus => 1, 2137 can_focus => 1,
1795 valign => 0, 2138 valign => 0,
1796 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1797 #text => ... 2141 #text => ...
1798 #hidden => "*", 2142 #hidden => "*",
1799 @_ 2143 @_
1800 ) 2144 )
1801} 2145}
… …
1846 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1848 2192
1849 my $text = $self->get_text; 2193 my $text = $self->get_text;
1850 2194
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2196
1851 if ($uni == 8) { 2197 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2205 } elsif ($sym == CFPlus::SDLK_HOME) {
2206 # what a hack
2207 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1
2210 : 0;
2211 } elsif ($sym == CFPlus::SDLK_END) {
2212 # uh, again
2213 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2215 ? $self->{cursor} + length $1
2216 : length $self->{text};
2217 } elsif ($uni == 21) { # ctrl-u
2218 $text = "";
1860 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2221 $self->emit ('escape');
1865 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2226 } else {
1868 return 0; 2227 return 0;
1869 } 2228 }
1870 2229
1871 $self->_set_text ($text); 2230 $self->_set_text ($text);
1872 2231
1873 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1874 2234
1875 1 2235 1
1876} 2236}
1877 2237
1878sub invoke_focus_in { 2238sub invoke_focus_in {
… …
1940 utf8::encode $text; 2300 utf8::encode $text;
1941 2301
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943 } 2303 }
1944 2304
1945 glColor @{$self->{fg}};
1946 glBegin GL_LINES; 2305 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2308 glEnd;
1950 } 2309 }
1951} 2310}
1952 2311
2312#############################################################################
2313
1953package CFClient::UI::Entry; 2314package CFPlus::UI::Entry;
1954 2315
1955our @ISA = CFClient::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1956 2317
1957use CFClient::OpenGL; 2318use CFPlus::OpenGL;
1958 2319
1959sub invoke_key_down { 2320sub invoke_key_down {
1960 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1961 2322
1962 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1963 2324
1964 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1967 2328
1968 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
1971 $self->update; 2332 $self->update;
1972 2333
1973 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1976 } 2337 }
1977 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2342 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2344 }
1984 2345
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2349
1989 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2360 1
2000} 2361}
2001 2362
2002############################################################################# 2363#############################################################################
2003 2364
2365package CFPlus::UI::TextEdit;
2366
2367our @ISA = CFPlus::UI::EntryBase::;
2368
2369use CFPlus::OpenGL;
2370
2371sub move_cursor_ver {
2372 my ($self, $dy) = @_;
2373
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375
2376 $y += $dy;
2377
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2379 $self->{cursor} = $index;
2380 delete $self->{cur_h};
2381 $self->update;
2382 return;
2383 }
2384}
2385
2386sub invoke_key_down {
2387 my ($self, $ev) = @_;
2388
2389 my $sym = $ev->{sym};
2390
2391 if ($sym == CFPlus::SDLK_UP) {
2392 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1);
2395 } else {
2396 return $self->SUPER::invoke_key_down ($ev)
2397 }
2398
2399 1
2400}
2401
2402#############################################################################
2403
2004package CFClient::UI::Button; 2404package CFPlus::UI::Button;
2005 2405
2006our @ISA = CFClient::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2007 2407
2008use CFClient::OpenGL; 2408use CFPlus::OpenGL;
2009 2409
2010my @tex = 2410my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
2013 2413
2014sub new { 2414sub new {
2015 my $class = shift; 2415 my $class = shift;
2016 2416
2017 $class->SUPER::new ( 2417 $class->SUPER::new (
2018 padding_x => 4, 2418 padding_x => 4,
2019 padding_y => 4, 2419 padding_y => 4,
2020 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
2021 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
2022 can_hover => 1, 2422 can_hover => 1,
2023 align => 0, 2423 align => 0,
2024 valign => 0, 2424 valign => 0,
2025 can_events => 1, 2425 can_events => 1,
2026 @_ 2426 @_
… …
2044 2444
2045 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2048 2448
2449 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2451
2051 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2052 2453
2053 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2054} 2455}
2055 2456
2056############################################################################# 2457#############################################################################
2057 2458
2058package CFClient::UI::CheckBox; 2459package CFPlus::UI::CheckBox;
2059 2460
2060our @ISA = CFClient::UI::DrawBG::; 2461our @ISA = CFPlus::UI::DrawBG::;
2061 2462
2062my @tex = 2463my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2466
2066use CFClient::OpenGL; 2467use CFPlus::OpenGL;
2067 2468
2068sub new { 2469sub new {
2069 my $class = shift; 2470 my $class = shift;
2070 2471
2071 $class->SUPER::new ( 2472 $class->SUPER::new (
… …
2128 glDisable GL_TEXTURE_2D; 2529 glDisable GL_TEXTURE_2D;
2129} 2530}
2130 2531
2131############################################################################# 2532#############################################################################
2132 2533
2133package CFClient::UI::Image; 2534package CFPlus::UI::Image;
2134 2535
2135our @ISA = CFClient::UI::Base::; 2536our @ISA = CFPlus::UI::Base::;
2136 2537
2137use CFClient::OpenGL; 2538use CFPlus::OpenGL;
2138 2539
2139our %texture_cache; 2540our %texture_cache;
2140 2541
2141sub new { 2542sub new {
2142 my $class = shift; 2543 my $class = shift;
… …
2148 2549
2149 $self->{path} || $self->{tex} 2550 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2551 or Carp::croak "'path' or 'tex' attributes required";
2151 2552
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154 2555
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2556 CFPlus::weaken $texture_cache{$self->{path}};
2156 2557
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2559
2159 $self 2560 $self
2160} 2561}
2161 2562
2162sub STORABLE_freeze { 2563sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2564 my ($self, $cloning) = @_;
2164 2565
2165 $self->{path} 2566 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2567 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167 2568
2168 $self->{path} 2569 $self->{path}
2169} 2570}
2170 2571
2171sub STORABLE_attach { 2572sub STORABLE_attach {
… …
2202 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2203} 2604}
2204 2605
2205############################################################################# 2606#############################################################################
2206 2607
2207package CFClient::UI::ImageButton; 2608package CFPlus::UI::ImageButton;
2208 2609
2209our @ISA = CFClient::UI::Image::; 2610our @ISA = CFPlus::UI::Image::;
2210 2611
2211use CFClient::OpenGL; 2612use CFPlus::OpenGL;
2212 2613
2213my %textures; 2614my %textures;
2214 2615
2215sub new { 2616sub new {
2216 my $class = shift; 2617 my $class = shift;
… …
2238 1 2639 1
2239} 2640}
2240 2641
2241############################################################################# 2642#############################################################################
2242 2643
2243package CFClient::UI::VGauge; 2644package CFPlus::UI::VGauge;
2244 2645
2245our @ISA = CFClient::UI::Base::; 2646our @ISA = CFPlus::UI::Base::;
2246 2647
2247use List::Util qw(min max); 2648use List::Util qw(min max);
2248 2649
2249use CFClient::OpenGL; 2650use CFPlus::OpenGL;
2250 2651
2251my %tex = ( 2652my %tex = (
2252 food => [ 2653 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2655 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2656 ],
2256 grace => [ 2657 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2659 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2660 ],
2260 hp => [ 2661 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2663 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2664 ],
2264 mana => [ 2665 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2667 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2668 ],
2268); 2669);
2269 2670
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2671# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2374} 2775}
2375 2776
2376############################################################################# 2777#############################################################################
2377 2778
2378package CFClient::UI::Gauge; 2779package CFPlus::UI::Gauge;
2379 2780
2380our @ISA = CFClient::UI::VBox::; 2781our @ISA = CFPlus::UI::VBox::;
2381 2782
2382sub new { 2783sub new {
2383 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2384 2785
2385 my $self = $class->SUPER::new ( 2786 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2788 can_hover => 1,
2388 can_events => 1, 2789 can_events => 1,
2389 %arg, 2790 %arg,
2390 ); 2791 );
2391 2792
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2793 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2794 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2795 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2796
2396 $self 2797 $self
2397} 2798}
2398 2799
2399sub set_fontsize { 2800sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2821 $self->{value}->set_text ($val);
2421} 2822}
2422 2823
2423############################################################################# 2824#############################################################################
2424 2825
2425package CFClient::UI::Slider; 2826package CFPlus::UI::Slider;
2426 2827
2427use strict; 2828use strict;
2428 2829
2429use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2430 2831
2431our @ISA = CFClient::UI::DrawBG::; 2832our @ISA = CFPlus::UI::DrawBG::;
2432 2833
2433my @tex = 2834my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2835 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2836 qw(s1_slider.png s1_slider_bg.png);
2436 2837
2437sub new { 2838sub new {
2438 my $class = shift; 2839 my $class = shift;
2439 2840
… …
2533sub invoke_mouse_wheel { 2934sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 2935 my ($self, $ev) = @_;
2535 2936
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 2942
2540 ! ! $delta 2943 ! ! $delta
2541} 2944}
2542 2945
2543sub update { 2946sub update {
… …
2594 glDisable GL_TEXTURE_2D; 2997 glDisable GL_TEXTURE_2D;
2595} 2998}
2596 2999
2597############################################################################# 3000#############################################################################
2598 3001
2599package CFClient::UI::ValSlider; 3002package CFPlus::UI::ValSlider;
2600 3003
2601our @ISA = CFClient::UI::HBox::; 3004our @ISA = CFPlus::UI::HBox::;
2602 3005
2603sub new { 3006sub new {
2604 my ($class, %arg) = @_; 3007 my ($class, %arg) = @_;
2605 3008
2606 my $range = delete $arg{range}; 3009 my $range = delete $arg{range};
2607 3010
2608 my $self = $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3012 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3013 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 3014 to_value => sub { shift },
2612 from_value => sub { shift }, 3015 from_value => sub { shift },
2613 %arg, 3016 %arg,
2614 ); 3017 );
2615 3018
… …
2635sub set_range { shift->{slider}->set_range (@_) } 3038sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 3039sub set_value { shift->{slider}->set_value (@_) }
2637 3040
2638############################################################################# 3041#############################################################################
2639 3042
2640package CFClient::UI::TextScroller; 3043package CFPlus::UI::TextScroller;
2641 3044
2642our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFPlus::UI::HBox::;
2643 3046
2644use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2645 3048
2646sub new { 3049sub new {
2647 my $class = shift; 3050 my $class = shift;
2648 3051
2649 my $self = $class->SUPER::new ( 3052 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3054 can_events => 1,
2652 indent => 0, 3055 indent => 0,
2653 #font => default_font 3056 #font => default_font
2654 @_, 3057 @_,
2655 3058
2656 layout => (new CFClient::Layout), 3059 layout => (new CFPlus::Layout),
2657 par => [], 3060 par => [],
3061 max_par => 0,
2658 height => 0, 3062 height => 0,
2659 children => [ 3063 children => [
2660 (new CFClient::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2662 ], 3066 ],
2663 ); 3067 );
2664 3068
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3069 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3070
… …
2743 3147
2744 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3149 $self->{children}[1]->set_value ($offset);
2746} 3150}
2747 3151
3152sub current_paragraph {
3153 my ($self) = @_;
3154
3155 $self->{top_paragraph} - 1
3156}
3157
3158sub scroll_to {
3159 my ($self, $para) = @_;
3160
3161 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3162
3163 $self->{scroll_to} = $para;
3164 $self->update;
3165}
3166
2748sub clear { 3167sub clear {
2749 my ($self) = @_; 3168 my ($self) = @_;
2750 3169
2751 my (undef, undef, @other) = @{ $self->{children} }; 3170 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other; 3171 $self->remove ($_) for @other;
… …
2755 $self->{height} = 0; 3174 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3175 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 3176}
2758 3177
2759sub add_paragraph { 3178sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 3179 my $self = shift;
2761 3180
2762 my ($text, @w) = ref $para ? @$para : $para; 3181 for my $para (@_) {
2763
2764 $para = { 3182 $para = {
3183 fg => [1, 1, 1, 1],
3184 indent => 0,
3185 markup => "",
3186 widget => [],
3187 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 3188 w => 1e10,
2766 wrapped => 1, 3189 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 3190 };
2772 3191
2773 $self->add (@w) if @w; 3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3193 push @{$self->{par}}, $para;
3194 }
3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
3198 }
2775 3199
2776 $self->{need_reflow}++; 3200 $self->{need_reflow}++;
2777 $self->update; 3201 $self->update;
2778} 3202}
2779 3203
2780sub scroll_to_bottom { 3204sub scroll_to_bottom {
2781 my ($self) = @_; 3205 my ($self) = @_;
2782 3206
2783 $self->{scroll_to_bottom} = 1; 3207 $self->{scroll_to} = $#{$self->{par}};
2784 $self->update; 3208 $self->update;
2785} 3209}
2786 3210
3211sub force_uptodate {
3212 my ($self) = @_;
3213
3214 if (delete $self->{need_reflow}) {
3215 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3216
3217 my $height = 0;
3218
3219 for my $para (@{$self->{par}}) {
3220 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3221 my $layout = $self->get_layout ($para);
3222 my ($w, $h) = $layout->size;
3223
3224 $para->{w} = $w + $para->{indent};
3225 $para->{h} = $h;
3226 $para->{wrapped} = $layout->has_wrapped;
3227 }
3228
3229 $para->{y} = $height;
3230 $height += $para->{h};
3231 }
3232
3233 $self->{height} = $height;
3234 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3235
3236 delete $self->{texture};
3237 }
3238
3239 if (my $paridx = delete $self->{scroll_to}) {
3240 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3241 }
3242}
3243
2787sub update { 3244sub update {
2788 my ($self) = @_; 3245 my ($self) = @_;
2789 3246
2790 $self->SUPER::update; 3247 $self->SUPER::update;
2791 3248
2792 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2793 3250
2794 delete $self->{texture}; 3251 delete $self->{texture};
2795 3252
2796 $ROOT->on_post_alloc ($self => sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798 3257
2799 if (delete $self->{need_reflow}) {
2800 my $height = 0;
2801
2802 for my $para (@{$self->{par}}) {
2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804 my $layout = $self->get_layout ($para);
2805 my ($w, $h) = $layout->size;
2806
2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2810 }
2811
2812 $height += $para->{h};
2813 }
2814
2815 $self->{height} = $height;
2816
2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819 delete $self->{texture};
2820 }
2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827 glClearColor 0, 0, 0, 0; 3259 glClearColor 0, 0, 0, 0;
2828 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2829 3261
3262 package CFPlus::UI::Base;
3263 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3264 (0, 0, $self->{w}, $self->{h});
3265
3266 my $top = int $self->{children}[1]{range}[0];
3267
3268 my $paridx = 0;
3269 my $top_paragraph;
2830 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2831 3271
2832 my $y0 = $top; 3272 my $y0 = $top;
2833 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2834 3274
2835 my $y = 0;
2836
2837 for my $para (@{$self->{par}}) { 3275 for my $para (@{$self->{par}}) {
2838 my $h = $para->{h}; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2839 3278
2840 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2841
2842 my $layout = $self->get_layout ($para); 3280 my $layout = $self->get_layout ($para);
2843 3281
2844 $layout->render ($para->{indent}, $y - $y0); 3282 $layout->render ($para->{indent}, $y - $y0);
2845 3283
2846 if (my @w = @{ $para->{widget} }) { 3284 if (my @w = @{ $para->{widget} }) {
… …
2855 $_->draw; 3293 $_->draw;
2856 } 3294 }
2857 } 3295 }
2858 } 3296 }
2859 3297
2860 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2861 } 3300 }
3301
3302 $self->{top_paragraph} = $top_paragraph;
2862 }; 3303 };
2863 }); 3304 });
2864} 3305}
2865 3306
2866sub reconfigure { 3307sub reconfigure {
… …
2884 $self->{children}[1]->draw; 3325 $self->{children}[1]->draw;
2885} 3326}
2886 3327
2887############################################################################# 3328#############################################################################
2888 3329
2889package CFClient::UI::Animator; 3330package CFPlus::UI::Animator;
2890 3331
2891use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2892 3333
2893our @ISA = CFClient::UI::Bin::; 3334our @ISA = CFPlus::UI::Bin::;
2894 3335
2895sub moveto { 3336sub moveto {
2896 my ($self, $x, $y) = @_; 3337 my ($self, $x, $y) = @_;
2897 3338
2898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3339 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2926 glPopMatrix; 3367 glPopMatrix;
2927} 3368}
2928 3369
2929############################################################################# 3370#############################################################################
2930 3371
2931package CFClient::UI::Flopper; 3372package CFPlus::UI::Flopper;
2932 3373
2933our @ISA = CFClient::UI::Button::; 3374our @ISA = CFPlus::UI::Button::;
2934 3375
2935sub new { 3376sub new {
2936 my $class = shift; 3377 my $class = shift;
2937 3378
2938 my $self = $class->SUPER::new ( 3379 my $self = $class->SUPER::new (
… …
2950 $self->{other}->toggle_visibility; 3391 $self->{other}->toggle_visibility;
2951} 3392}
2952 3393
2953############################################################################# 3394#############################################################################
2954 3395
2955package CFClient::UI::Tooltip; 3396package CFPlus::UI::Tooltip;
2956 3397
2957our @ISA = CFClient::UI::Bin::; 3398our @ISA = CFPlus::UI::Bin::;
2958 3399
2959use CFClient::OpenGL; 3400use CFPlus::OpenGL;
2960 3401
2961sub new { 3402sub new {
2962 my $class = shift; 3403 my $class = shift;
2963 3404
2964 $class->SUPER::new ( 3405 $class->SUPER::new (
… …
2967 ) 3408 )
2968} 3409}
2969 3410
2970sub set_tooltip_from { 3411sub set_tooltip_from {
2971 my ($self, $widget) = @_; 3412 my ($self, $widget) = @_;
3413
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
2972 3416
2973 my $tooltip = $widget->{tooltip}; 3417 my $tooltip = $widget->{tooltip};
2974 3418
2975 if ($ENV{CFPLUS_DEBUG} & 2) { 3419 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n" 3420 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2980 } 3424 }
2981 3425
2982 $tooltip =~ s/^\n+//; 3426 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//; 3427 $tooltip =~ s/\n+$//;
2984 3428
2985 $self->add (new CFClient::UI::Label 3429 $self->add (new CFPlus::UI::Label
2986 markup => $tooltip, 3430 markup => $tooltip,
2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988 fontsize => 0.8, 3432 fontsize => 0.8,
2989 fg => [0, 0, 0, 1], 3433 style => 1, # FLAG_INVERSE
2990 ellipsise => 0, 3434 ellipsise => 0,
2991 font => ($widget->{tooltip_font} || $::FONT_PROP), 3435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2992 ); 3436 );
2993} 3437}
2994 3438
… …
3056 $self->SUPER::_draw; 3500 $self->SUPER::_draw;
3057} 3501}
3058 3502
3059############################################################################# 3503#############################################################################
3060 3504
3061package CFClient::UI::Face; 3505package CFPlus::UI::Face;
3062 3506
3063our @ISA = CFClient::UI::DrawBG::; 3507our @ISA = CFPlus::UI::DrawBG::;
3064 3508
3065use CFClient::OpenGL; 3509use CFPlus::OpenGL;
3066 3510
3067sub new { 3511sub new {
3068 my $class = shift; 3512 my $class = shift;
3069 3513
3070 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
3071 aspect => 1, 3517 aspect => 1,
3072 can_events => 0, 3518 can_events => 0,
3073 @_, 3519 @_,
3074 ); 3520 );
3075 3521
3076 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
3077 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
3078 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3079 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
3080 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081 hard => 1, 3528 parked => 1,
3082 interval => $self->{animspeed},
3083 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
3084 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
3085 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
3086 }, 3537 },
3087 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
3088 } 3542 }
3089 3543
3090 $self 3544 $self
3091} 3545}
3092 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3093sub size_request { 3577sub size_request {
3094 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
3095} 3593}
3096 3594
3097sub update { 3595sub update {
3098 my ($self) = @_; 3596 my ($self) = @_;
3099 3597
3100 return unless $self->{visible}; 3598 return unless $self->{visible};
3101 3599
3102 $self->SUPER::update; 3600 $self->SUPER::update;
3103} 3601}
3104 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3105sub _draw { 3611sub _draw {
3106 my ($self) = @_; 3612 my ($self) = @_;
3107 3613
3108 return unless $::CONN; 3614 return unless $::CONN;
3109 3615
3110 $self->SUPER::_draw; 3616 $self->SUPER::_draw;
3111 3617
3112 my $face;
3113
3114 if ($self->{frame}) {
3115 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
3116 3619 or return;
3117 $face = $anim->[ $self->{frame} % @$anim ]
3118 if $anim && @$anim;
3119 }
3120 3620
3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
3122 3622
3123 if ($tex) { 3623 if ($tex) {
3124 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
… …
3130} 3630}
3131 3631
3132sub destroy { 3632sub destroy {
3133 my ($self) = @_; 3633 my ($self) = @_;
3134 3634
3135 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3136 if $self->{timer}; 3636 if $self->{timer};
3137 3637
3138 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3139} 3639}
3140 3640
3141############################################################################# 3641#############################################################################
3142 3642
3143package CFClient::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
3144 3644
3145our @ISA = CFClient::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
3146 3646
3147# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
3148 3648
3149############################################################################# 3649#############################################################################
3150 3650
3151package CFClient::UI::Menu; 3651package CFPlus::UI::Menu;
3152 3652
3153our @ISA = CFClient::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
3154 3654
3155use CFClient::OpenGL; 3655use CFPlus::OpenGL;
3156 3656
3157sub new { 3657sub new {
3158 my $class = shift; 3658 my $class = shift;
3159 3659
3160 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3161 items => [], 3661 items => [],
3162 z => 100, 3662 z => 100,
3163 @_, 3663 @_,
3164 ); 3664 );
3165 3665
3166 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3666 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167 3667
3168 for my $item (@{ $self->{items} }) { 3668 for my $item (@{ $self->{items} }) {
3169 my ($widget, $cb, $tooltip) = @$item; 3669 my ($widget, $cb, $tooltip) = @$item;
3170 3670
3171 # handle various types of items, only text for now 3671 # handle various types of items, only text for now
3172 if (!ref $widget) { 3672 if (!ref $widget) {
3173 if ($widget =~ /\t/) { 3673 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2; 3674 my ($left, $right) = split /\t/, $widget, 2;
3175 3675
3176 $widget = new CFClient::UI::HBox 3676 $widget = new CFPlus::UI::HBox
3177 can_hover => 1, 3677 can_hover => 1,
3178 can_events => 1, 3678 can_events => 1,
3179 tooltip => $tooltip, 3679 tooltip => $tooltip,
3180 children => [ 3680 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1), 3681 (new CFPlus::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1), 3682 (new CFPlus::UI::Label markup => $right, align => +1),
3183 ], 3683 ],
3184 ; 3684 ;
3185 3685
3186 } else { 3686 } else {
3187 $widget = new CFClient::UI::Label 3687 $widget = new CFPlus::UI::Label
3188 can_hover => 1, 3688 can_hover => 1,
3189 can_events => 1, 3689 can_events => 1,
3190 markup => $widget, 3690 markup => $widget,
3191 tooltip => $tooltip; 3691 tooltip => $tooltip;
3192 } 3692 }
… …
3240 1 3740 1
3241} 3741}
3242 3742
3243############################################################################# 3743#############################################################################
3244 3744
3245package CFClient::UI::Multiplexer; 3745package CFPlus::UI::Multiplexer;
3246 3746
3247our @ISA = CFClient::UI::Container::; 3747our @ISA = CFPlus::UI::Container::;
3248 3748
3249sub new { 3749sub new {
3250 my $class = shift; 3750 my $class = shift;
3251 3751
3252 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
… …
3313 $self->{current}->draw; 3813 $self->{current}->draw;
3314} 3814}
3315 3815
3316############################################################################# 3816#############################################################################
3317 3817
3318package CFClient::UI::Notebook; 3818package CFPlus::UI::Notebook;
3319 3819
3320our @ISA = CFClient::UI::VBox::; 3820our @ISA = CFPlus::UI::VBox::;
3321 3821
3322sub new { 3822sub new {
3323 my $class = shift; 3823 my $class = shift;
3324 3824
3325 my $self = $class->SUPER::new ( 3825 my $self = $class->SUPER::new (
3326 buttonbar => (new CFClient::UI::Buttonbar), 3826 buttonbar => (new CFPlus::UI::Buttonbar),
3327 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328 # filter => # will be put between multiplexer and $self 3828 # filter => # will be put between multiplexer and $self
3329 @_, 3829 @_,
3330 ); 3830 );
3331 3831
3332 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3336} 3836}
3337 3837
3338sub add { 3838sub add {
3339 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3340 3840
3341 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3342 3842
3343 $self->{buttonbar}->add (new CFClient::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3344 markup => $title, 3844 markup => $title,
3345 tooltip => $tooltip, 3845 tooltip => $tooltip,
3346 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
3347 ); 3847 );
3348 3848
… …
3362 $self->emit (page_changed => $self->{multiplexer}{current}); 3862 $self->emit (page_changed => $self->{multiplexer}{current});
3363} 3863}
3364 3864
3365############################################################################# 3865#############################################################################
3366 3866
3367package CFClient::UI::Selector; 3867package CFPlus::UI::Selector;
3368 3868
3369use utf8; 3869use utf8;
3370 3870
3371our @ISA = CFClient::UI::Button::; 3871our @ISA = CFPlus::UI::Button::;
3372 3872
3373sub new { 3873sub new {
3374 my $class = shift; 3874 my $class = shift;
3375 3875
3376 my $self = $class->SUPER::new ( 3876 my $self = $class->SUPER::new (
… …
3393 my ($value, $title, $tooltip) = @$_; 3893 my ($value, $title, $tooltip) = @$_;
3394 3894
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3895 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 } 3896 }
3397 3897
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3898 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399} 3899}
3400 3900
3401sub _set_value { 3901sub _set_value {
3402 my ($self, $value) = @_; 3902 my ($self, $value) = @_;
3403 3903
… …
3418 $self->emit (changed => $value); 3918 $self->emit (changed => $value);
3419} 3919}
3420 3920
3421############################################################################# 3921#############################################################################
3422 3922
3423package CFClient::UI::Statusbox; 3923package CFPlus::UI::Statusbox;
3424 3924
3425our @ISA = CFClient::UI::VBox::; 3925our @ISA = CFPlus::UI::VBox::;
3426 3926
3427sub new { 3927sub new {
3428 my $class = shift; 3928 my $class = shift;
3429 3929
3430 my $self = $class->SUPER::new ( 3930 my $self = $class->SUPER::new (
3431 fontsize => 0.8, 3931 fontsize => 0.8,
3432 @_, 3932 @_,
3433 ); 3933 );
3434 3934
3435 Scalar::Util::weaken (my $this = $self); 3935 CFPlus::weaken (my $this = $self);
3436 3936
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438 3938
3439 $self 3939 $self
3440} 3940}
… …
3442sub reorder { 3942sub reorder {
3443 my ($self) = @_; 3943 my ($self) = @_;
3444 my $NOW = Time::HiRes::time; 3944 my $NOW = Time::HiRes::time;
3445 3945
3446 # freeze display when hovering over any label 3946 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner} 3947 return if $CFPlus::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3948 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} }; 3949 values %{ $self->{item} };
3450 3950
3451 while (my ($k, $v) = each %{ $self->{item} }) { 3951 while (my ($k, $v) = each %{ $self->{item} }) {
3452 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3952 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453 } 3953 }
… …
3474 for ($short) { 3974 for ($short) {
3475 s/^\s+//; 3975 s/^\s+//;
3476 s/\s+/ /g; 3976 s/\s+/ /g;
3477 } 3977 }
3478 3978
3479 new CFClient::UI::Label 3979 new CFPlus::UI::Label
3480 markup => $short, 3980 markup => $short,
3481 tooltip => $item->{tooltip}, 3981 tooltip => $item->{tooltip},
3482 tooltip_font => $::FONT_PROP, 3982 tooltip_font => $::FONT_PROP,
3483 tooltip_width => 0.67, 3983 tooltip_width => 0.67,
3484 fontsize => $item->{fontsize} || $self->{fontsize}, 3984 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3563 $self->SUPER::destroy; 4063 $self->SUPER::destroy;
3564} 4064}
3565 4065
3566############################################################################# 4066#############################################################################
3567 4067
3568package CFClient::UI::Inventory;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 col_expand => [0, 1, 0],
3577 items => [],
3578 @_,
3579 );
3580
3581 $self->set_sort_order (undef);
3582
3583 $self
3584}
3585
3586sub update_items {
3587 my ($self) = @_;
3588
3589 $self->clear;
3590
3591 my @item = $self->{sort}->(@{ $self->{items} });
3592
3593 my @adds;
3594 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item;
3597
3598 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget};
3601
3602 $row++;
3603 }
3604
3605 $self->add (@adds);
3606}
3607
3608sub set_sort_order {
3609 my ($self, $order) = @_;
3610
3611 $self->{sort} = $order ||= sub {
3612 sort {
3613 $a->{type} <=> $b->{type}
3614 or $a->{name} cmp $b->{name}
3615 } @_
3616 };
3617
3618 $self->update_items;
3619}
3620
3621sub set_items {
3622 my ($self, $items) = @_;
3623
3624 $self->{items} = [$items ? values %$items : ()];
3625 $self->update_items;
3626}
3627
3628#############################################################################
3629
3630package CFClient::UI::SpellList;
3631
3632our @ISA = CFClient::UI::Table::;
3633
3634sub new {
3635 my $class = shift;
3636
3637 my $self = $class->SUPER::new (
3638 binding => [],
3639 commands => [],
3640 @_,
3641 )
3642}
3643
3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657sub rebuild_spell_list {
3658 my ($self) = @_;
3659
3660 $CFClient::UI::ROOT->on_refresh ($self => sub {
3661 $self->clear;
3662
3663 return unless $::CONN;
3664
3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671 my $row = 0;
3672
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_};
3675
3676 $row++;
3677
3678 my $spell_cb = sub {
3679 my ($widget, $ev) = @_;
3680
3681 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu
3687 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ],
3691 )->popup ($ev);
3692 } else {
3693 return 0;
3694 }
3695
3696 1
3697 };
3698
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704 $self->add (0, $row, new CFClient::UI::Face
3705 face => $spell->{face},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (1, $row, new CFClient::UI::Label
3713 expand => 1,
3714 text => $spell->{name},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725 }
3726 });
3727}
3728
3729sub add_spell {
3730 my ($self, $spell) = @_;
3731
3732 $self->{spell}->{$spell->{name}} = $spell;
3733 $self->rebuild_spell_list;
3734}
3735
3736sub remove_spell {
3737 my ($self, $spell) = @_;
3738
3739 delete $self->{spell}->{$spell->{name}};
3740 $self->rebuild_spell_list;
3741}
3742
3743sub clear_spells {
3744 my ($self) = @_;
3745
3746 $self->{spell} = {};
3747 $self->rebuild_spell_list;
3748}
3749
3750#############################################################################
3751
3752package CFClient::UI::Root; 4068package CFPlus::UI::Root;
3753 4069
3754our @ISA = CFClient::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3755 4071
3756use List::Util qw(min max); 4072use List::Util qw(min max);
3757 4073
3758use CFClient::OpenGL; 4074use CFPlus::OpenGL;
3759 4075
3760sub new { 4076sub new {
3761 my $class = shift; 4077 my $class = shift;
3762 4078
3763 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3764 visible => 1, 4080 visible => 1,
3765 @_, 4081 @_,
3766 ); 4082 );
3767 4083
3768 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3769 4085
3770 $self 4086 $self
3771} 4087}
3772 4088
3773sub size_request { 4089sub size_request {
… …
3968 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3969 $_->() 4285 $_->()
3970 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3971 } 4287 }
3972 4288
3973
3974 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3975 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3976 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3977 4292
3978 glMatrixMode GL_PROJECTION; 4293 glMatrixMode GL_PROJECTION;
… …
3980 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4295 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981 glMatrixMode GL_MODELVIEW; 4296 glMatrixMode GL_MODELVIEW;
3982 glLoadIdentity; 4297 glLoadIdentity;
3983 4298
3984 { 4299 {
3985 package CFClient::UI::Base; 4300 package CFPlus::UI::Base;
3986 4301
3987 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
3989 }
3990 4304
3991 $self->_draw; 4305 $self->_draw;
4306 }
3992} 4307}
3993 4308
3994############################################################################# 4309#############################################################################
3995 4310
3996package CFClient::UI; 4311package CFPlus::UI;
3997 4312
3998$ROOT = new CFClient::UI::Root; 4313$ROOT = new CFPlus::UI::Root;
3999$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4314$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000 4315
40011 43161
4002 4317

Diff Legend

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