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

Diff Legend

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