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.323 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFPlus::Pod;
11use CFClient::Texture; 12use CFPlus::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
… …
79sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 82 if $FOCUS;
82} 83}
83 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
84sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
85 my ($ev) = @_; 99 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
87 101
88 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
90 106
91 $GRAB = $widget; 107 $GRAB = $widget;
92 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
93 109
94 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->cb->();
95 } 111 }
96 112
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
98 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
100 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
101} 123}
102 124
103sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
104 my ($ev) = @_; 126 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 127
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 129
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 131
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
112 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 134
114 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 137 $grab->update if $grab;
117 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
118 139
140 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 141 $TOOLTIP_WATCHER->cb->();
120 } 142 }
121} 143}
122 144
123sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
124 my ($ev) = @_; 146 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
126 148
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 150
129 if ($widget != $HOVER) { 151 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 152
132 $hover->update if $hover && $hover->{can_hover}; 153 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 154 if $HOVER;
140} 155}
141 156
142# convert position array to integers 157# convert position array to integers
143sub harmonize { 158sub harmonize {
… …
193 reconfigure_widgets; 208 reconfigure_widgets;
194} 209}
195 210
196############################################################################# 211#############################################################################
197 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
198package CFClient::UI::Base; 221package CFPlus::UI::Base;
199 222
200use strict; 223use strict;
201 224
202use CFClient::OpenGL; 225use CFPlus::OpenGL;
203 226
204sub new { 227sub new {
205 my $class = shift; 228 my $class = shift;
206 229
207 my $self = bless { 230 my $self = bless {
… …
212 h => undef, 235 h => undef,
213 can_events => 1, 236 can_events => 1,
214 @_ 237 @_
215 }, $class; 238 }, $class;
216 239
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 241
219 for (keys %$self) { 242 for (keys %$self) {
220 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
222 } 245 }
223 } 246 }
224 247
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 253
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 256
234 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
247sub show { 270sub show {
248 my ($self) = @_; 271 my ($self) = @_;
249 272
250 return if $self->{parent}; 273 return if $self->{parent};
251 274
252 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
253} 276}
254 277
255sub set_visible { 278sub set_visible {
256 my ($self) = @_; 279 my ($self) = @_;
257 280
… …
278 delete $self->{root}; 301 delete $self->{root};
279 302
280 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
282 305
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
285 308
286 $self->emit ("focus_out"); 309 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
288} 311}
… …
345 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
346 369
347 if ($self->{aspect}) { 370 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
349 372
350 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 375
353 # use alignment to adjust x, y 376 # use alignment to adjust x, y
354 377
355 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
397 420
398 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
399 422
400 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
401 424
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 428 }
406} 429}
407 430
408# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
409sub coord2local { 432sub coord2local {
410 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
411 434
435 Carp::confess unless $self->{parent};#d#
436
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 438}
414 439
415# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
416sub coord2global { 441sub coord2global {
417 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
418 443
444 Carp::confess unless $self->{parent};#d#
445
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 447}
421 448
422sub invoke_focus_in { 449sub invoke_focus_in {
423 my ($self) = @_; 450 my ($self) = @_;
… …
452 479
453 $FOCUS->emit ("focus_out") if $FOCUS; 480 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 481 $self->emit ("focus_in");
455} 482}
456 483
457sub invoke_mouse_motion { 1 } 484sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 485sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 486sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
461 489
462sub invoke_button_down { 490sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
464 492
465 $self->grab_focus; 493 $self->grab_focus;
466 494
467 1 495 0
468} 496}
469 497
470sub connect { 498sub connect {
471 my ($self, $signal, $cb) = @_; 499 my ($self, $signal, $cb) = @_;
472 500
473 push @{ $self->{signal_cb}{$signal} }, $cb; 501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
474} 507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
475 515
476sub emit { 516sub emit {
477 my ($self, $signal, @args) = @_; 517 my ($self, $signal, @args) = @_;
478 518
519 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, either.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
528 if ($self->{tooltip} =~ /Apply.*audio/) {
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
530 warn "3 $self->{parent}\n";#d#
531 }
532
479 #d##TODO# stop propagating at first true, do not use sum 533 #d##TODO# stop propagating at first true, do not use sum
534 my $res =
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
483} 545}
484 546
485sub find_widget { 547sub find_widget {
486 my ($self, $x, $y) = @_; 548 my ($self, $x, $y) = @_;
487 549
… …
571 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
574 glEnd; 636 glEnd;
575 glPopMatrix; 637 glPopMatrix;
576 #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;
577 } 639 }
578 640
579 $self->_draw; 641 $self->_draw;
580 glPopMatrix; 642 glPopMatrix;
581} 643}
… …
587} 649}
588 650
589sub DESTROY { 651sub DESTROY {
590 my ($self) = @_; 652 my ($self) = @_;
591 653
654 return if CFPlus::in_destruct;
655
592 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
593 657
594 eval { $self->destroy }; 658 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 660}
597 661
598############################################################################# 662#############################################################################
599 663
600package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
601 665
602our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
603 667
604use strict; 668use strict;
605use CFClient::OpenGL; 669use CFPlus::OpenGL;
606 670
607sub new { 671sub new {
608 my $class = shift; 672 my $class = shift;
609 673
610 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
641 } 705 }
642} 706}
643 707
644############################################################################# 708#############################################################################
645 709
646package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
647 711
648our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
649 713
650sub new { 714sub new {
651 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
653} 717}
… …
660 724
661sub draw { } 725sub draw { }
662 726
663############################################################################# 727#############################################################################
664 728
665package CFClient::UI::Container; 729package CFPlus::UI::Container;
666 730
667our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
668 732
669sub new { 733sub new {
670 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
671 735
672 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
681 if $children; 745 if $children;
682 746
683 $self 747 $self
684} 748}
685 749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
756}
757
686sub add { 758sub add {
687 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
688 760
689 $_->set_parent ($self) 761 $_->set_parent ($self)
690 for @widgets; 762 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 822 $_->draw for @{$self->{children}};
751} 823}
752 824
753############################################################################# 825#############################################################################
754 826
755package CFClient::UI::Bin; 827package CFPlus::UI::Bin;
756 828
757our @ISA = CFClient::UI::Container::; 829our @ISA = CFPlus::UI::Container::;
758 830
759sub new { 831sub new {
760 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
761 833
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 835
764 $class->SUPER::new (children => [$child], %arg) 836 $class->SUPER::new (children => [$child], %arg)
765} 837}
766 838
767sub add { 839sub add {
… …
774sub remove { 846sub remove {
775 my ($self, $widget) = @_; 847 my ($self, $widget) = @_;
776 848
777 $self->SUPER::remove ($widget); 849 $self->SUPER::remove ($widget);
778 850
779 $self->{children} = [new CFClient::UI::Empty] 851 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 852 unless @{$self->{children}};
781} 853}
782 854
783sub child { $_[0]->{children}[0] } 855sub child { $_[0]->{children}[0] }
784 856
… …
796 868
797############################################################################# 869#############################################################################
798 870
799# back-buffered drawing area 871# back-buffered drawing area
800 872
801package CFClient::UI::Window; 873package CFPlus::UI::Window;
802 874
803our @ISA = CFClient::UI::Bin::; 875our @ISA = CFPlus::UI::Bin::;
804 876
805use CFClient::OpenGL; 877use CFPlus::OpenGL;
806 878
807sub new { 879sub new {
808 my ($class, %arg) = @_; 880 my ($class, %arg) = @_;
809 881
810 my $self = $class->SUPER::new (%arg); 882 my $self = $class->SUPER::new (%arg);
… …
832} 904}
833 905
834sub render_child { 906sub render_child {
835 my ($self) = @_; 907 my ($self) = @_;
836 908
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 909 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 910 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 911 glClear GL_COLOR_BUFFER_BIT;
840 912
841 { 913 {
842 package CFClient::UI::Base; 914 package CFPlus::UI::Base;
843 915
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 916 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 917 (0, 0, $self->{w}, $self->{h});
918
919 $self->_render;
846 } 920 }
847
848 $self->_render;
849 }; 921 };
850} 922}
851 923
852sub _draw { 924sub _draw {
853 my ($self) = @_; 925 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 926
857 my $tex = $self->{texture} 927 my $tex = $self->{texture}
858 or return; 928 or return;
859 929
860 glEnable GL_TEXTURE_2D; 930 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 932 glColor 0, 0, 0, 1;
863 933
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 934 $tex->draw_quad_alpha_premultiplied (0, 0);
865 935
866 glDisable GL_TEXTURE_2D; 936 glDisable GL_TEXTURE_2D;
867} 937}
868 938
869############################################################################# 939#############################################################################
870 940
871package CFClient::UI::ViewPort; 941package CFPlus::UI::ViewPort;
872 942
873our @ISA = CFClient::UI::Window::; 943our @ISA = CFPlus::UI::Window::;
874 944
875sub new { 945sub new {
876 my $class = shift; 946 my $class = shift;
877 947
878 $class->SUPER::new ( 948 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1010 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1012 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1013 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1014 }
945} 1015}
946 1016
947sub _render { 1017sub _render {
948 my ($self) = @_; 1018 my ($self) = @_;
949 1019
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1020 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1021 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1022
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1024
955 $self->SUPER::_render; 1025 $self->SUPER::_render;
956} 1026}
957 1027
958############################################################################# 1028#############################################################################
959 1029
960package CFClient::UI::ScrolledWindow; 1030package CFPlus::UI::ScrolledWindow;
961 1031
962our @ISA = CFClient::UI::HBox::; 1032our @ISA = CFPlus::UI::HBox::;
963 1033
964sub new { 1034sub new {
965 my ($class, %arg) = @_; 1035 my ($class, %arg) = @_;
966 1036
967 my $child = delete $arg{child}; 1037 my $child = delete $arg{child};
968 1038
969 my $self; 1039 my $self;
970 1040
971 my $slider = new CFClient::UI::Slider 1041 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1042 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1044 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vp}->set_offset (0, $_[1]);
976 }, 1046 },
977 ; 1047 ;
978 1048
979 $self = $class->SUPER::new ( 1049 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1050 vp => (new CFPlus::UI::ViewPort expand => 1),
1051 can_events => 1,
981 slider => $slider, 1052 slider => $slider,
982 %arg, 1053 %arg,
983 ); 1054 );
984 1055
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1056 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1057 $self->add ($child) if $child;
… …
994 my ($self, $widget) = @_; 1065 my ($self, $widget) = @_;
995 1066
996 $self->{vp}->add ($self->{child} = $widget); 1067 $self->{vp}->add ($self->{child} = $widget);
997} 1068}
998 1069
1070sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_;
1072
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev);
1076
1077 1
1078}
1079
999sub update_slider { 1080sub update_slider {
1000 my ($self) = @_; 1081 my ($self) = @_;
1001 1082
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1084}
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1099 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1100}
1020 1101
1021############################################################################# 1102#############################################################################
1022 1103
1023package CFClient::UI::Frame; 1104package CFPlus::UI::Frame;
1024 1105
1025our @ISA = CFClient::UI::Bin::; 1106our @ISA = CFPlus::UI::Bin::;
1026 1107
1027use CFClient::OpenGL; 1108use CFPlus::OpenGL;
1028 1109
1029sub new { 1110sub new {
1030 my $class = shift; 1111 my $class = shift;
1031 1112
1032 $class->SUPER::new ( 1113 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1139 $self->SUPER::_draw;
1059} 1140}
1060 1141
1061############################################################################# 1142#############################################################################
1062 1143
1063package CFClient::UI::FancyFrame; 1144package CFPlus::UI::FancyFrame;
1064 1145
1065our @ISA = CFClient::UI::Bin::; 1146our @ISA = CFPlus::UI::Bin::;
1066 1147
1067use CFClient::OpenGL; 1148use CFPlus::OpenGL;
1149
1150sub new {
1151 my ($class, %arg) = @_;
1152
1153 if ((exists $arg{label}) && !ref $arg{label}) {
1154 $arg{label} = new CFPlus::UI::Label
1155 align => 1,
1156 valign => 0,
1157 text => $arg{label},
1158 fontsize => ($arg{border} || 0.8) * 0.75;
1159 }
1160
1161 my $self = $class->SUPER::new (
1162 # label => "",
1163 fg => [0.6, 0.3, 0.1],
1164 border => 0.8,
1165 style => 'single',
1166 %arg,
1167 );
1168
1169 $self
1170}
1171
1172sub add {
1173 my ($self, @widgets) = @_;
1174
1175 $self->SUPER::add (@widgets);
1176 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1177}
1178
1179sub border {
1180 int $_[0]{border} * $::FONTSIZE
1181}
1182
1183sub size_request {
1184 my ($self) = @_;
1185
1186 ($self->{label_w}, undef) = $self->{label}->size_request
1187 if $self->{label};
1188
1189 my ($w, $h) = $self->SUPER::size_request;
1190
1191 (
1192 $w + $self->border * 2,
1193 $h + $self->border * 2,
1194 )
1195}
1196
1197sub invoke_size_allocate {
1198 my ($self, $w, $h) = @_;
1199
1200 my $border = $self->border;
1201
1202 $w -= List::Util::max 0, $border * 2;
1203 $h -= List::Util::max 0, $border * 2;
1204
1205 if (my $label = $self->{label}) {
1206 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1207 $label->{h} = List::Util::min $h, $border;
1208 $label->invoke_size_allocate ($label->{w}, $label->{h});
1209 }
1210
1211 $self->child->configure ($border, $border, $w, $h);
1212
1213 1
1214}
1215
1216sub _draw {
1217 my ($self) = @_;
1218
1219 my $child = $self->{children}[0];
1220
1221 my $border = $self->border;
1222 my ($w, $h) = ($self->{w}, $self->{h});
1223
1224 $child->draw;
1225
1226 glColor @{$self->{fg}};
1227 glBegin GL_LINE_STRIP;
1228 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1230 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1232 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1233 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1234 glEnd;
1235
1236 if ($self->{label}) {
1237 glTranslate $border * 2, 0;
1238 $self->{label}->_draw;
1239 }
1240}
1241
1242#############################################################################
1243
1244package CFPlus::UI::Toplevel;
1245
1246our @ISA = CFPlus::UI::Bin::;
1247
1248use CFPlus::OpenGL;
1068 1249
1069my $bg = 1250my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1251 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1252 mipmap => 1, wrap => 1;
1072 1253
1073my @border = 1254my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1257
1077sub new { 1258sub new {
1078 my ($class, %arg) = @_; 1259 my ($class, %arg) = @_;
1079 1260
1080 my $self = $class->SUPER::new ( 1261 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1262 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1263 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1264 border => 0.6,
1084 can_events => 1, 1265 can_events => 1,
1085 min_w => 16, 1266 min_w => 64,
1086 min_h => 16, 1267 min_h => 32,
1087 %arg, 1268 %arg,
1088 ); 1269 );
1089 1270
1090 $self->{title_widget} = new CFClient::UI::Label 1271 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1272 align => 0,
1092 valign => 1, 1273 valign => 1,
1093 text => $self->{title}, 1274 text => $self->{title},
1094 fontsize => $self->{border}, 1275 fontsize => $self->{border},
1095 if exists $self->{title}; 1276 if exists $self->{title};
1096 1277
1097 if ($self->{has_close_button}) { 1278 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1279 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1280 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1281 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1282 on_activate => sub { $self->emit ("delete") };
1102 1283
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1284 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1285 }
1105 1286
1106 $self 1287 $self
1107} 1288}
1108 1289
1109sub add { 1290sub add {
1110 my ($self, @widgets) = @_; 1291 my ($self, @widgets) = @_;
1111 1292
1112 $self->SUPER::add (@widgets); 1293 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1296}
1116 1297
1117sub border { 1298sub border {
1118 int $_[0]{border} * $::FONTSIZE 1299 int $_[0]{border} * $::FONTSIZE
1119} 1300}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1408 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1409
1229 ! ! $self->{motion} 1410 ! ! $self->{motion}
1230} 1411}
1231 1412
1413sub invoke_visibility_change {
1414 my ($self, $visible) = @_;
1415
1416 delete $self->{motion} unless $visible;
1417
1418 0
1419}
1420
1232sub _draw { 1421sub _draw {
1233 my ($self) = @_; 1422 my ($self) = @_;
1234 1423
1235 my $child = $self->{children}[0]; 1424 my $child = $self->{children}[0];
1236 1425
… …
1273 if $self->{close_button}; 1462 if $self->{close_button};
1274} 1463}
1275 1464
1276############################################################################# 1465#############################################################################
1277 1466
1278package CFClient::UI::Table; 1467package CFPlus::UI::Table;
1279 1468
1280our @ISA = CFClient::UI::Base::; 1469our @ISA = CFPlus::UI::Base::;
1281 1470
1282use List::Util qw(max sum); 1471use List::Util qw(max sum);
1283 1472
1284use CFClient::OpenGL; 1473use CFPlus::OpenGL;
1285 1474
1286sub new { 1475sub new {
1287 my $class = shift; 1476 my $class = shift;
1288 1477
1289 $class->SUPER::new ( 1478 $class->SUPER::new (
… …
1295sub children { 1484sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1486}
1298 1487
1299sub add { 1488sub add {
1300 my ($self, $x, $y, $child) = @_; 1489 my ($self) = shift;
1301 1490
1491 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1493 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1494 $self->{children}[$y][$x] = $child;
1495 }
1304 1496
1497 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1499 $self->realloc;
1306} 1500}
1307 1501
1308sub remove { 1502sub remove {
1309 my ($self, $child) = @_; 1503 my ($self, $child) = @_;
… …
1374 1568
1375 # linearly scale sizes 1569 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1572
1379 CFClient::UI::harmonize $ws; 1573 CFPlus::UI::harmonize $ws;
1380 CFClient::UI::harmonize $hs; 1574 CFPlus::UI::harmonize $hs;
1381 1575
1382 my $y; 1576 my $y;
1383 1577
1384 for my $r (0 .. $#{$self->{children}}) { 1578 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1579 my $row = $self->{children}[$r]
… …
1428 } 1622 }
1429} 1623}
1430 1624
1431############################################################################# 1625#############################################################################
1432 1626
1433package CFClient::UI::Box; 1627package CFPlus::UI::Box;
1434 1628
1435our @ISA = CFClient::UI::Container::; 1629our @ISA = CFPlus::UI::Container::;
1436 1630
1437sub size_request { 1631sub size_request {
1438 my ($self) = @_; 1632 my ($self) = @_;
1439 1633
1440 $self->{vertical} 1634 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1667 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1668 for 0 .. $#children;
1475 } 1669 }
1476 } 1670 }
1477 1671
1478 CFClient::UI::harmonize \@req; 1672 CFPlus::UI::harmonize \@req;
1479 1673
1480 my $pos = 0; 1674 my $pos = 0;
1481 for (0 .. $#children) { 1675 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1676 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1677 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1682 1
1489} 1683}
1490 1684
1491############################################################################# 1685#############################################################################
1492 1686
1493package CFClient::UI::HBox; 1687package CFPlus::UI::HBox;
1494 1688
1495our @ISA = CFClient::UI::Box::; 1689our @ISA = CFPlus::UI::Box::;
1496 1690
1497sub new { 1691sub new {
1498 my $class = shift; 1692 my $class = shift;
1499 1693
1500 $class->SUPER::new ( 1694 $class->SUPER::new (
… …
1503 ) 1697 )
1504} 1698}
1505 1699
1506############################################################################# 1700#############################################################################
1507 1701
1508package CFClient::UI::VBox; 1702package CFPlus::UI::VBox;
1509 1703
1510our @ISA = CFClient::UI::Box::; 1704our @ISA = CFPlus::UI::Box::;
1511 1705
1512sub new { 1706sub new {
1513 my $class = shift; 1707 my $class = shift;
1514 1708
1515 $class->SUPER::new ( 1709 $class->SUPER::new (
… …
1518 ) 1712 )
1519} 1713}
1520 1714
1521############################################################################# 1715#############################################################################
1522 1716
1523package CFClient::UI::Label; 1717package CFPlus::UI::Label;
1524 1718
1525our @ISA = CFClient::UI::DrawBG::; 1719our @ISA = CFPlus::UI::DrawBG::;
1526 1720
1527use CFClient::OpenGL; 1721use CFPlus::OpenGL;
1528 1722
1529sub new { 1723sub new {
1530 my ($class, %arg) = @_; 1724 my ($class, %arg) = @_;
1531 1725
1532 my $self = $class->SUPER::new ( 1726 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1729 #active_bg => none
1536 #font => default_font 1730 #font => default_font
1537 #text => initial text 1731 #text => initial text
1538 #markup => initial narkup 1732 #markup => initial narkup
1539 #max_w => maximum pixel width 1733 #max_w => maximum pixel width
1734 #style => 0, # render flags
1540 ellipsise => 3, # end 1735 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1736 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1737 fontsize => 1,
1543 align => -1, 1738 align => -1,
1544 valign => -1, 1739 valign => -1,
1545 padding_x => 2, 1740 padding_x => 2,
1546 padding_y => 2, 1741 padding_y => 2,
1547 can_events => 0, 1742 can_events => 0,
1548 %arg 1743 %arg
1549 ); 1744 );
1550 1745
1551 if (exists $self->{template}) { 1746 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1747 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1748 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1749 $self->{template} = $layout;
1555 } 1750 }
1556 1751
1557 if (exists $self->{markup}) { 1752 if (exists $self->{markup}) {
… …
1559 } else { 1754 } else {
1560 $self->set_text (delete $self->{text}); 1755 $self->set_text (delete $self->{text});
1561 } 1756 }
1562 1757
1563 $self 1758 $self
1564}
1565
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574} 1759}
1575 1760
1576sub update { 1761sub update {
1577 my ($self) = @_; 1762 my ($self) = @_;
1578 1763
… …
1705 }; 1890 };
1706 1891
1707 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1892 my $w = List::Util::min $self->{w} + 4, $size->[0];
1708 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1893 my $h = List::Util::min $self->{h} + 2, $size->[1];
1709 1894
1710 $self->{layout}->render ($self->{ox}, $self->{oy}); 1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711} 1896}
1712 1897
1713############################################################################# 1898#############################################################################
1714 1899
1715package CFClient::UI::EntryBase; 1900package CFPlus::UI::EntryBase;
1716 1901
1717our @ISA = CFClient::UI::Label::; 1902our @ISA = CFPlus::UI::Label::;
1718 1903
1719use CFClient::OpenGL; 1904use CFPlus::OpenGL;
1720 1905
1721sub new { 1906sub new {
1722 my $class = shift; 1907 my $class = shift;
1723 1908
1724 $class->SUPER::new ( 1909 $class->SUPER::new (
… …
1786 1971
1787 if ($uni == 8) { 1972 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1796 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1798 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1799 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 1988 $self->emit ('escape');
1801 } elsif ($uni) { 1989 } elsif ($uni) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 1991 } else {
… …
1826 2014
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2015 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2016
1829 # byte-index to char-index 2017 # byte-index to char-index
1830 my $text = $self->{text}; 2018 my $text = $self->{text};
1831 utf8::encode $text; 2019 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2020 $self->{cursor} = length $text;
1833 2021
1834 $self->_set_text ($self->{text}); 2022 $self->_set_text ($self->{text});
1835 $self->update; 2023 $self->update;
1836 2024
1837 1 2025 1
… …
1876 utf8::encode $text; 2064 utf8::encode $text;
1877 2065
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2066 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2067 }
1880 2068
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2069 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2070 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2072 glEnd;
1886 } 2073 }
1887} 2074}
1888 2075
1889package CFClient::UI::Entry; 2076package CFPlus::UI::Entry;
1890 2077
1891our @ISA = CFClient::UI::EntryBase::; 2078our @ISA = CFPlus::UI::EntryBase::;
1892 2079
1893use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1894 2081
1895sub invoke_key_down { 2082sub invoke_key_down {
1896 my ($self, $ev) = @_; 2083 my ($self, $ev) = @_;
1897 2084
1898 my $sym = $ev->{sym}; 2085 my $sym = $ev->{sym};
… …
1904 $self->{history_pointer} = -1; 2091 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2092 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2093 $self->emit (activate => $txt);
1907 $self->update; 2094 $self->update;
1908 2095
1909 } elsif ($sym == CFClient::SDLK_UP) { 2096 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2097 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2098 $self->{history_saveback} = $self->get_text;
1912 } 2099 }
1913 if (@{$self->{history} || []} > 0) { 2100 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2101 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2103 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2104 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2105 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2106 }
1920 2107
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2108 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2109 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2111
1925 if ($self->{history_pointer} >= 0) { 2112 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2113 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2122 1
1936} 2123}
1937 2124
1938############################################################################# 2125#############################################################################
1939 2126
1940package CFClient::UI::Button; 2127package CFPlus::UI::Button;
1941 2128
1942our @ISA = CFClient::UI::Label::; 2129our @ISA = CFPlus::UI::Label::;
1943 2130
1944use CFClient::OpenGL; 2131use CFPlus::OpenGL;
1945 2132
1946my @tex = 2133my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2135 qw(b1_button_active.png);
1949 2136
1950sub new { 2137sub new {
1951 my $class = shift; 2138 my $class = shift;
1952 2139
… …
1989 $self->SUPER::_draw; 2176 $self->SUPER::_draw;
1990} 2177}
1991 2178
1992############################################################################# 2179#############################################################################
1993 2180
2181package CFPlus::UI::CheckBox;
2182
2183our @ISA = CFPlus::UI::DrawBG::;
2184
2185my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2188
2189use CFPlus::OpenGL;
2190
2191sub new {
2192 my $class = shift;
2193
2194 $class->SUPER::new (
2195 padding_x => 2,
2196 padding_y => 2,
2197 fg => [1, 1, 1],
2198 active_fg => [1, 1, 0],
2199 bg => [0, 0, 0, 0.2],
2200 active_bg => [1, 1, 1, 0.5],
2201 state => 0,
2202 can_hover => 1,
2203 @_
2204 )
2205}
2206
2207sub size_request {
2208 my ($self) = @_;
2209
2210 (6) x 2
2211}
2212
2213sub toggle {
2214 my ($self) = @_;
2215
2216 $self->{state} = !$self->{state};
2217 $self->emit (changed => $self->{state});
2218 $self->update;
2219}
2220
2221sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_;
2223
2224 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2225 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2226 $self->toggle;
2227 } else {
2228 return 0
2229 }
2230
2231 1
2232}
2233
2234sub _draw {
2235 my ($self) = @_;
2236
2237 $self->SUPER::_draw;
2238
2239 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2240
2241 my ($w, $h) = @$self{qw(w h)};
2242
2243 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2244
2245 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2246
2247 my $tex = $self->{state} ? $tex[1] : $tex[0];
2248
2249 glEnable GL_TEXTURE_2D;
2250 $tex->draw_quad_alpha (0, 0, $s, $s);
2251 glDisable GL_TEXTURE_2D;
2252}
2253
2254#############################################################################
2255
2256package CFPlus::UI::Image;
2257
2258our @ISA = CFPlus::UI::Base::;
2259
2260use CFPlus::OpenGL;
2261
2262our %texture_cache;
2263
2264sub new {
2265 my $class = shift;
2266
2267 my $self = $class->SUPER::new (
2268 can_events => 0,
2269 @_,
2270 );
2271
2272 $self->{path} || $self->{tex}
2273 or Carp::croak "'path' or 'tex' attributes required";
2274
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277
2278 Scalar::Util::weaken $texture_cache{$self->{path}};
2279
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281
2282 $self
2283}
2284
2285sub STORABLE_freeze {
2286 my ($self, $cloning) = @_;
2287
2288 $self->{path}
2289 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2290
2291 $self->{path}
2292}
2293
2294sub STORABLE_attach {
2295 my ($self, $cloning, $path) = @_;
2296
2297 $self->new (path => $path)
2298}
2299
2300sub size_request {
2301 my ($self) = @_;
2302
2303 ($self->{tex}{w}, $self->{tex}{h})
2304}
2305
2306sub _draw {
2307 my ($self) = @_;
2308
2309 my $tex = $self->{tex};
2310
2311 my ($w, $h) = ($self->{w}, $self->{h});
2312
2313 if ($self->{rot90}) {
2314 glRotate 90, 0, 0, 1;
2315 glTranslate 0, -$self->{w}, 0;
2316
2317 ($w, $h) = ($h, $w);
2318 }
2319
2320 glEnable GL_TEXTURE_2D;
2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2322
2323 $tex->draw_quad (0, 0, $w, $h);
2324
2325 glDisable GL_TEXTURE_2D;
2326}
2327
2328#############################################################################
2329
1994package CFClient::UI::ImageButton; 2330package CFPlus::UI::ImageButton;
1995 2331
1996our @ISA = CFClient::UI::Image::; 2332our @ISA = CFPlus::UI::Image::;
1997 2333
1998use CFClient::OpenGL; 2334use CFPlus::OpenGL;
1999 2335
2000my %textures; 2336my %textures;
2001 2337
2002sub new { 2338sub new {
2003 my $class = shift; 2339 my $class = shift;
… …
2025 1 2361 1
2026} 2362}
2027 2363
2028############################################################################# 2364#############################################################################
2029 2365
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2070sub invoke_button_down {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2075 $self->toggle;
2076 } else {
2077 return 0
2078 }
2079
2080 1
2081}
2082
2083sub _draw {
2084 my ($self) = @_;
2085
2086 $self->SUPER::_draw;
2087
2088 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2089
2090 my ($w, $h) = @$self{qw(w h)};
2091
2092 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2093
2094 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2095
2096 my $tex = $self->{state} ? $tex[1] : $tex[0];
2097
2098 glEnable GL_TEXTURE_2D;
2099 $tex->draw_quad_alpha (0, 0, $s, $s);
2100 glDisable GL_TEXTURE_2D;
2101}
2102
2103#############################################################################
2104
2105package CFClient::UI::Image; 2366package CFPlus::UI::VGauge;
2106 2367
2107our @ISA = CFClient::UI::Base::; 2368our @ISA = CFPlus::UI::Base::;
2108
2109use CFClient::OpenGL;
2110
2111our %texture_cache;
2112
2113sub new {
2114 my $class = shift;
2115
2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2120
2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
2123
2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2126
2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2128
2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2130
2131 $self
2132}
2133
2134sub size_request {
2135 my ($self) = @_;
2136
2137 ($self->{tex}{w}, $self->{tex}{h})
2138}
2139
2140sub _draw {
2141 my ($self) = @_;
2142
2143 my $tex = $self->{tex};
2144
2145 my ($w, $h) = ($self->{w}, $self->{h});
2146
2147 if ($self->{rot90}) {
2148 glRotate 90, 0, 0, 1;
2149 glTranslate 0, -$self->{w}, 0;
2150
2151 ($w, $h) = ($h, $w);
2152 }
2153
2154 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156
2157 $tex->draw_quad_alpha (0, 0, $w, $h);
2158
2159 glDisable GL_TEXTURE_2D;
2160}
2161
2162#############################################################################
2163
2164package CFClient::UI::VGauge;
2165
2166our @ISA = CFClient::UI::Base::;
2167 2369
2168use List::Util qw(min max); 2370use List::Util qw(min max);
2169 2371
2170use CFClient::OpenGL; 2372use CFPlus::OpenGL;
2171 2373
2172my %tex = ( 2374my %tex = (
2173 food => [ 2375 food => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2176 ], 2378 ],
2177 grace => [ 2379 grace => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2381 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2180 ], 2382 ],
2181 hp => [ 2383 hp => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2184 ], 2386 ],
2185 mana => [ 2387 mana => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2389 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2188 ], 2390 ],
2189); 2391);
2190 2392
2191# eg. VGauge->new (gauge => 'food'), default gauge: food 2393# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2294 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2295} 2497}
2296 2498
2297############################################################################# 2499#############################################################################
2298 2500
2299package CFClient::UI::Gauge; 2501package CFPlus::UI::Gauge;
2300 2502
2301our @ISA = CFClient::UI::VBox::; 2503our @ISA = CFPlus::UI::VBox::;
2302 2504
2303sub new { 2505sub new {
2304 my ($class, %arg) = @_; 2506 my ($class, %arg) = @_;
2305 2507
2306 my $self = $class->SUPER::new ( 2508 my $self = $class->SUPER::new (
… …
2308 can_hover => 1, 2510 can_hover => 1,
2309 can_events => 1, 2511 can_events => 1,
2310 %arg, 2512 %arg,
2311 ); 2513 );
2312 2514
2313 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2515 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2314 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2516 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2315 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2517 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2316 2518
2317 $self 2519 $self
2318} 2520}
2319 2521
2320sub set_fontsize { 2522sub set_fontsize {
… …
2341 $self->{value}->set_text ($val); 2543 $self->{value}->set_text ($val);
2342} 2544}
2343 2545
2344############################################################################# 2546#############################################################################
2345 2547
2346package CFClient::UI::Slider; 2548package CFPlus::UI::Slider;
2347 2549
2348use strict; 2550use strict;
2349 2551
2350use CFClient::OpenGL; 2552use CFPlus::OpenGL;
2351 2553
2352our @ISA = CFClient::UI::DrawBG::; 2554our @ISA = CFPlus::UI::DrawBG::;
2353 2555
2354my @tex = 2556my @tex =
2355 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2356 qw(s1_slider.png s1_slider_bg.png); 2558 qw(s1_slider.png s1_slider_bg.png);
2357 2559
2358sub new { 2560sub new {
2359 my $class = shift; 2561 my $class = shift;
2360 2562
… …
2449 } 2651 }
2450 2652
2451 1 2653 1
2452} 2654}
2453 2655
2656sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_;
2658
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2662
2663 ! ! $delta
2664}
2665
2454sub update { 2666sub update {
2455 my ($self) = @_; 2667 my ($self) = @_;
2456 2668
2457 delete $self->{knob_w}; 2669 delete $self->{knob_w};
2458 $self->SUPER::update; 2670 $self->SUPER::update;
… …
2505 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2506} 2718}
2507 2719
2508############################################################################# 2720#############################################################################
2509 2721
2510package CFClient::UI::ValSlider; 2722package CFPlus::UI::ValSlider;
2511 2723
2512our @ISA = CFClient::UI::HBox::; 2724our @ISA = CFPlus::UI::HBox::;
2513 2725
2514sub new { 2726sub new {
2515 my ($class, %arg) = @_; 2727 my ($class, %arg) = @_;
2516 2728
2517 my $range = delete $arg{range}; 2729 my $range = delete $arg{range};
2518 2730
2519 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
2520 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2521 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2522 to_value => sub { shift }, 2734 to_value => sub { shift },
2523 from_value => sub { shift }, 2735 from_value => sub { shift },
2524 %arg, 2736 %arg,
2525 ); 2737 );
2526 2738
… …
2546sub set_range { shift->{slider}->set_range (@_) } 2758sub set_range { shift->{slider}->set_range (@_) }
2547sub set_value { shift->{slider}->set_value (@_) } 2759sub set_value { shift->{slider}->set_value (@_) }
2548 2760
2549############################################################################# 2761#############################################################################
2550 2762
2551package CFClient::UI::TextScroller; 2763package CFPlus::UI::TextScroller;
2552 2764
2553our @ISA = CFClient::UI::HBox::; 2765our @ISA = CFPlus::UI::HBox::;
2554 2766
2555use CFClient::OpenGL; 2767use CFPlus::OpenGL;
2556 2768
2557sub new { 2769sub new {
2558 my $class = shift; 2770 my $class = shift;
2559 2771
2560 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2561 fontsize => 1, 2773 fontsize => 1,
2562 can_events => 0, 2774 can_events => 1,
2563 indent => 0, 2775 indent => 0,
2564 #font => default_font 2776 #font => default_font
2565 @_, 2777 @_,
2566 2778
2567 layout => (new CFClient::Layout), 2779 layout => (new CFPlus::Layout),
2568 par => [], 2780 par => [],
2569 height => 0, 2781 height => 0,
2570 children => [ 2782 children => [
2571 (new CFClient::UI::Empty expand => 1), 2783 (new CFPlus::UI::Empty expand => 1),
2572 (new CFClient::UI::Slider vertical => 1), 2784 (new CFPlus::UI::Slider vertical => 1),
2573 ], 2785 ],
2574 ); 2786 );
2575 2787
2576 $self->{children}[1]->connect (changed => sub { $self->update }); 2788 $self->{children}[1]->connect (changed => sub { $self->update });
2577 2789
… …
2607 2819
2608 $self->reflow; 2820 $self->reflow;
2609 2821
2610 local $self->{children} = [$empty, $slider]; 2822 local $self->{children} = [$empty, $slider];
2611 $self->SUPER::invoke_size_allocate ($w, $h) 2823 $self->SUPER::invoke_size_allocate ($w, $h)
2824}
2825
2826sub invoke_mouse_wheel {
2827 my ($self, $ev) = @_;
2828
2829 return 0 unless $ev->{dy}; # only vertical movements
2830
2831 $self->{children}[1]->emit (mouse_wheel => $ev);
2832
2833 1
2612} 2834}
2613 2835
2614sub get_layout { 2836sub get_layout {
2615 my ($self, $para) = @_; 2837 my ($self, $para) = @_;
2616 2838
… …
2644 2866
2645 # todo: base offset on lines or so, not on pixels 2867 # todo: base offset on lines or so, not on pixels
2646 $self->{children}[1]->set_value ($offset); 2868 $self->{children}[1]->set_value ($offset);
2647} 2869}
2648 2870
2871sub current_paragraph {
2872 my ($self) = @_;
2873
2874 $self->{top_paragraph} - 1
2875}
2876
2877sub scroll_to {
2878 my ($self, $para) = @_;
2879
2880 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2881
2882 $self->{scroll_to} = $para;
2883 $self->update;
2884}
2885
2649sub clear { 2886sub clear {
2650 my ($self) = @_; 2887 my ($self) = @_;
2651 2888
2652 my (undef, undef, @other) = @{ $self->{children} }; 2889 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other; 2890 $self->remove ($_) for @other;
… …
2656 $self->{height} = 0; 2893 $self->{height} = 0;
2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2894 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2658} 2895}
2659 2896
2660sub add_paragraph { 2897sub add_paragraph {
2661 my ($self, $color, $para, $indent) = @_; 2898 my $self = shift;
2662 2899
2663 my ($text, @w) = ref $para ? @$para : $para; 2900 for my $para (@_) {
2664
2665 $para = { 2901 $para = {
2902 fg => [1, 1, 1, 1],
2903 indent => 0,
2904 markup => "",
2905 widget => [],
2906 ref $para ? %$para : (markup => $para),
2666 w => 1e10, 2907 w => 1e10,
2667 wrapped => 1, 2908 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2672 }; 2909 };
2673 2910
2674 $self->add (@w) if @w; 2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2675 push @{$self->{par}}, $para; 2912 push @{$self->{par}}, $para;
2913 }
2676 2914
2677 $self->{need_reflow}++; 2915 $self->{need_reflow}++;
2678 $self->update; 2916 $self->update;
2679} 2917}
2680 2918
2681sub scroll_to_bottom { 2919sub scroll_to_bottom {
2682 my ($self) = @_; 2920 my ($self) = @_;
2683 2921
2684 $self->{scroll_to_bottom} = 1; 2922 $self->{scroll_to} = $#{$self->{par}};
2685 $self->update; 2923 $self->update;
2686} 2924}
2687 2925
2926sub force_uptodate {
2927 my ($self) = @_;
2928
2929 if (delete $self->{need_reflow}) {
2930 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2931
2932 my $height = 0;
2933
2934 for my $para (@{$self->{par}}) {
2935 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2936 my $layout = $self->get_layout ($para);
2937 my ($w, $h) = $layout->size;
2938
2939 $para->{w} = $w + $para->{indent};
2940 $para->{h} = $h;
2941 $para->{wrapped} = $layout->has_wrapped;
2942 }
2943
2944 $para->{y} = $height;
2945 $height += $para->{h};
2946 }
2947
2948 $self->{height} = $height;
2949 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2950
2951 delete $self->{texture};
2952 }
2953
2954 if (my $paridx = delete $self->{scroll_to}) {
2955 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2956 }
2957}
2958
2688sub update { 2959sub update {
2689 my ($self) = @_; 2960 my ($self) = @_;
2690 2961
2691 $self->SUPER::update; 2962 $self->SUPER::update;
2692 2963
2693 return unless $self->{h} > 0; 2964 return unless $self->{h} > 0;
2694 2965
2695 delete $self->{texture}; 2966 delete $self->{texture};
2696 2967
2697 $ROOT->on_post_alloc ($self => sub { 2968 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate;
2970
2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2699 2972
2700 if (delete $self->{need_reflow}) {
2701 my $height = 0;
2702
2703 for my $para (@{$self->{par}}) {
2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2705 my $layout = $self->get_layout ($para);
2706 my ($w, $h) = $layout->size;
2707
2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2711 }
2712
2713 $height += $para->{h};
2714 }
2715
2716 $self->{height} = $height;
2717
2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2719
2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2725 }
2726
2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2728 glClearColor 0, 0, 0, 0; 2974 glClearColor 0, 0, 0, 0;
2729 glClear GL_COLOR_BUFFER_BIT; 2975 glClear GL_COLOR_BUFFER_BIT;
2730 2976
2977 package CFPlus::UI::Base;
2978 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2979 (0, 0, $self->{w}, $self->{h});
2980
2981 my $top = int $self->{children}[1]{range}[0];
2982
2983 my $paridx = 0;
2984 my $top_paragraph;
2731 my $top = int $self->{children}[1]{range}[0]; 2985 my $top = int $self->{children}[1]{range}[0];
2732 2986
2733 my $y0 = $top; 2987 my $y0 = $top;
2734 my $y1 = $top + $H; 2988 my $y1 = $top + $H;
2735 2989
2736 my $y = 0;
2737
2738 for my $para (@{$self->{par}}) { 2990 for my $para (@{$self->{par}}) {
2739 my $h = $para->{h}; 2991 my $h = $para->{h};
2992 my $y = $para->{y};
2740 2993
2741 if ($y0 < $y + $h && $y < $y1) { 2994 if ($y0 < $y + $h && $y < $y1) {
2742
2743 my $layout = $self->get_layout ($para); 2995 my $layout = $self->get_layout ($para);
2744 2996
2745 $layout->render ($para->{indent}, $y - $y0); 2997 $layout->render ($para->{indent}, $y - $y0);
2746 2998
2747 if (my @w = @{ $para->{widget} }) { 2999 if (my @w = @{ $para->{widget} }) {
… …
2756 $_->draw; 3008 $_->draw;
2757 } 3009 }
2758 } 3010 }
2759 } 3011 }
2760 3012
2761 $y += $h; 3013 $paridx++;
3014 $top_paragraph ||= $paridx if $y >= $top;
2762 } 3015 }
3016
3017 $self->{top_paragraph} = $top_paragraph;
2763 }; 3018 };
2764 }); 3019 });
2765} 3020}
2766 3021
2767sub reconfigure { 3022sub reconfigure {
… …
2785 $self->{children}[1]->draw; 3040 $self->{children}[1]->draw;
2786} 3041}
2787 3042
2788############################################################################# 3043#############################################################################
2789 3044
2790package CFClient::UI::Animator; 3045package CFPlus::UI::Animator;
2791 3046
2792use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2793 3048
2794our @ISA = CFClient::UI::Bin::; 3049our @ISA = CFPlus::UI::Bin::;
2795 3050
2796sub moveto { 3051sub moveto {
2797 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2798 3053
2799 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2827 glPopMatrix; 3082 glPopMatrix;
2828} 3083}
2829 3084
2830############################################################################# 3085#############################################################################
2831 3086
2832package CFClient::UI::Flopper; 3087package CFPlus::UI::Flopper;
2833 3088
2834our @ISA = CFClient::UI::Button::; 3089our @ISA = CFPlus::UI::Button::;
2835 3090
2836sub new { 3091sub new {
2837 my $class = shift; 3092 my $class = shift;
2838 3093
2839 my $self = $class->SUPER::new ( 3094 my $self = $class->SUPER::new (
… …
2851 $self->{other}->toggle_visibility; 3106 $self->{other}->toggle_visibility;
2852} 3107}
2853 3108
2854############################################################################# 3109#############################################################################
2855 3110
2856package CFClient::UI::Tooltip; 3111package CFPlus::UI::Tooltip;
2857 3112
2858our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2859 3114
2860use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2861 3116
2862sub new { 3117sub new {
2863 my $class = shift; 3118 my $class = shift;
2864 3119
2865 $class->SUPER::new ( 3120 $class->SUPER::new (
… …
2868 ) 3123 )
2869} 3124}
2870 3125
2871sub set_tooltip_from { 3126sub set_tooltip_from {
2872 my ($self, $widget) = @_; 3127 my ($self, $widget) = @_;
3128
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
2873 3131
2874 my $tooltip = $widget->{tooltip}; 3132 my $tooltip = $widget->{tooltip};
2875 3133
2876 if ($ENV{CFPLUS_DEBUG} & 2) { 3134 if ($ENV{CFPLUS_DEBUG} & 2) {
2877 $tooltip .= "\n\n" . (ref $widget) . "\n" 3135 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2881 } 3139 }
2882 3140
2883 $tooltip =~ s/^\n+//; 3141 $tooltip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//; 3142 $tooltip =~ s/\n+$//;
2885 3143
2886 $self->add (new CFClient::UI::Label 3144 $self->add (new CFPlus::UI::Label
2887 markup => $tooltip, 3145 markup => $tooltip,
2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2889 fontsize => 0.8, 3147 fontsize => 0.8,
2890 fg => [0, 0, 0, 1], 3148 style => 1, # FLAG_INVERSE
2891 ellipsise => 0, 3149 ellipsise => 0,
2892 font => ($widget->{tooltip_font} || $::FONT_PROP), 3150 font => ($widget->{tooltip_font} || $::FONT_PROP),
2893 ); 3151 );
2894} 3152}
2895 3153
… …
2914 3172
2915 $self->{root}->on_post_alloc ("move_$self" => sub { 3173 $self->{root}->on_post_alloc ("move_$self" => sub {
2916 my $widget = $self->{owner} 3174 my $widget = $self->{owner}
2917 or return; 3175 or return;
2918 3176
3177 if ($widget->{visible}) {
2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3178 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920 3179
2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3180 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922 if $x + $self->{w} > $self->{root}{w}; 3181 if $x + $self->{w} > $self->{root}{w};
2923 3182
2924 $self->move_abs ($x, $y); 3183 $self->move_abs ($x, $y);
3184 } else {
3185 $self->hide;
3186 }
2925 }); 3187 });
2926} 3188}
2927 3189
2928sub _draw { 3190sub _draw {
2929 my ($self) = @_; 3191 my ($self) = @_;
… …
2953 $self->SUPER::_draw; 3215 $self->SUPER::_draw;
2954} 3216}
2955 3217
2956############################################################################# 3218#############################################################################
2957 3219
2958package CFClient::UI::Face; 3220package CFPlus::UI::Face;
2959 3221
2960our @ISA = CFClient::UI::Base::; 3222our @ISA = CFPlus::UI::DrawBG::;
2961 3223
2962use CFClient::OpenGL; 3224use CFPlus::OpenGL;
2963 3225
2964sub new { 3226sub new {
2965 my $class = shift; 3227 my $class = shift;
2966 3228
2967 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
… …
3002sub _draw { 3264sub _draw {
3003 my ($self) = @_; 3265 my ($self) = @_;
3004 3266
3005 return unless $::CONN; 3267 return unless $::CONN;
3006 3268
3269 $self->SUPER::_draw;
3270
3007 my $face; 3271 my $face;
3008 3272
3009 if ($self->{frame}) { 3273 if ($self->{frame}) {
3010 my $anim = $::CONN->{anim}[$self->{anim}]; 3274 my $anim = $::CONN->{anim}[$self->{anim}];
3011 3275
… …
3033 $self->SUPER::destroy; 3297 $self->SUPER::destroy;
3034} 3298}
3035 3299
3036############################################################################# 3300#############################################################################
3037 3301
3038package CFClient::UI::Buttonbar; 3302package CFPlus::UI::Buttonbar;
3039 3303
3040our @ISA = CFClient::UI::HBox::; 3304our @ISA = CFPlus::UI::HBox::;
3041 3305
3042# TODO: should actualyl wrap buttons and other goodies. 3306# TODO: should actually wrap buttons and other goodies.
3043 3307
3044############################################################################# 3308#############################################################################
3045 3309
3046package CFClient::UI::Menu; 3310package CFPlus::UI::Menu;
3047 3311
3048our @ISA = CFClient::UI::FancyFrame::; 3312our @ISA = CFPlus::UI::Toplevel::;
3049 3313
3050use CFClient::OpenGL; 3314use CFPlus::OpenGL;
3051 3315
3052sub new { 3316sub new {
3053 my $class = shift; 3317 my $class = shift;
3054 3318
3055 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3056 items => [], 3320 items => [],
3057 z => 100, 3321 z => 100,
3058 @_, 3322 @_,
3059 ); 3323 );
3060 3324
3061 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3062 3326
3063 for my $item (@{ $self->{items} }) { 3327 for my $item (@{ $self->{items} }) {
3064 my ($widget, $cb, $tooltip) = @$item; 3328 my ($widget, $cb, $tooltip) = @$item;
3065 3329
3066 # handle various types of items, only text for now 3330 # handle various types of items, only text for now
3067 if (!ref $widget) { 3331 if (!ref $widget) {
3068 if ($widget =~ /\t/) { 3332 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2; 3333 my ($left, $right) = split /\t/, $widget, 2;
3070 3334
3071 $widget = new CFClient::UI::HBox 3335 $widget = new CFPlus::UI::HBox
3072 can_hover => 1, 3336 can_hover => 1,
3073 can_events => 1, 3337 can_events => 1,
3074 tooltip => $tooltip, 3338 tooltip => $tooltip,
3075 children => [ 3339 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1), 3340 (new CFPlus::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1), 3341 (new CFPlus::UI::Label markup => $right, align => +1),
3078 ], 3342 ],
3079 ; 3343 ;
3080 3344
3081 } else { 3345 } else {
3082 $widget = new CFClient::UI::Label 3346 $widget = new CFPlus::UI::Label
3083 can_hover => 1, 3347 can_hover => 1,
3084 can_events => 1, 3348 can_events => 1,
3085 markup => $widget, 3349 markup => $widget,
3086 tooltip => $tooltip; 3350 tooltip => $tooltip;
3087 } 3351 }
… …
3135 1 3399 1
3136} 3400}
3137 3401
3138############################################################################# 3402#############################################################################
3139 3403
3140package CFClient::UI::Multiplexer; 3404package CFPlus::UI::Multiplexer;
3141 3405
3142our @ISA = CFClient::UI::Container::; 3406our @ISA = CFPlus::UI::Container::;
3143 3407
3144sub new { 3408sub new {
3145 my $class = shift; 3409 my $class = shift;
3146 3410
3147 my $self = $class->SUPER::new ( 3411 my $self = $class->SUPER::new (
… …
3208 $self->{current}->draw; 3472 $self->{current}->draw;
3209} 3473}
3210 3474
3211############################################################################# 3475#############################################################################
3212 3476
3213package CFClient::UI::Notebook; 3477package CFPlus::UI::Notebook;
3214 3478
3215our @ISA = CFClient::UI::VBox::; 3479our @ISA = CFPlus::UI::VBox::;
3216 3480
3217sub new { 3481sub new {
3218 my $class = shift; 3482 my $class = shift;
3219 3483
3220 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3221 buttonbar => (new CFClient::UI::Buttonbar), 3485 buttonbar => (new CFPlus::UI::Buttonbar),
3222 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3223 # filter => # will be put between multiplexer and $self 3487 # filter => # will be put between multiplexer and $self
3224 @_, 3488 @_,
3225 ); 3489 );
3226 3490
3227 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3233sub add { 3497sub add {
3234 my ($self, $title, $widget, $tooltip) = @_; 3498 my ($self, $title, $widget, $tooltip) = @_;
3235 3499
3236 Scalar::Util::weaken $self; 3500 Scalar::Util::weaken $self;
3237 3501
3238 $self->{buttonbar}->add (new CFClient::UI::Button 3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3239 markup => $title, 3503 markup => $title,
3240 tooltip => $tooltip, 3504 tooltip => $tooltip,
3241 on_activate => sub { $self->set_current_page ($widget) }, 3505 on_activate => sub { $self->set_current_page ($widget) },
3242 ); 3506 );
3243 3507
… …
3257 $self->emit (page_changed => $self->{multiplexer}{current}); 3521 $self->emit (page_changed => $self->{multiplexer}{current});
3258} 3522}
3259 3523
3260############################################################################# 3524#############################################################################
3261 3525
3262package CFClient::UI::Combobox; 3526package CFPlus::UI::Selector;
3263 3527
3264use utf8; 3528use utf8;
3265 3529
3266our @ISA = CFClient::UI::Button::; 3530our @ISA = CFPlus::UI::Button::;
3267 3531
3268sub new { 3532sub new {
3269 my $class = shift; 3533 my $class = shift;
3270 3534
3271 my $self = $class->SUPER::new ( 3535 my $self = $class->SUPER::new (
… …
3288 my ($value, $title, $tooltip) = @$_; 3552 my ($value, $title, $tooltip) = @$_;
3289 3553
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3554 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 } 3555 }
3292 3556
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3557 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294} 3558}
3295 3559
3296sub _set_value { 3560sub _set_value {
3297 my ($self, $value) = @_; 3561 my ($self, $value) = @_;
3298 3562
… …
3313 $self->emit (changed => $value); 3577 $self->emit (changed => $value);
3314} 3578}
3315 3579
3316############################################################################# 3580#############################################################################
3317 3581
3318package CFClient::UI::Statusbox; 3582package CFPlus::UI::Statusbox;
3319 3583
3320our @ISA = CFClient::UI::VBox::; 3584our @ISA = CFPlus::UI::VBox::;
3321 3585
3322sub new { 3586sub new {
3323 my $class = shift; 3587 my $class = shift;
3324 3588
3325 my $self = $class->SUPER::new ( 3589 my $self = $class->SUPER::new (
… …
3337sub reorder { 3601sub reorder {
3338 my ($self) = @_; 3602 my ($self) = @_;
3339 my $NOW = Time::HiRes::time; 3603 my $NOW = Time::HiRes::time;
3340 3604
3341 # freeze display when hovering over any label 3605 # freeze display when hovering over any label
3342 return if $CFClient::UI::TOOLTIP->{owner} 3606 return if $CFPlus::UI::TOOLTIP->{owner}
3343 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3607 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3344 values %{ $self->{item} }; 3608 values %{ $self->{item} };
3345 3609
3346 while (my ($k, $v) = each %{ $self->{item} }) { 3610 while (my ($k, $v) = each %{ $self->{item} }) {
3347 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3611 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3348 } 3612 }
… …
3369 for ($short) { 3633 for ($short) {
3370 s/^\s+//; 3634 s/^\s+//;
3371 s/\s+/ /g; 3635 s/\s+/ /g;
3372 } 3636 }
3373 3637
3374 new CFClient::UI::Label 3638 new CFPlus::UI::Label
3375 markup => $short, 3639 markup => $short,
3376 tooltip => $item->{tooltip}, 3640 tooltip => $item->{tooltip},
3377 tooltip_font => $::FONT_PROP, 3641 tooltip_font => $::FONT_PROP,
3378 tooltip_width => 0.67, 3642 tooltip_width => 0.67,
3379 fontsize => $item->{fontsize} || $self->{fontsize}, 3643 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3458 $self->SUPER::destroy; 3722 $self->SUPER::destroy;
3459} 3723}
3460 3724
3461############################################################################# 3725#############################################################################
3462 3726
3463package CFClient::UI::Inventory; 3727package CFPlus::UI::Inventory;
3464 3728
3465our @ISA = CFClient::UI::Table::; 3729our @ISA = CFPlus::UI::Table::;
3466 3730
3467sub new { 3731sub new {
3468 my $class = shift; 3732 my $class = shift;
3469 3733
3470 my $self = $class->SUPER::new ( 3734 my $self = $class->SUPER::new (
3471 col_expand => [0, 1, 0], 3735 col_expand => [0, 1, 0],
3736 items => [],
3472 @_, 3737 @_,
3473 ); 3738 );
3474 3739
3740 $self->set_sort_order (undef);
3741
3475 $self 3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3476} 3778}
3477 3779
3478sub set_items { 3780sub set_items {
3479 my ($self, $items) = @_; 3781 my ($self, $items) = @_;
3480 3782
3481 $self->clear; 3783 $self->{items} = [$items ? values %$items : ()];
3482 return unless $items; 3784 $self->update_items;
3483
3484 my @items = sort {
3485 ($a->{type} <=> $b->{type})
3486 or ($a->{name} cmp $b->{name})
3487 } values %$items;
3488
3489 $self->{real_items} = \@items;
3490
3491 my $row = 0;
3492 for my $item (@items) {
3493 CFClient::Item::update_widgets $item;
3494
3495 $self->add (0, $row, $item->{face_widget});
3496 $self->add (1, $row, $item->{desc_widget});
3497 $self->add (2, $row, $item->{weight_widget});
3498
3499 $row++;
3500 }
3501} 3785}
3502 3786
3503############################################################################# 3787#############################################################################
3504 3788
3505package CFClient::UI::SpellList; 3789package CFPlus::UI::SpellList;
3506 3790
3507our @ISA = CFClient::UI::Table::; 3791our @ISA = CFPlus::UI::Table::;
3508 3792
3509sub new { 3793sub new {
3510 my $class = shift; 3794 my $class = shift;
3511 3795
3512 my $self = $class->SUPER::new ( 3796 my $self = $class->SUPER::new (
… …
3530 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3531 3815
3532sub rebuild_spell_list { 3816sub rebuild_spell_list {
3533 my ($self) = @_; 3817 my ($self) = @_;
3534 3818
3535 $CFClient::UI::ROOT->on_refresh ($self => sub { 3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3536 $self->clear; 3820 $self->clear;
3537 3821
3538 return unless $::CONN; 3822 return unless $::CONN;
3539 3823
3540 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545 3829
3546 my $row = 0; 3830 my $row = 0;
3547 3831
3548 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549 my $spell = $self->{spell}{$_}; 3833 my $spell = $self->{spell}{$_};
… …
3556 if ($ev->{button} == 1) { 3840 if ($ev->{button} == 1) {
3557 $::CONN->user_send ("cast $spell->{name}"); 3841 $::CONN->user_send ("cast $spell->{name}");
3558 } elsif ($ev->{button} == 2) { 3842 } elsif ($ev->{button} == 2) {
3559 $::CONN->user_send ("invoke $spell->{name}"); 3843 $::CONN->user_send ("invoke $spell->{name}");
3560 } elsif ($ev->{button} == 3) { 3844 } elsif ($ev->{button} == 3) {
3561 (new CFClient::UI::Menu 3845 (new CFPlus::UI::Menu
3562 items => [ 3846 items => [
3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565 ], 3849 ],
3566 )->popup ($ev); 3850 )->popup ($ev);
… …
3569 } 3853 }
3570 3854
3571 1 3855 1
3572 }; 3856 };
3573 3857
3574 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3575 3859
3576 #TODO: add path info to tooltip 3860 #TODO: add path info to tooltip
3577 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3578 3862
3579 $self->add (0, $row, new CFClient::UI::Face 3863 $self->add (0, $row, new CFPlus::UI::Face
3580 face => $spell->{face}, 3864 face => $spell->{face},
3581 can_hover => 1, 3865 can_hover => 1,
3582 can_events => 1, 3866 can_events => 1,
3583 tooltip => $tooltip, 3867 tooltip => $tooltip,
3584 on_button_down => $spell_cb, 3868 on_button_down => $spell_cb,
3585 ); 3869 );
3586 3870
3587 $self->add (1, $row, new CFClient::UI::Label 3871 $self->add (1, $row, new CFPlus::UI::Label
3588 expand => 1, 3872 expand => 1,
3589 text => $spell->{name}, 3873 text => $spell->{name},
3590 can_hover => 1, 3874 can_hover => 1,
3591 can_events => 1, 3875 can_events => 1,
3592 tooltip => $tooltip, 3876 tooltip => $tooltip,
3593 on_button_down => $spell_cb, 3877 on_button_down => $spell_cb,
3594 ); 3878 );
3595 3879
3596 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600 } 3884 }
3601 }); 3885 });
3602} 3886}
3603 3887
3604sub add_spell { 3888sub add_spell {
… …
3622 $self->rebuild_spell_list; 3906 $self->rebuild_spell_list;
3623} 3907}
3624 3908
3625############################################################################# 3909#############################################################################
3626 3910
3627package CFClient::UI::Root; 3911package CFPlus::UI::Root;
3628 3912
3629our @ISA = CFClient::UI::Container::; 3913our @ISA = CFPlus::UI::Container::;
3630 3914
3631use List::Util qw(min max); 3915use List::Util qw(min max);
3632 3916
3633use CFClient::OpenGL; 3917use CFPlus::OpenGL;
3634 3918
3635sub new { 3919sub new {
3636 my $class = shift; 3920 my $class = shift;
3637 3921
3638 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3814 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3815 4099
3816 $w = 0 if $w < 0; 4100 $w = 0 if $w < 0;
3817 $h = 0 if $h < 0; 4101 $h = 0 if $h < 0;
3818 4102
4103 $w = max $widget->{min_w}, $w;
4104 $h = max $widget->{min_h}, $h;
4105
4106# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108
4109 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111
3819 $w = int $w + 0.5; 4112 $w = int $w + 0.5;
3820 $h = int $h + 0.5; 4113 $h = int $h + 0.5;
3821 4114
3822 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4115 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823 $widget->{old_w} = $widget->{w}; 4116 $widget->{old_w} = $widget->{w};
… …
3846 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3847 glMatrixMode GL_MODELVIEW; 4140 glMatrixMode GL_MODELVIEW;
3848 glLoadIdentity; 4141 glLoadIdentity;
3849 4142
3850 { 4143 {
3851 package CFClient::UI::Base; 4144 package CFPlus::UI::Base;
3852 4145
3853 ($draw_x, $draw_y, $draw_w, $draw_h) = 4146 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3854 (0, 0, $self->{w}, $self->{h}); 4147 (0, 0, $self->{w}, $self->{h});
3855 }
3856 4148
3857 $self->_draw; 4149 $self->_draw;
4150 }
3858} 4151}
3859 4152
3860############################################################################# 4153#############################################################################
3861 4154
3862package CFClient::UI; 4155package CFPlus::UI;
3863 4156
3864$ROOT = new CFClient::UI::Root; 4157$ROOT = new CFPlus::UI::Root;
3865$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3866 4159
38671 41601
3868 4161

Diff Legend

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