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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.350 by root, Sat Aug 19 18:39:24 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) = @_;
443
444 Carp::confess unless $self->{parent};#d#
418 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 {
… …
456 483
457sub invoke_mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 0 } 485sub invoke_button_up { 0 }
459sub invoke_key_down { 0 } 486sub invoke_key_down { 0 }
460sub invoke_key_up { 0 } 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;
… …
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 dislike duplication
520 # and needlessly verbose code, too.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480 527
481 #d##TODO# stop propagating at first true, do not use sum 528 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
485} 532}
486 533
487sub find_widget { 534sub find_widget {
488 my ($self, $x, $y) = @_; 535 my ($self, $x, $y) = @_;
489 536
… …
573 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
576 glEnd; 623 glEnd;
577 glPopMatrix; 624 glPopMatrix;
578 #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;
579 } 626 }
580 627
581 $self->_draw; 628 $self->_draw;
582 glPopMatrix; 629 glPopMatrix;
583} 630}
… …
589} 636}
590 637
591sub DESTROY { 638sub DESTROY {
592 my ($self) = @_; 639 my ($self) = @_;
593 640
594 return if CFClient::in_destruct; 641 return if CFPlus::in_destruct;
595 642
596 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
597 644
598 eval { $self->destroy }; 645 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
600} 647}
601 648
602############################################################################# 649#############################################################################
603 650
604package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
605 652
606our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
607 654
608use strict; 655use strict;
609use CFClient::OpenGL; 656use CFPlus::OpenGL;
610 657
611sub new { 658sub new {
612 my $class = shift; 659 my $class = shift;
613 660
614 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
645 } 692 }
646} 693}
647 694
648############################################################################# 695#############################################################################
649 696
650package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
651 698
652our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
653 700
654sub new { 701sub new {
655 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
656 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
657} 704}
… …
664 711
665sub draw { } 712sub draw { }
666 713
667############################################################################# 714#############################################################################
668 715
669package CFClient::UI::Container; 716package CFPlus::UI::Container;
670 717
671our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
672 719
673sub new { 720sub new {
674 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
675 722
676 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
685 if $children; 732 if $children;
686 733
687 $self 734 $self
688} 735}
689 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
690sub add { 745sub add {
691 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
692 747
693 $_->set_parent ($self) 748 $_->set_parent ($self)
694 for @widgets; 749 for @widgets;
… …
754 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
755} 810}
756 811
757############################################################################# 812#############################################################################
758 813
759package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
760 815
761our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
762 817
763sub new { 818sub new {
764 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
765 820
766 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767 822
768 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
769} 824}
770 825
771sub add { 826sub add {
… …
778sub remove { 833sub remove {
779 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
780 835
781 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
782 837
783 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 839 unless @{$self->{children}};
785} 840}
786 841
787sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
788 843
… …
800 855
801############################################################################# 856#############################################################################
802 857
803# back-buffered drawing area 858# back-buffered drawing area
804 859
805package CFClient::UI::Window; 860package CFPlus::UI::Window;
806 861
807our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
808 863
809use CFClient::OpenGL; 864use CFPlus::OpenGL;
810 865
811sub new { 866sub new {
812 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
813 868
814 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
836} 891}
837 892
838sub render_child { 893sub render_child {
839 my ($self) = @_; 894 my ($self) = @_;
840 895
841 $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 {
842 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
843 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
844 899
845 { 900 {
846 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
847 902
848 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 ($draw_x, $draw_y, $draw_w, $draw_h) =
849 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
850 } 905 }
851 906
… …
854} 909}
855 910
856sub _draw { 911sub _draw {
857 my ($self) = @_; 912 my ($self) = @_;
858 913
859 my ($w, $h) = @$self{qw(w h)};
860
861 my $tex = $self->{texture} 914 my $tex = $self->{texture}
862 or return; 915 or return;
863 916
864 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
867 920
868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
869 922
870 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
871} 924}
872 925
873############################################################################# 926#############################################################################
874 927
875package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
876 929
877our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
878 931
879sub new { 932sub new {
880 my $class = shift; 933 my $class = shift;
881 934
882 $class->SUPER::new ( 935 $class->SUPER::new (
… …
942 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
944 ) { 997 ) {
945 $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})
946 } else { 999 } else {
947 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
948 } 1001 }
949} 1002}
950 1003
951sub _render { 1004sub _render {
952 my ($self) = @_; 1005 my ($self) = @_;
953 1006
954 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};
955 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};
956 1009
957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958 1011
959 $self->SUPER::_render; 1012 $self->SUPER::_render;
960} 1013}
961 1014
962############################################################################# 1015#############################################################################
963 1016
964package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
965 1018
966our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
967 1020
968sub new { 1021sub new {
969 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
970 1023
971 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
972 1025
973 my $self; 1026 my $self;
974 1027
975 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
976 vertical => 1, 1029 vertical => 1,
977 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
978 on_changed => sub { 1031 on_changed => sub {
979 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
980 }, 1033 },
981 ; 1034 ;
982 1035
983 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
984 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
985 slider => $slider, 1039 slider => $slider,
986 %arg, 1040 %arg,
987 ); 1041 );
988 1042
989 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
990 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
… …
998 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
999 1053
1000 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
1001} 1055}
1002 1056
1003sub invoke_button_up { 1057sub invoke_mouse_wheel {
1004 my ($self, $ev) = @_; 1058 my ($self, $ev) = @_;
1005 1059
1006 warn "button up $ev->{button}\n";#d# 1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1007 1064 1
1008 0
1009} 1065}
1010 1066
1011sub update_slider { 1067sub update_slider {
1012 my ($self) = @_; 1068 my ($self) = @_;
1013 1069
… …
1030 $self->SUPER::invoke_size_allocate ($w, $h) 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1031} 1087}
1032 1088
1033############################################################################# 1089#############################################################################
1034 1090
1035package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1036 1092
1037our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1038 1094
1039use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1040 1096
1041sub new { 1097sub new {
1042 my $class = shift; 1098 my $class = shift;
1043 1099
1044 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1070 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1071} 1127}
1072 1128
1073############################################################################# 1129#############################################################################
1074 1130
1075package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1076 1132
1077our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1078 1134
1079use 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;
1080 1236
1081my $bg = 1237my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083 mipmap => 1, wrap => 1; 1239 mipmap => 1, wrap => 1;
1084 1240
1085my @border = 1241my @border =
1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087 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);
1088 1244
1089sub new { 1245sub new {
1090 my ($class, %arg) = @_; 1246 my ($class, %arg) = @_;
1091 1247
… …
1097 min_w => 64, 1253 min_w => 64,
1098 min_h => 32, 1254 min_h => 32,
1099 %arg, 1255 %arg,
1100 ); 1256 );
1101 1257
1102 $self->{title_widget} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1103 align => 0, 1259 align => 0,
1104 valign => 1, 1260 valign => 1,
1105 text => $self->{title}, 1261 text => $self->{title},
1106 fontsize => $self->{border}, 1262 fontsize => $self->{border},
1107 if exists $self->{title}; 1263 if exists $self->{title};
1108 1264
1109 if ($self->{has_close_button}) { 1265 if ($self->{has_close_button}) {
1110 $self->{close_button} = 1266 $self->{close_button} =
1111 new CFClient::UI::ImageButton 1267 new CFPlus::UI::ImageButton
1112 path => 'x1_close.png', 1268 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") }; 1269 on_activate => sub { $self->emit ("delete") };
1114 1270
1115 $self->CFClient::UI::Container::add ($self->{close_button}); 1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1116 } 1272 }
1117 1273
1118 $self 1274 $self
1119} 1275}
1120 1276
1121sub add { 1277sub add {
1122 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1123 1279
1124 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1125 $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};
1126 $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};
1127} 1283}
1128 1284
1129sub border { 1285sub border {
1130 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1131} 1287}
… …
1239 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240 1396
1241 ! ! $self->{motion} 1397 ! ! $self->{motion}
1242} 1398}
1243 1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1406}
1407
1244sub _draw { 1408sub _draw {
1245 my ($self) = @_; 1409 my ($self) = @_;
1246 1410
1247 my $child = $self->{children}[0]; 1411 my $child = $self->{children}[0];
1248 1412
… …
1285 if $self->{close_button}; 1449 if $self->{close_button};
1286} 1450}
1287 1451
1288############################################################################# 1452#############################################################################
1289 1453
1290package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1291 1455
1292our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1293 1457
1294use List::Util qw(max sum); 1458use List::Util qw(max sum);
1295 1459
1296use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1297 1461
1298sub new { 1462sub new {
1299 my $class = shift; 1463 my $class = shift;
1300 1464
1301 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1307sub children { 1471sub children {
1308 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309} 1473}
1310 1474
1311sub add { 1475sub add {
1312 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1313 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1314 $child->set_parent ($self); 1480 $child->set_parent ($self);
1315 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1316 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1317 $self->realloc; 1486 $self->realloc;
1318} 1487}
1319 1488
1320sub remove { 1489sub remove {
1321 my ($self, $child) = @_; 1490 my ($self, $child) = @_;
… …
1386 1555
1387 # linearly scale sizes 1556 # linearly scale sizes
1388 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390 1559
1391 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1392 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1393 1562
1394 my $y; 1563 my $y;
1395 1564
1396 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1397 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1440 } 1609 }
1441} 1610}
1442 1611
1443############################################################################# 1612#############################################################################
1444 1613
1445package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1446 1615
1447our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1448 1617
1449sub size_request { 1618sub size_request {
1450 my ($self) = @_; 1619 my ($self) = @_;
1451 1620
1452 $self->{vertical} 1621 $self->{vertical}
… …
1485 $req[$_] += $space * $children[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1486 for 0 .. $#children; 1655 for 0 .. $#children;
1487 } 1656 }
1488 } 1657 }
1489 1658
1490 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1491 1660
1492 my $pos = 0; 1661 my $pos = 0;
1493 for (0 .. $#children) { 1662 for (0 .. $#children) {
1494 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1495 $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));
… …
1500 1 1669 1
1501} 1670}
1502 1671
1503############################################################################# 1672#############################################################################
1504 1673
1505package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1506 1675
1507our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1508 1677
1509sub new { 1678sub new {
1510 my $class = shift; 1679 my $class = shift;
1511 1680
1512 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1515 ) 1684 )
1516} 1685}
1517 1686
1518############################################################################# 1687#############################################################################
1519 1688
1520package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1521 1690
1522our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1523 1692
1524sub new { 1693sub new {
1525 my $class = shift; 1694 my $class = shift;
1526 1695
1527 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1530 ) 1699 )
1531} 1700}
1532 1701
1533############################################################################# 1702#############################################################################
1534 1703
1535package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1536 1705
1537our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1538 1707
1539use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1540 1709
1541sub new { 1710sub new {
1542 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1543 1712
1544 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1547 #active_bg => none 1716 #active_bg => none
1548 #font => default_font 1717 #font => default_font
1549 #text => initial text 1718 #text => initial text
1550 #markup => initial narkup 1719 #markup => initial narkup
1551 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1552 ellipsise => 3, # end 1722 ellipsise => 3, # end
1553 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1554 fontsize => 1, 1724 fontsize => 1,
1555 align => -1, 1725 align => -1,
1556 valign => -1, 1726 valign => -1,
1557 padding_x => 2, 1727 padding_x => 2,
1558 padding_y => 2, 1728 padding_y => 2,
1559 can_events => 0, 1729 can_events => 0,
1560 %arg 1730 %arg
1561 ); 1731 );
1562 1732
1563 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1564 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1565 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1566 $self->{template} = $layout; 1736 $self->{template} = $layout;
1567 } 1737 }
1568 1738
1569 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1571 } else { 1741 } else {
1572 $self->set_text (delete $self->{text}); 1742 $self->set_text (delete $self->{text});
1573 } 1743 }
1574 1744
1575 $self 1745 $self
1576}
1577
1578sub escape($) {
1579 local $_ = $_[0];
1580
1581 s/&/&amp;/g;
1582 s/>/&gt;/g;
1583 s/</&lt;/g;
1584
1585 $_
1586} 1746}
1587 1747
1588sub update { 1748sub update {
1589 my ($self) = @_; 1749 my ($self) = @_;
1590 1750
… …
1717 }; 1877 };
1718 1878
1719 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1720 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1721 1881
1722 $self->{layout}->render ($self->{ox}, $self->{oy}); 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723} 1883}
1724 1884
1725############################################################################# 1885#############################################################################
1726 1886
1727package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1728 1888
1729our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1730 1890
1731use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1732 1892
1733sub new { 1893sub new {
1734 my $class = shift; 1894 my $class = shift;
1735 1895
1736 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1798 1958
1799 if ($uni == 8) { 1959 if ($uni == 8) {
1800 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1802 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1803 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1804 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1805 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1806 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1807 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1808 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1809 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1810 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 $self->{cursor} = 0;
1811 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1812 $self->emit ('escape'); 1975 $self->emit ('escape');
1813 } elsif ($uni) { 1976 } elsif ($uni) {
1814 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else { 1978 } else {
… …
1888 utf8::encode $text; 2051 utf8::encode $text;
1889 2052
1890 @$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)
1891 } 2054 }
1892 2055
1893 glColor @{$self->{fg}};
1894 glBegin GL_LINES; 2056 glBegin GL_LINES;
1895 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};
1896 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};
1897 glEnd; 2059 glEnd;
1898 } 2060 }
1899} 2061}
1900 2062
1901package CFClient::UI::Entry; 2063package CFPlus::UI::Entry;
1902 2064
1903our @ISA = CFClient::UI::EntryBase::; 2065our @ISA = CFPlus::UI::EntryBase::;
1904 2066
1905use CFClient::OpenGL; 2067use CFPlus::OpenGL;
1906 2068
1907sub invoke_key_down { 2069sub invoke_key_down {
1908 my ($self, $ev) = @_; 2070 my ($self, $ev) = @_;
1909 2071
1910 my $sym = $ev->{sym}; 2072 my $sym = $ev->{sym};
… …
1916 $self->{history_pointer} = -1; 2078 $self->{history_pointer} = -1;
1917 $self->{history_saveback} = ''; 2079 $self->{history_saveback} = '';
1918 $self->emit (activate => $txt); 2080 $self->emit (activate => $txt);
1919 $self->update; 2081 $self->update;
1920 2082
1921 } elsif ($sym == CFClient::SDLK_UP) { 2083 } elsif ($sym == CFPlus::SDLK_UP) {
1922 if ($self->{history_pointer} < 0) { 2084 if ($self->{history_pointer} < 0) {
1923 $self->{history_saveback} = $self->get_text; 2085 $self->{history_saveback} = $self->get_text;
1924 } 2086 }
1925 if (@{$self->{history} || []} > 0) { 2087 if (@{$self->{history} || []} > 0) {
1926 $self->{history_pointer}++; 2088 $self->{history_pointer}++;
… …
1928 $self->{history_pointer} = @{$self->{history} || []} - 1; 2090 $self->{history_pointer} = @{$self->{history} || []} - 1;
1929 } 2091 }
1930 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2092 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1931 } 2093 }
1932 2094
1933 } elsif ($sym == CFClient::SDLK_DOWN) { 2095 } elsif ($sym == CFPlus::SDLK_DOWN) {
1934 $self->{history_pointer}--; 2096 $self->{history_pointer}--;
1935 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936 2098
1937 if ($self->{history_pointer} >= 0) { 2099 if ($self->{history_pointer} >= 0) {
1938 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2100 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1947 1 2109 1
1948} 2110}
1949 2111
1950############################################################################# 2112#############################################################################
1951 2113
1952package CFClient::UI::Button; 2114package CFPlus::UI::Button;
1953 2115
1954our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1955 2117
1956use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1957 2119
1958my @tex = 2120my @tex =
1959 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960 qw(b1_button_active.png); 2122 qw(b1_button_active.png);
1961 2123
1962sub new { 2124sub new {
1963 my $class = shift; 2125 my $class = shift;
1964 2126
… …
2001 $self->SUPER::_draw; 2163 $self->SUPER::_draw;
2002} 2164}
2003 2165
2004############################################################################# 2166#############################################################################
2005 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
2006package CFClient::UI::ImageButton; 2317package CFPlus::UI::ImageButton;
2007 2318
2008our @ISA = CFClient::UI::Image::; 2319our @ISA = CFPlus::UI::Image::;
2009 2320
2010use CFClient::OpenGL; 2321use CFPlus::OpenGL;
2011 2322
2012my %textures; 2323my %textures;
2013 2324
2014sub new { 2325sub new {
2015 my $class = shift; 2326 my $class = shift;
… …
2037 1 2348 1
2038} 2349}
2039 2350
2040############################################################################# 2351#############################################################################
2041 2352
2042package CFClient::UI::CheckBox;
2043
2044our @ISA = CFClient::UI::DrawBG::;
2045
2046my @tex =
2047 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050use CFClient::OpenGL;
2051
2052sub new {
2053 my $class = shift;
2054
2055 $class->SUPER::new (
2056 padding_x => 2,
2057 padding_y => 2,
2058 fg => [1, 1, 1],
2059 active_fg => [1, 1, 0],
2060 bg => [0, 0, 0, 0.2],
2061 active_bg => [1, 1, 1, 0.5],
2062 state => 0,
2063 can_hover => 1,
2064 @_
2065 )
2066}
2067
2068sub size_request {
2069 my ($self) = @_;
2070
2071 (6) x 2
2072}
2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
2082sub invoke_button_down {
2083 my ($self, $ev, $x, $y) = @_;
2084
2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087 $self->toggle;
2088 } else {
2089 return 0
2090 }
2091
2092 1
2093}
2094
2095sub _draw {
2096 my ($self) = @_;
2097
2098 $self->SUPER::_draw;
2099
2100 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102 my ($w, $h) = @$self{qw(w h)};
2103
2104 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108 my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110 glEnable GL_TEXTURE_2D;
2111 $tex->draw_quad_alpha (0, 0, $s, $s);
2112 glDisable GL_TEXTURE_2D;
2113}
2114
2115#############################################################################
2116
2117package CFClient::UI::Image; 2353package CFPlus::UI::VGauge;
2118 2354
2119our @ISA = CFClient::UI::Base::; 2355our @ISA = CFPlus::UI::Base::;
2120
2121use CFClient::OpenGL;
2122
2123our %texture_cache;
2124
2125sub new {
2126 my $class = shift;
2127
2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2132
2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
2135
2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143 $self
2144}
2145
2146sub size_request {
2147 my ($self) = @_;
2148
2149 ($self->{tex}{w}, $self->{tex}{h})
2150}
2151
2152sub _draw {
2153 my ($self) = @_;
2154
2155 my $tex = $self->{tex};
2156
2157 my ($w, $h) = ($self->{w}, $self->{h});
2158
2159 if ($self->{rot90}) {
2160 glRotate 90, 0, 0, 1;
2161 glTranslate 0, -$self->{w}, 0;
2162
2163 ($w, $h) = ($h, $w);
2164 }
2165
2166 glEnable GL_TEXTURE_2D;
2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169 $tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171 glDisable GL_TEXTURE_2D;
2172}
2173
2174#############################################################################
2175
2176package CFClient::UI::VGauge;
2177
2178our @ISA = CFClient::UI::Base::;
2179 2356
2180use List::Util qw(min max); 2357use List::Util qw(min max);
2181 2358
2182use CFClient::OpenGL; 2359use CFPlus::OpenGL;
2183 2360
2184my %tex = ( 2361my %tex = (
2185 food => [ 2362 food => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188 ], 2365 ],
2189 grace => [ 2366 grace => [
2190 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191 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/
2192 ], 2369 ],
2193 hp => [ 2370 hp => [
2194 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196 ], 2373 ],
2197 mana => [ 2374 mana => [
2198 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2375 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199 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/
2200 ], 2377 ],
2201); 2378);
2202 2379
2203# eg. VGauge->new (gauge => 'food'), default gauge: food 2380# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2306 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
2307} 2484}
2308 2485
2309############################################################################# 2486#############################################################################
2310 2487
2311package CFClient::UI::Gauge; 2488package CFPlus::UI::Gauge;
2312 2489
2313our @ISA = CFClient::UI::VBox::; 2490our @ISA = CFPlus::UI::VBox::;
2314 2491
2315sub new { 2492sub new {
2316 my ($class, %arg) = @_; 2493 my ($class, %arg) = @_;
2317 2494
2318 my $self = $class->SUPER::new ( 2495 my $self = $class->SUPER::new (
… …
2320 can_hover => 1, 2497 can_hover => 1,
2321 can_events => 1, 2498 can_events => 1,
2322 %arg, 2499 %arg,
2323 ); 2500 );
2324 2501
2325 $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");
2326 $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);
2327 $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");
2328 2505
2329 $self 2506 $self
2330} 2507}
2331 2508
2332sub set_fontsize { 2509sub set_fontsize {
… …
2353 $self->{value}->set_text ($val); 2530 $self->{value}->set_text ($val);
2354} 2531}
2355 2532
2356############################################################################# 2533#############################################################################
2357 2534
2358package CFClient::UI::Slider; 2535package CFPlus::UI::Slider;
2359 2536
2360use strict; 2537use strict;
2361 2538
2362use CFClient::OpenGL; 2539use CFPlus::OpenGL;
2363 2540
2364our @ISA = CFClient::UI::DrawBG::; 2541our @ISA = CFPlus::UI::DrawBG::;
2365 2542
2366my @tex = 2543my @tex =
2367 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368 qw(s1_slider.png s1_slider_bg.png); 2545 qw(s1_slider.png s1_slider_bg.png);
2369 2546
2370sub new { 2547sub new {
2371 my $class = shift; 2548 my $class = shift;
2372 2549
… …
2461 } 2638 }
2462 2639
2463 1 2640 1
2464} 2641}
2465 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
2466sub update { 2653sub update {
2467 my ($self) = @_; 2654 my ($self) = @_;
2468 2655
2469 delete $self->{knob_w}; 2656 delete $self->{knob_w};
2470 $self->SUPER::update; 2657 $self->SUPER::update;
… …
2517 glDisable GL_TEXTURE_2D; 2704 glDisable GL_TEXTURE_2D;
2518} 2705}
2519 2706
2520############################################################################# 2707#############################################################################
2521 2708
2522package CFClient::UI::ValSlider; 2709package CFPlus::UI::ValSlider;
2523 2710
2524our @ISA = CFClient::UI::HBox::; 2711our @ISA = CFPlus::UI::HBox::;
2525 2712
2526sub new { 2713sub new {
2527 my ($class, %arg) = @_; 2714 my ($class, %arg) = @_;
2528 2715
2529 my $range = delete $arg{range}; 2716 my $range = delete $arg{range};
2530 2717
2531 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
2532 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534 to_value => sub { shift }, 2721 to_value => sub { shift },
2535 from_value => sub { shift }, 2722 from_value => sub { shift },
2536 %arg, 2723 %arg,
2537 ); 2724 );
2538 2725
… …
2558sub set_range { shift->{slider}->set_range (@_) } 2745sub set_range { shift->{slider}->set_range (@_) }
2559sub set_value { shift->{slider}->set_value (@_) } 2746sub set_value { shift->{slider}->set_value (@_) }
2560 2747
2561############################################################################# 2748#############################################################################
2562 2749
2563package CFClient::UI::TextScroller; 2750package CFPlus::UI::TextScroller;
2564 2751
2565our @ISA = CFClient::UI::HBox::; 2752our @ISA = CFPlus::UI::HBox::;
2566 2753
2567use CFClient::OpenGL; 2754use CFPlus::OpenGL;
2568 2755
2569sub new { 2756sub new {
2570 my $class = shift; 2757 my $class = shift;
2571 2758
2572 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
2573 fontsize => 1, 2760 fontsize => 1,
2574 can_events => 0, 2761 can_events => 1,
2575 indent => 0, 2762 indent => 0,
2576 #font => default_font 2763 #font => default_font
2577 @_, 2764 @_,
2578 2765
2579 layout => (new CFClient::Layout), 2766 layout => (new CFPlus::Layout),
2580 par => [], 2767 par => [],
2581 height => 0, 2768 height => 0,
2582 children => [ 2769 children => [
2583 (new CFClient::UI::Empty expand => 1), 2770 (new CFPlus::UI::Empty expand => 1),
2584 (new CFClient::UI::Slider vertical => 1), 2771 (new CFPlus::UI::Slider vertical => 1),
2585 ], 2772 ],
2586 ); 2773 );
2587 2774
2588 $self->{children}[1]->connect (changed => sub { $self->update }); 2775 $self->{children}[1]->connect (changed => sub { $self->update });
2589 2776
… …
2619 2806
2620 $self->reflow; 2807 $self->reflow;
2621 2808
2622 local $self->{children} = [$empty, $slider]; 2809 local $self->{children} = [$empty, $slider];
2623 $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
2624} 2821}
2625 2822
2626sub get_layout { 2823sub get_layout {
2627 my ($self, $para) = @_; 2824 my ($self, $para) = @_;
2628 2825
… …
2656 2853
2657 # todo: base offset on lines or so, not on pixels 2854 # todo: base offset on lines or so, not on pixels
2658 $self->{children}[1]->set_value ($offset); 2855 $self->{children}[1]->set_value ($offset);
2659} 2856}
2660 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
2661sub clear { 2873sub clear {
2662 my ($self) = @_; 2874 my ($self) = @_;
2663 2875
2664 my (undef, undef, @other) = @{ $self->{children} }; 2876 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other; 2877 $self->remove ($_) for @other;
… …
2668 $self->{height} = 0; 2880 $self->{height} = 0;
2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2881 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670} 2882}
2671 2883
2672sub add_paragraph { 2884sub add_paragraph {
2673 my ($self, $color, $para, $indent) = @_; 2885 my $self = shift;
2674 2886
2675 my ($text, @w) = ref $para ? @$para : $para; 2887 for my $para (@_) {
2676
2677 $para = { 2888 $para = {
2889 fg => [1, 1, 1, 1],
2890 indent => 0,
2891 markup => "",
2892 widget => [],
2893 ref $para ? %$para : (markup => $para),
2678 w => 1e10, 2894 w => 1e10,
2679 wrapped => 1, 2895 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2684 }; 2896 };
2685 2897
2686 $self->add (@w) if @w; 2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687 push @{$self->{par}}, $para; 2899 push @{$self->{par}}, $para;
2900 }
2688 2901
2689 $self->{need_reflow}++; 2902 $self->{need_reflow}++;
2690 $self->update; 2903 $self->update;
2691} 2904}
2692 2905
2693sub scroll_to_bottom { 2906sub scroll_to_bottom {
2694 my ($self) = @_; 2907 my ($self) = @_;
2695 2908
2696 $self->{scroll_to_bottom} = 1; 2909 $self->{scroll_to} = $#{$self->{par}};
2697 $self->update; 2910 $self->update;
2698} 2911}
2699 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
2700sub update { 2946sub update {
2701 my ($self) = @_; 2947 my ($self) = @_;
2702 2948
2703 $self->SUPER::update; 2949 $self->SUPER::update;
2704 2950
2705 return unless $self->{h} > 0; 2951 return unless $self->{h} > 0;
2706 2952
2707 delete $self->{texture}; 2953 delete $self->{texture};
2708 2954
2709 $ROOT->on_post_alloc ($self => sub { 2955 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate;
2957
2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711 2959
2712 if (delete $self->{need_reflow}) {
2713 my $height = 0;
2714
2715 for my $para (@{$self->{par}}) {
2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717 my $layout = $self->get_layout ($para);
2718 my ($w, $h) = $layout->size;
2719
2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2723 }
2724
2725 $height += $para->{h};
2726 }
2727
2728 $self->{height} = $height;
2729
2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732 delete $self->{texture};
2733 }
2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740 glClearColor 0, 0, 0, 0; 2961 glClearColor 0, 0, 0, 0;
2741 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2742 2963
2743 my $top = int $self->{children}[1]{range}[0]; 2964 my $top = int $self->{children}[1]{range}[0];
2744 2965
2966 my $paridx = 0;
2967 my $top_paragraph;
2968 my $top = int $self->{children}[1]{range}[0];
2969
2745 my $y0 = $top; 2970 my $y0 = $top;
2746 my $y1 = $top + $H; 2971 my $y1 = $top + $H;
2747 2972
2748 my $y = 0;
2749
2750 for my $para (@{$self->{par}}) { 2973 for my $para (@{$self->{par}}) {
2751 my $h = $para->{h}; 2974 my $h = $para->{h};
2975 my $y = $para->{y};
2752 2976
2753 if ($y0 < $y + $h && $y < $y1) { 2977 if ($y0 < $y + $h && $y < $y1) {
2754
2755 my $layout = $self->get_layout ($para); 2978 my $layout = $self->get_layout ($para);
2756 2979
2757 $layout->render ($para->{indent}, $y - $y0); 2980 $layout->render ($para->{indent}, $y - $y0);
2758 2981
2759 if (my @w = @{ $para->{widget} }) { 2982 if (my @w = @{ $para->{widget} }) {
… …
2768 $_->draw; 2991 $_->draw;
2769 } 2992 }
2770 } 2993 }
2771 } 2994 }
2772 2995
2773 $y += $h; 2996 $paridx++;
2997 $top_paragraph ||= $paridx if $y >= $top;
2774 } 2998 }
2999
3000 $self->{top_paragraph} = $top_paragraph;
2775 }; 3001 };
2776 }); 3002 });
2777} 3003}
2778 3004
2779sub reconfigure { 3005sub reconfigure {
… …
2797 $self->{children}[1]->draw; 3023 $self->{children}[1]->draw;
2798} 3024}
2799 3025
2800############################################################################# 3026#############################################################################
2801 3027
2802package CFClient::UI::Animator; 3028package CFPlus::UI::Animator;
2803 3029
2804use CFClient::OpenGL; 3030use CFPlus::OpenGL;
2805 3031
2806our @ISA = CFClient::UI::Bin::; 3032our @ISA = CFPlus::UI::Bin::;
2807 3033
2808sub moveto { 3034sub moveto {
2809 my ($self, $x, $y) = @_; 3035 my ($self, $x, $y) = @_;
2810 3036
2811 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3037 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2839 glPopMatrix; 3065 glPopMatrix;
2840} 3066}
2841 3067
2842############################################################################# 3068#############################################################################
2843 3069
2844package CFClient::UI::Flopper; 3070package CFPlus::UI::Flopper;
2845 3071
2846our @ISA = CFClient::UI::Button::; 3072our @ISA = CFPlus::UI::Button::;
2847 3073
2848sub new { 3074sub new {
2849 my $class = shift; 3075 my $class = shift;
2850 3076
2851 my $self = $class->SUPER::new ( 3077 my $self = $class->SUPER::new (
… …
2863 $self->{other}->toggle_visibility; 3089 $self->{other}->toggle_visibility;
2864} 3090}
2865 3091
2866############################################################################# 3092#############################################################################
2867 3093
2868package CFClient::UI::Tooltip; 3094package CFPlus::UI::Tooltip;
2869 3095
2870our @ISA = CFClient::UI::Bin::; 3096our @ISA = CFPlus::UI::Bin::;
2871 3097
2872use CFClient::OpenGL; 3098use CFPlus::OpenGL;
2873 3099
2874sub new { 3100sub new {
2875 my $class = shift; 3101 my $class = shift;
2876 3102
2877 $class->SUPER::new ( 3103 $class->SUPER::new (
… …
2880 ) 3106 )
2881} 3107}
2882 3108
2883sub set_tooltip_from { 3109sub set_tooltip_from {
2884 my ($self, $widget) = @_; 3110 my ($self, $widget) = @_;
3111
3112 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3113 if $widget->{tooltip} =~ /^#(.*)$/;
2885 3114
2886 my $tooltip = $widget->{tooltip}; 3115 my $tooltip = $widget->{tooltip};
2887 3116
2888 if ($ENV{CFPLUS_DEBUG} & 2) { 3117 if ($ENV{CFPLUS_DEBUG} & 2) {
2889 $tooltip .= "\n\n" . (ref $widget) . "\n" 3118 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2893 } 3122 }
2894 3123
2895 $tooltip =~ s/^\n+//; 3124 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//; 3125 $tooltip =~ s/\n+$//;
2897 3126
2898 $self->add (new CFClient::UI::Label 3127 $self->add (new CFPlus::UI::Label
2899 markup => $tooltip, 3128 markup => $tooltip,
2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3129 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901 fontsize => 0.8, 3130 fontsize => 0.8,
2902 fg => [0, 0, 0, 1], 3131 style => 1, # FLAG_INVERSE
2903 ellipsise => 0, 3132 ellipsise => 0,
2904 font => ($widget->{tooltip_font} || $::FONT_PROP), 3133 font => ($widget->{tooltip_font} || $::FONT_PROP),
2905 ); 3134 );
2906} 3135}
2907 3136
… …
2926 3155
2927 $self->{root}->on_post_alloc ("move_$self" => sub { 3156 $self->{root}->on_post_alloc ("move_$self" => sub {
2928 my $widget = $self->{owner} 3157 my $widget = $self->{owner}
2929 or return; 3158 or return;
2930 3159
3160 if ($widget->{visible}) {
2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3161 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932 3162
2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3163 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934 if $x + $self->{w} > $self->{root}{w}; 3164 if $x + $self->{w} > $self->{root}{w};
2935 3165
2936 $self->move_abs ($x, $y); 3166 $self->move_abs ($x, $y);
3167 } else {
3168 $self->hide;
3169 }
2937 }); 3170 });
2938} 3171}
2939 3172
2940sub _draw { 3173sub _draw {
2941 my ($self) = @_; 3174 my ($self) = @_;
… …
2965 $self->SUPER::_draw; 3198 $self->SUPER::_draw;
2966} 3199}
2967 3200
2968############################################################################# 3201#############################################################################
2969 3202
2970package CFClient::UI::Face; 3203package CFPlus::UI::Face;
2971 3204
2972our @ISA = CFClient::UI::Base::; 3205our @ISA = CFPlus::UI::DrawBG::;
2973 3206
2974use CFClient::OpenGL; 3207use CFPlus::OpenGL;
2975 3208
2976sub new { 3209sub new {
2977 my $class = shift; 3210 my $class = shift;
2978 3211
2979 my $self = $class->SUPER::new ( 3212 my $self = $class->SUPER::new (
… …
3014sub _draw { 3247sub _draw {
3015 my ($self) = @_; 3248 my ($self) = @_;
3016 3249
3017 return unless $::CONN; 3250 return unless $::CONN;
3018 3251
3252 $self->SUPER::_draw;
3253
3019 my $face; 3254 my $face;
3020 3255
3021 if ($self->{frame}) { 3256 if ($self->{frame}) {
3022 my $anim = $::CONN->{anim}[$self->{anim}]; 3257 my $anim = $::CONN->{anim}[$self->{anim}];
3023 3258
… …
3045 $self->SUPER::destroy; 3280 $self->SUPER::destroy;
3046} 3281}
3047 3282
3048############################################################################# 3283#############################################################################
3049 3284
3050package CFClient::UI::Buttonbar; 3285package CFPlus::UI::Buttonbar;
3051 3286
3052our @ISA = CFClient::UI::HBox::; 3287our @ISA = CFPlus::UI::HBox::;
3053 3288
3054# TODO: should actualyl wrap buttons and other goodies. 3289# TODO: should actualyl wrap buttons and other goodies.
3055 3290
3056############################################################################# 3291#############################################################################
3057 3292
3058package CFClient::UI::Menu; 3293package CFPlus::UI::Menu;
3059 3294
3060our @ISA = CFClient::UI::FancyFrame::; 3295our @ISA = CFPlus::UI::Toplevel::;
3061 3296
3062use CFClient::OpenGL; 3297use CFPlus::OpenGL;
3063 3298
3064sub new { 3299sub new {
3065 my $class = shift; 3300 my $class = shift;
3066 3301
3067 my $self = $class->SUPER::new ( 3302 my $self = $class->SUPER::new (
3068 items => [], 3303 items => [],
3069 z => 100, 3304 z => 100,
3070 @_, 3305 @_,
3071 ); 3306 );
3072 3307
3073 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3308 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074 3309
3075 for my $item (@{ $self->{items} }) { 3310 for my $item (@{ $self->{items} }) {
3076 my ($widget, $cb, $tooltip) = @$item; 3311 my ($widget, $cb, $tooltip) = @$item;
3077 3312
3078 # handle various types of items, only text for now 3313 # handle various types of items, only text for now
3079 if (!ref $widget) { 3314 if (!ref $widget) {
3080 if ($widget =~ /\t/) { 3315 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2; 3316 my ($left, $right) = split /\t/, $widget, 2;
3082 3317
3083 $widget = new CFClient::UI::HBox 3318 $widget = new CFPlus::UI::HBox
3084 can_hover => 1, 3319 can_hover => 1,
3085 can_events => 1, 3320 can_events => 1,
3086 tooltip => $tooltip, 3321 tooltip => $tooltip,
3087 children => [ 3322 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1), 3323 (new CFPlus::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1), 3324 (new CFPlus::UI::Label markup => $right, align => +1),
3090 ], 3325 ],
3091 ; 3326 ;
3092 3327
3093 } else { 3328 } else {
3094 $widget = new CFClient::UI::Label 3329 $widget = new CFPlus::UI::Label
3095 can_hover => 1, 3330 can_hover => 1,
3096 can_events => 1, 3331 can_events => 1,
3097 markup => $widget, 3332 markup => $widget,
3098 tooltip => $tooltip; 3333 tooltip => $tooltip;
3099 } 3334 }
… …
3147 1 3382 1
3148} 3383}
3149 3384
3150############################################################################# 3385#############################################################################
3151 3386
3152package CFClient::UI::Multiplexer; 3387package CFPlus::UI::Multiplexer;
3153 3388
3154our @ISA = CFClient::UI::Container::; 3389our @ISA = CFPlus::UI::Container::;
3155 3390
3156sub new { 3391sub new {
3157 my $class = shift; 3392 my $class = shift;
3158 3393
3159 my $self = $class->SUPER::new ( 3394 my $self = $class->SUPER::new (
… …
3220 $self->{current}->draw; 3455 $self->{current}->draw;
3221} 3456}
3222 3457
3223############################################################################# 3458#############################################################################
3224 3459
3225package CFClient::UI::Notebook; 3460package CFPlus::UI::Notebook;
3226 3461
3227our @ISA = CFClient::UI::VBox::; 3462our @ISA = CFPlus::UI::VBox::;
3228 3463
3229sub new { 3464sub new {
3230 my $class = shift; 3465 my $class = shift;
3231 3466
3232 my $self = $class->SUPER::new ( 3467 my $self = $class->SUPER::new (
3233 buttonbar => (new CFClient::UI::Buttonbar), 3468 buttonbar => (new CFPlus::UI::Buttonbar),
3234 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3469 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235 # filter => # will be put between multiplexer and $self 3470 # filter => # will be put between multiplexer and $self
3236 @_, 3471 @_,
3237 ); 3472 );
3238 3473
3239 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3474 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3245sub add { 3480sub add {
3246 my ($self, $title, $widget, $tooltip) = @_; 3481 my ($self, $title, $widget, $tooltip) = @_;
3247 3482
3248 Scalar::Util::weaken $self; 3483 Scalar::Util::weaken $self;
3249 3484
3250 $self->{buttonbar}->add (new CFClient::UI::Button 3485 $self->{buttonbar}->add (new CFPlus::UI::Button
3251 markup => $title, 3486 markup => $title,
3252 tooltip => $tooltip, 3487 tooltip => $tooltip,
3253 on_activate => sub { $self->set_current_page ($widget) }, 3488 on_activate => sub { $self->set_current_page ($widget) },
3254 ); 3489 );
3255 3490
… …
3269 $self->emit (page_changed => $self->{multiplexer}{current}); 3504 $self->emit (page_changed => $self->{multiplexer}{current});
3270} 3505}
3271 3506
3272############################################################################# 3507#############################################################################
3273 3508
3274package CFClient::UI::Combobox; 3509package CFPlus::UI::Selector;
3275 3510
3276use utf8; 3511use utf8;
3277 3512
3278our @ISA = CFClient::UI::Button::; 3513our @ISA = CFPlus::UI::Button::;
3279 3514
3280sub new { 3515sub new {
3281 my $class = shift; 3516 my $class = shift;
3282 3517
3283 my $self = $class->SUPER::new ( 3518 my $self = $class->SUPER::new (
… …
3300 my ($value, $title, $tooltip) = @$_; 3535 my ($value, $title, $tooltip) = @$_;
3301 3536
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3537 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 } 3538 }
3304 3539
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3540 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306} 3541}
3307 3542
3308sub _set_value { 3543sub _set_value {
3309 my ($self, $value) = @_; 3544 my ($self, $value) = @_;
3310 3545
… …
3325 $self->emit (changed => $value); 3560 $self->emit (changed => $value);
3326} 3561}
3327 3562
3328############################################################################# 3563#############################################################################
3329 3564
3330package CFClient::UI::Statusbox; 3565package CFPlus::UI::Statusbox;
3331 3566
3332our @ISA = CFClient::UI::VBox::; 3567our @ISA = CFPlus::UI::VBox::;
3333 3568
3334sub new { 3569sub new {
3335 my $class = shift; 3570 my $class = shift;
3336 3571
3337 my $self = $class->SUPER::new ( 3572 my $self = $class->SUPER::new (
… …
3349sub reorder { 3584sub reorder {
3350 my ($self) = @_; 3585 my ($self) = @_;
3351 my $NOW = Time::HiRes::time; 3586 my $NOW = Time::HiRes::time;
3352 3587
3353 # freeze display when hovering over any label 3588 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner} 3589 return if $CFPlus::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3590 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} }; 3591 values %{ $self->{item} };
3357 3592
3358 while (my ($k, $v) = each %{ $self->{item} }) { 3593 while (my ($k, $v) = each %{ $self->{item} }) {
3359 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3594 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360 } 3595 }
… …
3381 for ($short) { 3616 for ($short) {
3382 s/^\s+//; 3617 s/^\s+//;
3383 s/\s+/ /g; 3618 s/\s+/ /g;
3384 } 3619 }
3385 3620
3386 new CFClient::UI::Label 3621 new CFPlus::UI::Label
3387 markup => $short, 3622 markup => $short,
3388 tooltip => $item->{tooltip}, 3623 tooltip => $item->{tooltip},
3389 tooltip_font => $::FONT_PROP, 3624 tooltip_font => $::FONT_PROP,
3390 tooltip_width => 0.67, 3625 tooltip_width => 0.67,
3391 fontsize => $item->{fontsize} || $self->{fontsize}, 3626 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3470 $self->SUPER::destroy; 3705 $self->SUPER::destroy;
3471} 3706}
3472 3707
3473############################################################################# 3708#############################################################################
3474 3709
3475package CFClient::UI::Inventory; 3710package CFPlus::UI::Inventory;
3476 3711
3477our @ISA = CFClient::UI::Table::; 3712our @ISA = CFPlus::UI::Table::;
3478 3713
3479sub new { 3714sub new {
3480 my $class = shift; 3715 my $class = shift;
3481 3716
3482 my $self = $class->SUPER::new ( 3717 my $self = $class->SUPER::new (
3483 col_expand => [0, 1, 0], 3718 col_expand => [0, 1, 0],
3719 items => [],
3484 @_, 3720 @_,
3485 ); 3721 );
3486 3722
3723 $self->set_sort_order (undef);
3724
3487 $self 3725 $self
3726}
3727
3728sub update_items {
3729 my ($self) = @_;
3730
3731 $self->clear;
3732
3733 my @item = $self->{sort}->(@{ $self->{items} });
3734
3735 my @adds;
3736 my $row = 0;
3737 for my $item ($self->{sort}->(@{ $self->{items} })) {
3738 CFPlus::Item::update_widgets $item;
3739
3740 push @adds, 0, $row, $item->{face_widget};
3741 push @adds, 1, $row, $item->{desc_widget};
3742 push @adds, 2, $row, $item->{weight_widget};
3743
3744 $row++;
3745 }
3746
3747 $self->add (@adds);
3748}
3749
3750sub set_sort_order {
3751 my ($self, $order) = @_;
3752
3753 $self->{sort} = $order ||= sub {
3754 sort {
3755 $a->{type} <=> $b->{type}
3756 or $a->{name} cmp $b->{name}
3757 } @_
3758 };
3759
3760 $self->update_items;
3488} 3761}
3489 3762
3490sub set_items { 3763sub set_items {
3491 my ($self, $items) = @_; 3764 my ($self, $items) = @_;
3492 3765
3493 $self->clear; 3766 $self->{items} = [$items ? values %$items : ()];
3494 return unless $items; 3767 $self->update_items;
3495
3496 my @items = sort {
3497 ($a->{type} <=> $b->{type})
3498 or ($a->{name} cmp $b->{name})
3499 } values %$items;
3500
3501 $self->{real_items} = \@items;
3502
3503 my $row = 0;
3504 for my $item (@items) {
3505 CFClient::Item::update_widgets $item;
3506
3507 $self->add (0, $row, $item->{face_widget});
3508 $self->add (1, $row, $item->{desc_widget});
3509 $self->add (2, $row, $item->{weight_widget});
3510
3511 $row++;
3512 }
3513} 3768}
3514 3769
3515############################################################################# 3770#############################################################################
3516 3771
3517package CFClient::UI::SpellList; 3772package CFPlus::UI::SpellList;
3518 3773
3519our @ISA = CFClient::UI::Table::; 3774our @ISA = CFPlus::UI::Table::;
3520 3775
3521sub new { 3776sub new {
3522 my $class = shift; 3777 my $class = shift;
3523 3778
3524 my $self = $class->SUPER::new ( 3779 my $self = $class->SUPER::new (
… …
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3797 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543 3798
3544sub rebuild_spell_list { 3799sub rebuild_spell_list {
3545 my ($self) = @_; 3800 my ($self) = @_;
3546 3801
3547 $CFClient::UI::ROOT->on_refresh ($self => sub { 3802 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear; 3803 $self->clear;
3549 3804
3550 return unless $::CONN; 3805 return unless $::CONN;
3551 3806
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3807 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3808 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3809 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3810 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3811 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557 3812
3558 my $row = 0; 3813 my $row = 0;
3559 3814
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3815 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_}; 3816 my $spell = $self->{spell}{$_};
… …
3568 if ($ev->{button} == 1) { 3823 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}"); 3824 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) { 3825 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}"); 3826 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) { 3827 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu 3828 (new CFPlus::UI::Menu
3574 items => [ 3829 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3830 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3831 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ], 3832 ],
3578 )->popup ($ev); 3833 )->popup ($ev);
… …
3581 } 3836 }
3582 3837
3583 1 3838 1
3584 }; 3839 };
3585 3840
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3841 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3587 3842
3588 #TODO: add path info to tooltip 3843 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3844 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3590 3845
3591 $self->add (0, $row, new CFClient::UI::Face 3846 $self->add (0, $row, new CFPlus::UI::Face
3592 face => $spell->{face}, 3847 face => $spell->{face},
3593 can_hover => 1, 3848 can_hover => 1,
3594 can_events => 1, 3849 can_events => 1,
3595 tooltip => $tooltip, 3850 tooltip => $tooltip,
3596 on_button_down => $spell_cb, 3851 on_button_down => $spell_cb,
3597 ); 3852 );
3598 3853
3599 $self->add (1, $row, new CFClient::UI::Label 3854 $self->add (1, $row, new CFPlus::UI::Label
3600 expand => 1, 3855 expand => 1,
3601 text => $spell->{name}, 3856 text => $spell->{name},
3602 can_hover => 1, 3857 can_hover => 1,
3603 can_events => 1, 3858 can_events => 1,
3604 tooltip => $tooltip, 3859 tooltip => $tooltip,
3605 on_button_down => $spell_cb, 3860 on_button_down => $spell_cb,
3606 ); 3861 );
3607 3862
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3863 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3864 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3865 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3866 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 } 3867 }
3613 }); 3868 });
3614} 3869}
3615 3870
3616sub add_spell { 3871sub add_spell {
… …
3634 $self->rebuild_spell_list; 3889 $self->rebuild_spell_list;
3635} 3890}
3636 3891
3637############################################################################# 3892#############################################################################
3638 3893
3639package CFClient::UI::Root; 3894package CFPlus::UI::Root;
3640 3895
3641our @ISA = CFClient::UI::Container::; 3896our @ISA = CFPlus::UI::Container::;
3642 3897
3643use List::Util qw(min max); 3898use List::Util qw(min max);
3644 3899
3645use CFClient::OpenGL; 3900use CFPlus::OpenGL;
3646 3901
3647sub new { 3902sub new {
3648 my $class = shift; 3903 my $class = shift;
3649 3904
3650 my $self = $class->SUPER::new ( 3905 my $self = $class->SUPER::new (
… …
3829 $h = 0 if $h < 0; 4084 $h = 0 if $h < 0;
3830 4085
3831 $w = max $widget->{min_w}, $w; 4086 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h; 4087 $h = max $widget->{min_h}, $h;
3833 4088
4089# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4090# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4091
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4092 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4093 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836 4094
3837 $w = int $w + 0.5; 4095 $w = int $w + 0.5;
3838 $h = int $h + 0.5; 4096 $h = int $h + 0.5;
… …
3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4122 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865 glMatrixMode GL_MODELVIEW; 4123 glMatrixMode GL_MODELVIEW;
3866 glLoadIdentity; 4124 glLoadIdentity;
3867 4125
3868 { 4126 {
3869 package CFClient::UI::Base; 4127 package CFPlus::UI::Base;
3870 4128
3871 ($draw_x, $draw_y, $draw_w, $draw_h) = 4129 ($draw_x, $draw_y, $draw_w, $draw_h) =
3872 (0, 0, $self->{w}, $self->{h}); 4130 (0, 0, $self->{w}, $self->{h});
3873 } 4131 }
3874 4132
3875 $self->_draw; 4133 $self->_draw;
3876} 4134}
3877 4135
3878############################################################################# 4136#############################################################################
3879 4137
3880package CFClient::UI; 4138package CFPlus::UI;
3881 4139
3882$ROOT = new CFClient::UI::Root; 4140$ROOT = new CFPlus::UI::Root;
3883$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4141$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884 4142
38851 41431
3886 4144

Diff Legend

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