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.357 by root, Fri Dec 8 13:49:57 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
479 #d##TODO# stop propagating at first true, do not use sum 528 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 532}
484 533
485sub find_widget { 534sub find_widget {
486 my ($self, $x, $y) = @_; 535 my ($self, $x, $y) = @_;
487 536
… …
571 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
574 glEnd; 623 glEnd;
575 glPopMatrix; 624 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 626 }
578 627
579 $self->_draw; 628 $self->_draw;
580 glPopMatrix; 629 glPopMatrix;
581} 630}
… …
587} 636}
588 637
589sub DESTROY { 638sub DESTROY {
590 my ($self) = @_; 639 my ($self) = @_;
591 640
641 return if CFPlus::in_destruct;
642
592 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
593 644
594 eval { $self->destroy }; 645 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 647}
597 648
598############################################################################# 649#############################################################################
599 650
600package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
601 652
602our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
603 654
604use strict; 655use strict;
605use CFClient::OpenGL; 656use CFPlus::OpenGL;
606 657
607sub new { 658sub new {
608 my $class = shift; 659 my $class = shift;
609 660
610 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
641 } 692 }
642} 693}
643 694
644############################################################################# 695#############################################################################
645 696
646package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
647 698
648our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
649 700
650sub new { 701sub new {
651 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
653} 704}
… …
660 711
661sub draw { } 712sub draw { }
662 713
663############################################################################# 714#############################################################################
664 715
665package CFClient::UI::Container; 716package CFPlus::UI::Container;
666 717
667our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
668 719
669sub new { 720sub new {
670 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
671 722
672 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
681 if $children; 732 if $children;
682 733
683 $self 734 $self
684} 735}
685 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
686sub add { 745sub add {
687 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
688 747
689 $_->set_parent ($self) 748 $_->set_parent ($self)
690 for @widgets; 749 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
751} 810}
752 811
753############################################################################# 812#############################################################################
754 813
755package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
756 815
757our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
758 817
759sub new { 818sub new {
760 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
761 820
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 822
764 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
765} 824}
766 825
767sub add { 826sub add {
… …
774sub remove { 833sub remove {
775 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
776 835
777 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
778 837
779 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 839 unless @{$self->{children}};
781} 840}
782 841
783sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
784 843
… …
796 855
797############################################################################# 856#############################################################################
798 857
799# back-buffered drawing area 858# back-buffered drawing area
800 859
801package CFClient::UI::Window; 860package CFPlus::UI::Window;
802 861
803our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
804 863
805use CFClient::OpenGL; 864use CFPlus::OpenGL;
806 865
807sub new { 866sub new {
808 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
809 868
810 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
832} 891}
833 892
834sub render_child { 893sub render_child {
835 my ($self) = @_; 894 my ($self) = @_;
836 895
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
840 899
841 { 900 {
842 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
843 902
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
846 } 907 }
847
848 $self->_render;
849 }; 908 };
850} 909}
851 910
852sub _draw { 911sub _draw {
853 my ($self) = @_; 912 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 913
857 my $tex = $self->{texture} 914 my $tex = $self->{texture}
858 or return; 915 or return;
859 916
860 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
863 920
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
865 922
866 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
867} 924}
868 925
869############################################################################# 926#############################################################################
870 927
871package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
872 929
873our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
874 931
875sub new { 932sub new {
876 my $class = shift; 933 my $class = shift;
877 934
878 $class->SUPER::new ( 935 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 997 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 999 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1001 }
945} 1002}
946 1003
947sub _render { 1004sub _render {
948 my ($self) = @_; 1005 my ($self) = @_;
949 1006
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 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}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1009
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1011
955 $self->SUPER::_render; 1012 $self->SUPER::_render;
956} 1013}
957 1014
958############################################################################# 1015#############################################################################
959 1016
960package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
961 1018
962our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
963 1020
964sub new { 1021sub new {
965 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
966 1023
967 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
968 1025
969 my $self; 1026 my $self;
970 1027
971 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1029 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1031 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
976 }, 1033 },
977 ; 1034 ;
978 1035
979 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
981 slider => $slider, 1039 slider => $slider,
982 %arg, 1040 %arg,
983 ); 1041 );
984 1042
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
… …
994 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
995 1053
996 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
997} 1055}
998 1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
999sub update_slider { 1067sub update_slider {
1000 my ($self) = @_; 1068 my ($self) = @_;
1001 1069
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1071}
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1087}
1020 1088
1021############################################################################# 1089#############################################################################
1022 1090
1023package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1024 1092
1025our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1026 1094
1027use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1028 1096
1029sub new { 1097sub new {
1030 my $class = shift; 1098 my $class = shift;
1031 1099
1032 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1059} 1127}
1060 1128
1061############################################################################# 1129#############################################################################
1062 1130
1063package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1064 1132
1065our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1066 1134
1067use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1136
1137sub new {
1138 my ($class, %arg) = @_;
1139
1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1068 1236
1069my $bg = 1237my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1239 mipmap => 1, wrap => 1;
1072 1240
1073my @border = 1241my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1242 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); 1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1244
1077sub new { 1245sub new {
1078 my ($class, %arg) = @_; 1246 my ($class, %arg) = @_;
1079 1247
1080 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1251 border => 0.6,
1084 can_events => 1, 1252 can_events => 1,
1085 min_w => 16, 1253 min_w => 64,
1086 min_h => 16, 1254 min_h => 32,
1087 %arg, 1255 %arg,
1088 ); 1256 );
1089 1257
1090 $self->{title_widget} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1259 align => 0,
1092 valign => 1, 1260 valign => 1,
1093 text => $self->{title}, 1261 text => $self->{title},
1094 fontsize => $self->{border}, 1262 fontsize => $self->{border},
1095 if exists $self->{title}; 1263 if exists $self->{title};
1096 1264
1097 if ($self->{has_close_button}) { 1265 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1266 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1267 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1268 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1269 on_activate => sub { $self->emit ("delete") };
1102 1270
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1272 }
1105 1273
1106 $self 1274 $self
1107} 1275}
1108 1276
1109sub add { 1277sub add {
1110 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1111 1279
1112 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1281 $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}; 1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1283}
1116 1284
1117sub border { 1285sub border {
1118 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1119} 1287}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1396
1229 ! ! $self->{motion} 1397 ! ! $self->{motion}
1230} 1398}
1231 1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1406}
1407
1232sub _draw { 1408sub _draw {
1233 my ($self) = @_; 1409 my ($self) = @_;
1234 1410
1235 my $child = $self->{children}[0]; 1411 my $child = $self->{children}[0];
1236 1412
… …
1273 if $self->{close_button}; 1449 if $self->{close_button};
1274} 1450}
1275 1451
1276############################################################################# 1452#############################################################################
1277 1453
1278package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1279 1455
1280our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1281 1457
1282use List::Util qw(max sum); 1458use List::Util qw(max sum);
1283 1459
1284use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1285 1461
1286sub new { 1462sub new {
1287 my $class = shift; 1463 my $class = shift;
1288 1464
1289 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1295sub children { 1471sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1473}
1298 1474
1299sub add { 1475sub add {
1300 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1301 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1480 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1304 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1486 $self->realloc;
1306} 1487}
1307 1488
1308sub remove { 1489sub remove {
1309 my ($self, $child) = @_; 1490 my ($self, $child) = @_;
… …
1374 1555
1375 # linearly scale sizes 1556 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1559
1379 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1380 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1381 1562
1382 my $y; 1563 my $y;
1383 1564
1384 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1428 } 1609 }
1429} 1610}
1430 1611
1431############################################################################# 1612#############################################################################
1432 1613
1433package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1434 1615
1435our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1436 1617
1437sub size_request { 1618sub size_request {
1438 my ($self) = @_; 1619 my ($self) = @_;
1439 1620
1440 $self->{vertical} 1621 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1655 for 0 .. $#children;
1475 } 1656 }
1476 } 1657 }
1477 1658
1478 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1479 1660
1480 my $pos = 0; 1661 my $pos = 0;
1481 for (0 .. $#children) { 1662 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1669 1
1489} 1670}
1490 1671
1491############################################################################# 1672#############################################################################
1492 1673
1493package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1494 1675
1495our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1496 1677
1497sub new { 1678sub new {
1498 my $class = shift; 1679 my $class = shift;
1499 1680
1500 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1503 ) 1684 )
1504} 1685}
1505 1686
1506############################################################################# 1687#############################################################################
1507 1688
1508package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1509 1690
1510our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1511 1692
1512sub new { 1693sub new {
1513 my $class = shift; 1694 my $class = shift;
1514 1695
1515 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1518 ) 1699 )
1519} 1700}
1520 1701
1521############################################################################# 1702#############################################################################
1522 1703
1523package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1524 1705
1525our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1526 1707
1527use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1528 1709
1529sub new { 1710sub new {
1530 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1531 1712
1532 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1716 #active_bg => none
1536 #font => default_font 1717 #font => default_font
1537 #text => initial text 1718 #text => initial text
1538 #markup => initial narkup 1719 #markup => initial narkup
1539 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1540 ellipsise => 3, # end 1722 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1724 fontsize => 1,
1543 align => -1, 1725 align => -1,
1544 valign => -1, 1726 valign => -1,
1545 padding_x => 2, 1727 padding_x => 2,
1546 padding_y => 2, 1728 padding_y => 2,
1547 can_events => 0, 1729 can_events => 0,
1548 %arg 1730 %arg
1549 ); 1731 );
1550 1732
1551 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1736 $self->{template} = $layout;
1555 } 1737 }
1556 1738
1557 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1559 } else { 1741 } else {
1560 $self->set_text (delete $self->{text}); 1742 $self->set_text (delete $self->{text});
1561 } 1743 }
1562 1744
1563 $self 1745 $self
1564}
1565
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574} 1746}
1575 1747
1576sub update { 1748sub update {
1577 my ($self) = @_; 1749 my ($self) = @_;
1578 1750
… …
1705 }; 1877 };
1706 1878
1707 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1708 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1709 1881
1710 $self->{layout}->render ($self->{ox}, $self->{oy}); 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711} 1883}
1712 1884
1713############################################################################# 1885#############################################################################
1714 1886
1715package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1716 1888
1717our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1718 1890
1719use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1720 1892
1721sub new { 1893sub new {
1722 my $class = shift; 1894 my $class = shift;
1723 1895
1724 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1786 1958
1787 if ($uni == 8) { 1959 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1796 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1798 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 $self->{cursor} = 0;
1799 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 1975 $self->emit ('escape');
1801 } elsif ($uni) { 1976 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 1978 } else {
1804 return 0; 1979 return 0;
1805 } 1980 }
1806 1981
… …
1826 2001
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2002 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2003
1829 # byte-index to char-index 2004 # byte-index to char-index
1830 my $text = $self->{text}; 2005 my $text = $self->{text};
1831 utf8::encode $text; 2006 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2007 $self->{cursor} = length $text;
1833 2008
1834 $self->_set_text ($self->{text}); 2009 $self->_set_text ($self->{text});
1835 $self->update; 2010 $self->update;
1836 2011
1837 1 2012 1
… …
1876 utf8::encode $text; 2051 utf8::encode $text;
1877 2052
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2054 }
1880 2055
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2056 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2057 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}; 2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2059 glEnd;
1886 } 2060 }
1887} 2061}
1888 2062
1889package CFClient::UI::Entry; 2063package CFPlus::UI::Entry;
1890 2064
1891our @ISA = CFClient::UI::EntryBase::; 2065our @ISA = CFPlus::UI::EntryBase::;
1892 2066
1893use CFClient::OpenGL; 2067use CFPlus::OpenGL;
1894 2068
1895sub invoke_key_down { 2069sub invoke_key_down {
1896 my ($self, $ev) = @_; 2070 my ($self, $ev) = @_;
1897 2071
1898 my $sym = $ev->{sym}; 2072 my $sym = $ev->{sym};
… …
1904 $self->{history_pointer} = -1; 2078 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2079 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2080 $self->emit (activate => $txt);
1907 $self->update; 2081 $self->update;
1908 2082
1909 } elsif ($sym == CFClient::SDLK_UP) { 2083 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2084 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2085 $self->{history_saveback} = $self->get_text;
1912 } 2086 }
1913 if (@{$self->{history} || []} > 0) { 2087 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2088 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2090 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2091 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2092 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2093 }
1920 2094
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2095 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2096 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2098
1925 if ($self->{history_pointer} >= 0) { 2099 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2100 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2109 1
1936} 2110}
1937 2111
1938############################################################################# 2112#############################################################################
1939 2113
1940package CFClient::UI::Button; 2114package CFPlus::UI::Button;
1941 2115
1942our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1943 2117
1944use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1945 2119
1946my @tex = 2120my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2122 qw(b1_button_active.png);
1949 2123
1950sub new { 2124sub new {
1951 my $class = shift; 2125 my $class = shift;
1952 2126
… …
1989 $self->SUPER::_draw; 2163 $self->SUPER::_draw;
1990} 2164}
1991 2165
1992############################################################################# 2166#############################################################################
1993 2167
2168package CFPlus::UI::CheckBox;
2169
2170our @ISA = CFPlus::UI::DrawBG::;
2171
2172my @tex =
2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2175
2176use CFPlus::OpenGL;
2177
2178sub new {
2179 my $class = shift;
2180
2181 $class->SUPER::new (
2182 padding_x => 2,
2183 padding_y => 2,
2184 fg => [1, 1, 1],
2185 active_fg => [1, 1, 0],
2186 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5],
2188 state => 0,
2189 can_hover => 1,
2190 @_
2191 )
2192}
2193
2194sub size_request {
2195 my ($self) = @_;
2196
2197 (6) x 2
2198}
2199
2200sub toggle {
2201 my ($self) = @_;
2202
2203 $self->{state} = !$self->{state};
2204 $self->emit (changed => $self->{state});
2205 $self->update;
2206}
2207
2208sub invoke_button_down {
2209 my ($self, $ev, $x, $y) = @_;
2210
2211 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2212 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2213 $self->toggle;
2214 } else {
2215 return 0
2216 }
2217
2218 1
2219}
2220
2221sub _draw {
2222 my ($self) = @_;
2223
2224 $self->SUPER::_draw;
2225
2226 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2227
2228 my ($w, $h) = @$self{qw(w h)};
2229
2230 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2231
2232 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2233
2234 my $tex = $self->{state} ? $tex[1] : $tex[0];
2235
2236 glEnable GL_TEXTURE_2D;
2237 $tex->draw_quad_alpha (0, 0, $s, $s);
2238 glDisable GL_TEXTURE_2D;
2239}
2240
2241#############################################################################
2242
2243package CFPlus::UI::Image;
2244
2245our @ISA = CFPlus::UI::Base::;
2246
2247use CFPlus::OpenGL;
2248
2249our %texture_cache;
2250
2251sub new {
2252 my $class = shift;
2253
2254 my $self = $class->SUPER::new (
2255 can_events => 0,
2256 @_,
2257 );
2258
2259 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required";
2261
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264
2265 Scalar::Util::weaken $texture_cache{$self->{path}};
2266
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268
2269 $self
2270}
2271
2272sub STORABLE_freeze {
2273 my ($self, $cloning) = @_;
2274
2275 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2277
2278 $self->{path}
2279}
2280
2281sub STORABLE_attach {
2282 my ($self, $cloning, $path) = @_;
2283
2284 $self->new (path => $path)
2285}
2286
2287sub size_request {
2288 my ($self) = @_;
2289
2290 ($self->{tex}{w}, $self->{tex}{h})
2291}
2292
2293sub _draw {
2294 my ($self) = @_;
2295
2296 my $tex = $self->{tex};
2297
2298 my ($w, $h) = ($self->{w}, $self->{h});
2299
2300 if ($self->{rot90}) {
2301 glRotate 90, 0, 0, 1;
2302 glTranslate 0, -$self->{w}, 0;
2303
2304 ($w, $h) = ($h, $w);
2305 }
2306
2307 glEnable GL_TEXTURE_2D;
2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2309
2310 $tex->draw_quad (0, 0, $w, $h);
2311
2312 glDisable GL_TEXTURE_2D;
2313}
2314
2315#############################################################################
2316
1994package CFClient::UI::ImageButton; 2317package CFPlus::UI::ImageButton;
1995 2318
1996our @ISA = CFClient::UI::Image::; 2319our @ISA = CFPlus::UI::Image::;
1997 2320
1998use CFClient::OpenGL; 2321use CFPlus::OpenGL;
1999 2322
2000my %textures; 2323my %textures;
2001 2324
2002sub new { 2325sub new {
2003 my $class = shift; 2326 my $class = shift;
… …
2025 1 2348 1
2026} 2349}
2027 2350
2028############################################################################# 2351#############################################################################
2029 2352
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; 2353package CFPlus::UI::VGauge;
2106 2354
2107our @ISA = CFClient::UI::Base::; 2355our @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 2356
2168use List::Util qw(min max); 2357use List::Util qw(min max);
2169 2358
2170use CFClient::OpenGL; 2359use CFPlus::OpenGL;
2171 2360
2172my %tex = ( 2361my %tex = (
2173 food => [ 2362 food => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2176 ], 2365 ],
2177 grace => [ 2366 grace => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2367 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/ 2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2180 ], 2369 ],
2181 hp => [ 2370 hp => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2184 ], 2373 ],
2185 mana => [ 2374 mana => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2375 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/ 2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2188 ], 2377 ],
2189); 2378);
2190 2379
2191# eg. VGauge->new (gauge => 'food'), default gauge: food 2380# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2294 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
2295} 2484}
2296 2485
2297############################################################################# 2486#############################################################################
2298 2487
2299package CFClient::UI::Gauge; 2488package CFPlus::UI::Gauge;
2300 2489
2301our @ISA = CFClient::UI::VBox::; 2490our @ISA = CFPlus::UI::VBox::;
2302 2491
2303sub new { 2492sub new {
2304 my ($class, %arg) = @_; 2493 my ($class, %arg) = @_;
2305 2494
2306 my $self = $class->SUPER::new ( 2495 my $self = $class->SUPER::new (
… …
2308 can_hover => 1, 2497 can_hover => 1,
2309 can_events => 1, 2498 can_events => 1,
2310 %arg, 2499 %arg,
2311 ); 2500 );
2312 2501
2313 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2502 $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); 2503 $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"); 2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2316 2505
2317 $self 2506 $self
2318} 2507}
2319 2508
2320sub set_fontsize { 2509sub set_fontsize {
… …
2341 $self->{value}->set_text ($val); 2530 $self->{value}->set_text ($val);
2342} 2531}
2343 2532
2344############################################################################# 2533#############################################################################
2345 2534
2346package CFClient::UI::Slider; 2535package CFPlus::UI::Slider;
2347 2536
2348use strict; 2537use strict;
2349 2538
2350use CFClient::OpenGL; 2539use CFPlus::OpenGL;
2351 2540
2352our @ISA = CFClient::UI::DrawBG::; 2541our @ISA = CFPlus::UI::DrawBG::;
2353 2542
2354my @tex = 2543my @tex =
2355 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2356 qw(s1_slider.png s1_slider_bg.png); 2545 qw(s1_slider.png s1_slider_bg.png);
2357 2546
2358sub new { 2547sub new {
2359 my $class = shift; 2548 my $class = shift;
2360 2549
… …
2449 } 2638 }
2450 2639
2451 1 2640 1
2452} 2641}
2453 2642
2643sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_;
2645
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2649
2650 ! ! $delta
2651}
2652
2454sub update { 2653sub update {
2455 my ($self) = @_; 2654 my ($self) = @_;
2456 2655
2457 delete $self->{knob_w}; 2656 delete $self->{knob_w};
2458 $self->SUPER::update; 2657 $self->SUPER::update;
… …
2505 glDisable GL_TEXTURE_2D; 2704 glDisable GL_TEXTURE_2D;
2506} 2705}
2507 2706
2508############################################################################# 2707#############################################################################
2509 2708
2510package CFClient::UI::ValSlider; 2709package CFPlus::UI::ValSlider;
2511 2710
2512our @ISA = CFClient::UI::HBox::; 2711our @ISA = CFPlus::UI::HBox::;
2513 2712
2514sub new { 2713sub new {
2515 my ($class, %arg) = @_; 2714 my ($class, %arg) = @_;
2516 2715
2517 my $range = delete $arg{range}; 2716 my $range = delete $arg{range};
2518 2717
2519 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
2520 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2521 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2522 to_value => sub { shift }, 2721 to_value => sub { shift },
2523 from_value => sub { shift }, 2722 from_value => sub { shift },
2524 %arg, 2723 %arg,
2525 ); 2724 );
2526 2725
… …
2546sub set_range { shift->{slider}->set_range (@_) } 2745sub set_range { shift->{slider}->set_range (@_) }
2547sub set_value { shift->{slider}->set_value (@_) } 2746sub set_value { shift->{slider}->set_value (@_) }
2548 2747
2549############################################################################# 2748#############################################################################
2550 2749
2551package CFClient::UI::TextScroller; 2750package CFPlus::UI::TextScroller;
2552 2751
2553our @ISA = CFClient::UI::HBox::; 2752our @ISA = CFPlus::UI::HBox::;
2554 2753
2555use CFClient::OpenGL; 2754use CFPlus::OpenGL;
2556 2755
2557sub new { 2756sub new {
2558 my $class = shift; 2757 my $class = shift;
2559 2758
2560 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
2561 fontsize => 1, 2760 fontsize => 1,
2562 can_events => 0, 2761 can_events => 1,
2563 indent => 0, 2762 indent => 0,
2564 #font => default_font 2763 #font => default_font
2565 @_, 2764 @_,
2566 2765
2567 layout => (new CFClient::Layout), 2766 layout => (new CFPlus::Layout),
2568 par => [], 2767 par => [],
2569 height => 0, 2768 height => 0,
2570 children => [ 2769 children => [
2571 (new CFClient::UI::Empty expand => 1), 2770 (new CFPlus::UI::Empty expand => 1),
2572 (new CFClient::UI::Slider vertical => 1), 2771 (new CFPlus::UI::Slider vertical => 1),
2573 ], 2772 ],
2574 ); 2773 );
2575 2774
2576 $self->{children}[1]->connect (changed => sub { $self->update }); 2775 $self->{children}[1]->connect (changed => sub { $self->update });
2577 2776
… …
2607 2806
2608 $self->reflow; 2807 $self->reflow;
2609 2808
2610 local $self->{children} = [$empty, $slider]; 2809 local $self->{children} = [$empty, $slider];
2611 $self->SUPER::invoke_size_allocate ($w, $h) 2810 $self->SUPER::invoke_size_allocate ($w, $h)
2811}
2812
2813sub invoke_mouse_wheel {
2814 my ($self, $ev) = @_;
2815
2816 return 0 unless $ev->{dy}; # only vertical movements
2817
2818 $self->{children}[1]->emit (mouse_wheel => $ev);
2819
2820 1
2612} 2821}
2613 2822
2614sub get_layout { 2823sub get_layout {
2615 my ($self, $para) = @_; 2824 my ($self, $para) = @_;
2616 2825
… …
2644 2853
2645 # todo: base offset on lines or so, not on pixels 2854 # todo: base offset on lines or so, not on pixels
2646 $self->{children}[1]->set_value ($offset); 2855 $self->{children}[1]->set_value ($offset);
2647} 2856}
2648 2857
2858sub current_paragraph {
2859 my ($self) = @_;
2860
2861 $self->{top_paragraph} - 1
2862}
2863
2864sub scroll_to {
2865 my ($self, $para) = @_;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868
2869 $self->{scroll_to} = $para;
2870 $self->update;
2871}
2872
2649sub clear { 2873sub clear {
2650 my ($self) = @_; 2874 my ($self) = @_;
2651 2875
2652 my (undef, undef, @other) = @{ $self->{children} }; 2876 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other; 2877 $self->remove ($_) for @other;
… …
2656 $self->{height} = 0; 2880 $self->{height} = 0;
2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2881 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2658} 2882}
2659 2883
2660sub add_paragraph { 2884sub add_paragraph {
2661 my ($self, $color, $para, $indent) = @_; 2885 my $self = shift;
2662 2886
2663 my ($text, @w) = ref $para ? @$para : $para; 2887 for my $para (@_) {
2664
2665 $para = { 2888 $para = {
2889 fg => [1, 1, 1, 1],
2890 indent => 0,
2891 markup => "",
2892 widget => [],
2893 ref $para ? %$para : (markup => $para),
2666 w => 1e10, 2894 w => 1e10,
2667 wrapped => 1, 2895 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2672 }; 2896 };
2673 2897
2674 $self->add (@w) if @w; 2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2675 push @{$self->{par}}, $para; 2899 push @{$self->{par}}, $para;
2900 }
2676 2901
2677 $self->{need_reflow}++; 2902 $self->{need_reflow}++;
2678 $self->update; 2903 $self->update;
2679} 2904}
2680 2905
2681sub scroll_to_bottom { 2906sub scroll_to_bottom {
2682 my ($self) = @_; 2907 my ($self) = @_;
2683 2908
2684 $self->{scroll_to_bottom} = 1; 2909 $self->{scroll_to} = $#{$self->{par}};
2685 $self->update; 2910 $self->update;
2686} 2911}
2687 2912
2913sub force_uptodate {
2914 my ($self) = @_;
2915
2916 if (delete $self->{need_reflow}) {
2917 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2918
2919 my $height = 0;
2920
2921 for my $para (@{$self->{par}}) {
2922 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2923 my $layout = $self->get_layout ($para);
2924 my ($w, $h) = $layout->size;
2925
2926 $para->{w} = $w + $para->{indent};
2927 $para->{h} = $h;
2928 $para->{wrapped} = $layout->has_wrapped;
2929 }
2930
2931 $para->{y} = $height;
2932 $height += $para->{h};
2933 }
2934
2935 $self->{height} = $height;
2936 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2937
2938 delete $self->{texture};
2939 }
2940
2941 if (my $paridx = delete $self->{scroll_to}) {
2942 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2943 }
2944}
2945
2688sub update { 2946sub update {
2689 my ($self) = @_; 2947 my ($self) = @_;
2690 2948
2691 $self->SUPER::update; 2949 $self->SUPER::update;
2692 2950
2693 return unless $self->{h} > 0; 2951 return unless $self->{h} > 0;
2694 2952
2695 delete $self->{texture}; 2953 delete $self->{texture};
2696 2954
2697 $ROOT->on_post_alloc ($self => sub { 2955 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate;
2957
2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2699 2959
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 { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2728 glClearColor 0, 0, 0, 0; 2961 glClearColor 0, 0, 0, 0;
2729 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2730 2963
2964 package CFPlus::UI::Base;
2965 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2966 (0, 0, $self->{w}, $self->{h});
2967
2968 my $top = int $self->{children}[1]{range}[0];
2969
2970 my $paridx = 0;
2971 my $top_paragraph;
2731 my $top = int $self->{children}[1]{range}[0]; 2972 my $top = int $self->{children}[1]{range}[0];
2732 2973
2733 my $y0 = $top; 2974 my $y0 = $top;
2734 my $y1 = $top + $H; 2975 my $y1 = $top + $H;
2735 2976
2736 my $y = 0;
2737
2738 for my $para (@{$self->{par}}) { 2977 for my $para (@{$self->{par}}) {
2739 my $h = $para->{h}; 2978 my $h = $para->{h};
2979 my $y = $para->{y};
2740 2980
2741 if ($y0 < $y + $h && $y < $y1) { 2981 if ($y0 < $y + $h && $y < $y1) {
2742
2743 my $layout = $self->get_layout ($para); 2982 my $layout = $self->get_layout ($para);
2744 2983
2745 $layout->render ($para->{indent}, $y - $y0); 2984 $layout->render ($para->{indent}, $y - $y0);
2746 2985
2747 if (my @w = @{ $para->{widget} }) { 2986 if (my @w = @{ $para->{widget} }) {
… …
2756 $_->draw; 2995 $_->draw;
2757 } 2996 }
2758 } 2997 }
2759 } 2998 }
2760 2999
2761 $y += $h; 3000 $paridx++;
3001 $top_paragraph ||= $paridx if $y >= $top;
2762 } 3002 }
3003
3004 $self->{top_paragraph} = $top_paragraph;
2763 }; 3005 };
2764 }); 3006 });
2765} 3007}
2766 3008
2767sub reconfigure { 3009sub reconfigure {
… …
2785 $self->{children}[1]->draw; 3027 $self->{children}[1]->draw;
2786} 3028}
2787 3029
2788############################################################################# 3030#############################################################################
2789 3031
2790package CFClient::UI::Animator; 3032package CFPlus::UI::Animator;
2791 3033
2792use CFClient::OpenGL; 3034use CFPlus::OpenGL;
2793 3035
2794our @ISA = CFClient::UI::Bin::; 3036our @ISA = CFPlus::UI::Bin::;
2795 3037
2796sub moveto { 3038sub moveto {
2797 my ($self, $x, $y) = @_; 3039 my ($self, $x, $y) = @_;
2798 3040
2799 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3041 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2827 glPopMatrix; 3069 glPopMatrix;
2828} 3070}
2829 3071
2830############################################################################# 3072#############################################################################
2831 3073
2832package CFClient::UI::Flopper; 3074package CFPlus::UI::Flopper;
2833 3075
2834our @ISA = CFClient::UI::Button::; 3076our @ISA = CFPlus::UI::Button::;
2835 3077
2836sub new { 3078sub new {
2837 my $class = shift; 3079 my $class = shift;
2838 3080
2839 my $self = $class->SUPER::new ( 3081 my $self = $class->SUPER::new (
… …
2851 $self->{other}->toggle_visibility; 3093 $self->{other}->toggle_visibility;
2852} 3094}
2853 3095
2854############################################################################# 3096#############################################################################
2855 3097
2856package CFClient::UI::Tooltip; 3098package CFPlus::UI::Tooltip;
2857 3099
2858our @ISA = CFClient::UI::Bin::; 3100our @ISA = CFPlus::UI::Bin::;
2859 3101
2860use CFClient::OpenGL; 3102use CFPlus::OpenGL;
2861 3103
2862sub new { 3104sub new {
2863 my $class = shift; 3105 my $class = shift;
2864 3106
2865 $class->SUPER::new ( 3107 $class->SUPER::new (
… …
2868 ) 3110 )
2869} 3111}
2870 3112
2871sub set_tooltip_from { 3113sub set_tooltip_from {
2872 my ($self, $widget) = @_; 3114 my ($self, $widget) = @_;
3115
3116 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3117 if $widget->{tooltip} =~ /^#(.*)$/;
2873 3118
2874 my $tooltip = $widget->{tooltip}; 3119 my $tooltip = $widget->{tooltip};
2875 3120
2876 if ($ENV{CFPLUS_DEBUG} & 2) { 3121 if ($ENV{CFPLUS_DEBUG} & 2) {
2877 $tooltip .= "\n\n" . (ref $widget) . "\n" 3122 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2881 } 3126 }
2882 3127
2883 $tooltip =~ s/^\n+//; 3128 $tooltip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//; 3129 $tooltip =~ s/\n+$//;
2885 3130
2886 $self->add (new CFClient::UI::Label 3131 $self->add (new CFPlus::UI::Label
2887 markup => $tooltip, 3132 markup => $tooltip,
2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3133 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2889 fontsize => 0.8, 3134 fontsize => 0.8,
2890 fg => [0, 0, 0, 1], 3135 style => 1, # FLAG_INVERSE
2891 ellipsise => 0, 3136 ellipsise => 0,
2892 font => ($widget->{tooltip_font} || $::FONT_PROP), 3137 font => ($widget->{tooltip_font} || $::FONT_PROP),
2893 ); 3138 );
2894} 3139}
2895 3140
… …
2914 3159
2915 $self->{root}->on_post_alloc ("move_$self" => sub { 3160 $self->{root}->on_post_alloc ("move_$self" => sub {
2916 my $widget = $self->{owner} 3161 my $widget = $self->{owner}
2917 or return; 3162 or return;
2918 3163
3164 if ($widget->{visible}) {
2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3165 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920 3166
2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3167 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922 if $x + $self->{w} > $self->{root}{w}; 3168 if $x + $self->{w} > $self->{root}{w};
2923 3169
2924 $self->move_abs ($x, $y); 3170 $self->move_abs ($x, $y);
3171 } else {
3172 $self->hide;
3173 }
2925 }); 3174 });
2926} 3175}
2927 3176
2928sub _draw { 3177sub _draw {
2929 my ($self) = @_; 3178 my ($self) = @_;
… …
2953 $self->SUPER::_draw; 3202 $self->SUPER::_draw;
2954} 3203}
2955 3204
2956############################################################################# 3205#############################################################################
2957 3206
2958package CFClient::UI::Face; 3207package CFPlus::UI::Face;
2959 3208
2960our @ISA = CFClient::UI::Base::; 3209our @ISA = CFPlus::UI::DrawBG::;
2961 3210
2962use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2963 3212
2964sub new { 3213sub new {
2965 my $class = shift; 3214 my $class = shift;
2966 3215
2967 my $self = $class->SUPER::new ( 3216 my $self = $class->SUPER::new (
… …
3002sub _draw { 3251sub _draw {
3003 my ($self) = @_; 3252 my ($self) = @_;
3004 3253
3005 return unless $::CONN; 3254 return unless $::CONN;
3006 3255
3256 $self->SUPER::_draw;
3257
3007 my $face; 3258 my $face;
3008 3259
3009 if ($self->{frame}) { 3260 if ($self->{frame}) {
3010 my $anim = $::CONN->{anim}[$self->{anim}]; 3261 my $anim = $::CONN->{anim}[$self->{anim}];
3011 3262
… …
3033 $self->SUPER::destroy; 3284 $self->SUPER::destroy;
3034} 3285}
3035 3286
3036############################################################################# 3287#############################################################################
3037 3288
3038package CFClient::UI::Buttonbar; 3289package CFPlus::UI::Buttonbar;
3039 3290
3040our @ISA = CFClient::UI::HBox::; 3291our @ISA = CFPlus::UI::HBox::;
3041 3292
3042# TODO: should actualyl wrap buttons and other goodies. 3293# TODO: should actually wrap buttons and other goodies.
3043 3294
3044############################################################################# 3295#############################################################################
3045 3296
3046package CFClient::UI::Menu; 3297package CFPlus::UI::Menu;
3047 3298
3048our @ISA = CFClient::UI::FancyFrame::; 3299our @ISA = CFPlus::UI::Toplevel::;
3049 3300
3050use CFClient::OpenGL; 3301use CFPlus::OpenGL;
3051 3302
3052sub new { 3303sub new {
3053 my $class = shift; 3304 my $class = shift;
3054 3305
3055 my $self = $class->SUPER::new ( 3306 my $self = $class->SUPER::new (
3056 items => [], 3307 items => [],
3057 z => 100, 3308 z => 100,
3058 @_, 3309 @_,
3059 ); 3310 );
3060 3311
3061 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3312 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3062 3313
3063 for my $item (@{ $self->{items} }) { 3314 for my $item (@{ $self->{items} }) {
3064 my ($widget, $cb, $tooltip) = @$item; 3315 my ($widget, $cb, $tooltip) = @$item;
3065 3316
3066 # handle various types of items, only text for now 3317 # handle various types of items, only text for now
3067 if (!ref $widget) { 3318 if (!ref $widget) {
3068 if ($widget =~ /\t/) { 3319 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2; 3320 my ($left, $right) = split /\t/, $widget, 2;
3070 3321
3071 $widget = new CFClient::UI::HBox 3322 $widget = new CFPlus::UI::HBox
3072 can_hover => 1, 3323 can_hover => 1,
3073 can_events => 1, 3324 can_events => 1,
3074 tooltip => $tooltip, 3325 tooltip => $tooltip,
3075 children => [ 3326 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1), 3327 (new CFPlus::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1), 3328 (new CFPlus::UI::Label markup => $right, align => +1),
3078 ], 3329 ],
3079 ; 3330 ;
3080 3331
3081 } else { 3332 } else {
3082 $widget = new CFClient::UI::Label 3333 $widget = new CFPlus::UI::Label
3083 can_hover => 1, 3334 can_hover => 1,
3084 can_events => 1, 3335 can_events => 1,
3085 markup => $widget, 3336 markup => $widget,
3086 tooltip => $tooltip; 3337 tooltip => $tooltip;
3087 } 3338 }
… …
3135 1 3386 1
3136} 3387}
3137 3388
3138############################################################################# 3389#############################################################################
3139 3390
3140package CFClient::UI::Multiplexer; 3391package CFPlus::UI::Multiplexer;
3141 3392
3142our @ISA = CFClient::UI::Container::; 3393our @ISA = CFPlus::UI::Container::;
3143 3394
3144sub new { 3395sub new {
3145 my $class = shift; 3396 my $class = shift;
3146 3397
3147 my $self = $class->SUPER::new ( 3398 my $self = $class->SUPER::new (
… …
3208 $self->{current}->draw; 3459 $self->{current}->draw;
3209} 3460}
3210 3461
3211############################################################################# 3462#############################################################################
3212 3463
3213package CFClient::UI::Notebook; 3464package CFPlus::UI::Notebook;
3214 3465
3215our @ISA = CFClient::UI::VBox::; 3466our @ISA = CFPlus::UI::VBox::;
3216 3467
3217sub new { 3468sub new {
3218 my $class = shift; 3469 my $class = shift;
3219 3470
3220 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3221 buttonbar => (new CFClient::UI::Buttonbar), 3472 buttonbar => (new CFPlus::UI::Buttonbar),
3222 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3473 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3223 # filter => # will be put between multiplexer and $self 3474 # filter => # will be put between multiplexer and $self
3224 @_, 3475 @_,
3225 ); 3476 );
3226 3477
3227 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3478 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3233sub add { 3484sub add {
3234 my ($self, $title, $widget, $tooltip) = @_; 3485 my ($self, $title, $widget, $tooltip) = @_;
3235 3486
3236 Scalar::Util::weaken $self; 3487 Scalar::Util::weaken $self;
3237 3488
3238 $self->{buttonbar}->add (new CFClient::UI::Button 3489 $self->{buttonbar}->add (new CFPlus::UI::Button
3239 markup => $title, 3490 markup => $title,
3240 tooltip => $tooltip, 3491 tooltip => $tooltip,
3241 on_activate => sub { $self->set_current_page ($widget) }, 3492 on_activate => sub { $self->set_current_page ($widget) },
3242 ); 3493 );
3243 3494
… …
3257 $self->emit (page_changed => $self->{multiplexer}{current}); 3508 $self->emit (page_changed => $self->{multiplexer}{current});
3258} 3509}
3259 3510
3260############################################################################# 3511#############################################################################
3261 3512
3262package CFClient::UI::Combobox; 3513package CFPlus::UI::Selector;
3263 3514
3264use utf8; 3515use utf8;
3265 3516
3266our @ISA = CFClient::UI::Button::; 3517our @ISA = CFPlus::UI::Button::;
3267 3518
3268sub new { 3519sub new {
3269 my $class = shift; 3520 my $class = shift;
3270 3521
3271 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
3288 my ($value, $title, $tooltip) = @$_; 3539 my ($value, $title, $tooltip) = @$_;
3289 3540
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3541 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 } 3542 }
3292 3543
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3544 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294} 3545}
3295 3546
3296sub _set_value { 3547sub _set_value {
3297 my ($self, $value) = @_; 3548 my ($self, $value) = @_;
3298 3549
… …
3313 $self->emit (changed => $value); 3564 $self->emit (changed => $value);
3314} 3565}
3315 3566
3316############################################################################# 3567#############################################################################
3317 3568
3318package CFClient::UI::Statusbox; 3569package CFPlus::UI::Statusbox;
3319 3570
3320our @ISA = CFClient::UI::VBox::; 3571our @ISA = CFPlus::UI::VBox::;
3321 3572
3322sub new { 3573sub new {
3323 my $class = shift; 3574 my $class = shift;
3324 3575
3325 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
… …
3337sub reorder { 3588sub reorder {
3338 my ($self) = @_; 3589 my ($self) = @_;
3339 my $NOW = Time::HiRes::time; 3590 my $NOW = Time::HiRes::time;
3340 3591
3341 # freeze display when hovering over any label 3592 # freeze display when hovering over any label
3342 return if $CFClient::UI::TOOLTIP->{owner} 3593 return if $CFPlus::UI::TOOLTIP->{owner}
3343 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3594 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3344 values %{ $self->{item} }; 3595 values %{ $self->{item} };
3345 3596
3346 while (my ($k, $v) = each %{ $self->{item} }) { 3597 while (my ($k, $v) = each %{ $self->{item} }) {
3347 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3598 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3348 } 3599 }
… …
3369 for ($short) { 3620 for ($short) {
3370 s/^\s+//; 3621 s/^\s+//;
3371 s/\s+/ /g; 3622 s/\s+/ /g;
3372 } 3623 }
3373 3624
3374 new CFClient::UI::Label 3625 new CFPlus::UI::Label
3375 markup => $short, 3626 markup => $short,
3376 tooltip => $item->{tooltip}, 3627 tooltip => $item->{tooltip},
3377 tooltip_font => $::FONT_PROP, 3628 tooltip_font => $::FONT_PROP,
3378 tooltip_width => 0.67, 3629 tooltip_width => 0.67,
3379 fontsize => $item->{fontsize} || $self->{fontsize}, 3630 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3458 $self->SUPER::destroy; 3709 $self->SUPER::destroy;
3459} 3710}
3460 3711
3461############################################################################# 3712#############################################################################
3462 3713
3463package CFClient::UI::Inventory; 3714package CFPlus::UI::Inventory;
3464 3715
3465our @ISA = CFClient::UI::Table::; 3716our @ISA = CFPlus::UI::Table::;
3466 3717
3467sub new { 3718sub new {
3468 my $class = shift; 3719 my $class = shift;
3469 3720
3470 my $self = $class->SUPER::new ( 3721 my $self = $class->SUPER::new (
3471 col_expand => [0, 1, 0], 3722 col_expand => [0, 1, 0],
3723 items => [],
3472 @_, 3724 @_,
3473 ); 3725 );
3474 3726
3727 $self->set_sort_order (undef);
3728
3475 $self 3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3476} 3765}
3477 3766
3478sub set_items { 3767sub set_items {
3479 my ($self, $items) = @_; 3768 my ($self, $items) = @_;
3480 3769
3481 $self->clear; 3770 $self->{items} = [$items ? values %$items : ()];
3482 return unless $items; 3771 $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} 3772}
3502 3773
3503############################################################################# 3774#############################################################################
3504 3775
3505package CFClient::UI::SpellList; 3776package CFPlus::UI::SpellList;
3506 3777
3507our @ISA = CFClient::UI::Table::; 3778our @ISA = CFPlus::UI::Table::;
3508 3779
3509sub new { 3780sub new {
3510 my $class = shift; 3781 my $class = shift;
3511 3782
3512 my $self = $class->SUPER::new ( 3783 my $self = $class->SUPER::new (
… …
3530 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3531 3802
3532sub rebuild_spell_list { 3803sub rebuild_spell_list {
3533 my ($self) = @_; 3804 my ($self) = @_;
3534 3805
3535 $CFClient::UI::ROOT->on_refresh ($self => sub { 3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3536 $self->clear; 3807 $self->clear;
3537 3808
3538 return unless $::CONN; 3809 return unless $::CONN;
3539 3810
3540 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3811 $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); 3812 $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); 3813 $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); 3814 $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); 3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545 3816
3546 my $row = 0; 3817 my $row = 0;
3547 3818
3548 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549 my $spell = $self->{spell}{$_}; 3820 my $spell = $self->{spell}{$_};
… …
3556 if ($ev->{button} == 1) { 3827 if ($ev->{button} == 1) {
3557 $::CONN->user_send ("cast $spell->{name}"); 3828 $::CONN->user_send ("cast $spell->{name}");
3558 } elsif ($ev->{button} == 2) { 3829 } elsif ($ev->{button} == 2) {
3559 $::CONN->user_send ("invoke $spell->{name}"); 3830 $::CONN->user_send ("invoke $spell->{name}");
3560 } elsif ($ev->{button} == 3) { 3831 } elsif ($ev->{button} == 3) {
3832 my $shortname = CFPlus::shorten $spell->{name}, 14;
3561 (new CFClient::UI::Menu 3833 (new CFPlus::UI::Menu
3562 items => [ 3834 items => [
3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3835 ["bind <i>cast $shortname</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}"]) }], 3836 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565 ], 3837 ],
3566 )->popup ($ev); 3838 )->popup ($ev);
3567 } else { 3839 } else {
3568 return 0; 3840 return 0;
3569 } 3841 }
3570 3842
3571 1 3843 1
3572 }; 3844 };
3573 3845
3574 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3846 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3575 3847
3576 #TODO: add path info to tooltip 3848 #TODO: add path info to tooltip
3577 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3849 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3578 3850
3579 $self->add (0, $row, new CFClient::UI::Face 3851 $self->add (0, $row, new CFPlus::UI::Face
3580 face => $spell->{face}, 3852 face => $spell->{face},
3581 can_hover => 1, 3853 can_hover => 1,
3582 can_events => 1, 3854 can_events => 1,
3583 tooltip => $tooltip, 3855 tooltip => $tooltip,
3584 on_button_down => $spell_cb, 3856 on_button_down => $spell_cb,
3585 ); 3857 );
3586 3858
3587 $self->add (1, $row, new CFClient::UI::Label 3859 $self->add (1, $row, new CFPlus::UI::Label
3588 expand => 1, 3860 expand => 1,
3589 text => $spell->{name}, 3861 text => $spell->{name},
3590 can_hover => 1, 3862 can_hover => 1,
3591 can_events => 1, 3863 can_events => 1,
3592 tooltip => $tooltip, 3864 tooltip => $tooltip,
3593 on_button_down => $spell_cb, 3865 on_button_down => $spell_cb,
3594 ); 3866 );
3595 3867
3596 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3868 $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); 3869 $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); 3870 $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); 3871 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600 } 3872 }
3601 }); 3873 });
3602} 3874}
3603 3875
3604sub add_spell { 3876sub add_spell {
… …
3622 $self->rebuild_spell_list; 3894 $self->rebuild_spell_list;
3623} 3895}
3624 3896
3625############################################################################# 3897#############################################################################
3626 3898
3627package CFClient::UI::Root; 3899package CFPlus::UI::Root;
3628 3900
3629our @ISA = CFClient::UI::Container::; 3901our @ISA = CFPlus::UI::Container::;
3630 3902
3631use List::Util qw(min max); 3903use List::Util qw(min max);
3632 3904
3633use CFClient::OpenGL; 3905use CFPlus::OpenGL;
3634 3906
3635sub new { 3907sub new {
3636 my $class = shift; 3908 my $class = shift;
3637 3909
3638 my $self = $class->SUPER::new ( 3910 my $self = $class->SUPER::new (
… …
3814 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4086 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3815 4087
3816 $w = 0 if $w < 0; 4088 $w = 0 if $w < 0;
3817 $h = 0 if $h < 0; 4089 $h = 0 if $h < 0;
3818 4090
4091 $w = max $widget->{min_w}, $w;
4092 $h = max $widget->{min_h}, $h;
4093
4094# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4095# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4096
4097 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4098 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4099
3819 $w = int $w + 0.5; 4100 $w = int $w + 0.5;
3820 $h = int $h + 0.5; 4101 $h = int $h + 0.5;
3821 4102
3822 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4103 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823 $widget->{old_w} = $widget->{w}; 4104 $widget->{old_w} = $widget->{w};
… …
3846 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4127 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3847 glMatrixMode GL_MODELVIEW; 4128 glMatrixMode GL_MODELVIEW;
3848 glLoadIdentity; 4129 glLoadIdentity;
3849 4130
3850 { 4131 {
3851 package CFClient::UI::Base; 4132 package CFPlus::UI::Base;
3852 4133
3853 ($draw_x, $draw_y, $draw_w, $draw_h) = 4134 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3854 (0, 0, $self->{w}, $self->{h}); 4135 (0, 0, $self->{w}, $self->{h});
3855 }
3856 4136
3857 $self->_draw; 4137 $self->_draw;
4138 }
3858} 4139}
3859 4140
3860############################################################################# 4141#############################################################################
3861 4142
3862package CFClient::UI; 4143package CFPlus::UI;
3863 4144
3864$ROOT = new CFClient::UI::Root; 4145$ROOT = new CFPlus::UI::Root;
3865$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4146$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3866 4147
38671 41481
3868 4149

Diff Legend

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