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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 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};
… …
239 262
240sub destroy { 263sub destroy {
241 my ($self) = @_; 264 my ($self) = @_;
242 265
243 $self->hide; 266 $self->hide;
267 $self->emit ("destroy");
244 %$self = (); 268 %$self = ();
245} 269}
246 270
247sub show { 271sub show {
248 my ($self) = @_; 272 my ($self) = @_;
249 273
250 return if $self->{parent}; 274 return if $self->{parent};
251 275
252 $CFClient::UI::ROOT->add ($self); 276 $CFPlus::UI::ROOT->add ($self);
253} 277}
254 278
255sub set_visible { 279sub set_visible {
256 my ($self) = @_; 280 my ($self) = @_;
257 281
… …
278 delete $self->{root}; 302 delete $self->{root};
279 303
280 undef $GRAB if $GRAB == $self; 304 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 305 undef $HOVER if $HOVER == $self;
282 306
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 307 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 308 if $TOOLTIP->{owner} == $self;
285 309
286 $self->emit ("focus_out"); 310 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 311 $self->emit (visibility_change => 0);
288} 312}
… …
345 my ($self, $x, $y, $w, $h) = @_; 369 my ($self, $x, $y, $w, $h) = @_;
346 370
347 if ($self->{aspect}) { 371 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 372 my ($ow, $oh) = ($w, $h);
349 373
350 $w = List::Util::min $w, int $h * $self->{aspect}; 374 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 375 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 376
353 # use alignment to adjust x, y 377 # use alignment to adjust x, y
354 378
355 $x += int 0.5 * ($ow - $w); 379 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 380 $y += int 0.5 * ($oh - $h);
… …
397 421
398 return if $self->{tooltip} eq $tooltip; 422 return if $self->{tooltip} eq $tooltip;
399 423
400 $self->{tooltip} = $tooltip; 424 $self->{tooltip} = $tooltip;
401 425
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 426 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 427 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 428 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 429 }
406} 430}
407 431
408# translate global coordinates to local coordinate system 432# translate global coordinates to local coordinate system
409sub coord2local { 433sub coord2local {
410 my ($self, $x, $y) = @_; 434 my ($self, $x, $y) = @_;
411 435
436 Carp::confess unless $self->{parent};#d#
437
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 438 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 439}
414 440
415# translate local coordinates to global coordinate system 441# translate local coordinates to global coordinate system
416sub coord2global { 442sub coord2global {
417 my ($self, $x, $y) = @_; 443 my ($self, $x, $y) = @_;
418 444
445 Carp::confess unless $self->{parent};#d#
446
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 447 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 448}
421 449
422sub invoke_focus_in { 450sub invoke_focus_in {
423 my ($self) = @_; 451 my ($self) = @_;
… …
452 480
453 $FOCUS->emit ("focus_out") if $FOCUS; 481 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 482 $self->emit ("focus_in");
455} 483}
456 484
457sub invoke_mouse_motion { 1 } 485sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 486sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 487sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 488sub invoke_key_up { 0 }
489sub invoke_mouse_wheel { 0 }
461 490
462sub invoke_button_down { 491sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 492 my ($self, $ev, $x, $y) = @_;
464 493
465 $self->grab_focus; 494 $self->grab_focus;
466 495
467 1 496 0
468} 497}
469 498
470sub connect { 499sub connect {
471 my ($self, $signal, $cb) = @_; 500 my ($self, $signal, $cb) = @_;
472 501
473 push @{ $self->{signal_cb}{$signal} }, $cb; 502 push @{ $self->{signal_cb}{$signal} }, $cb;
503
504 defined wantarray and CFPlus::guard {
505 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
506 @{ $self->{signal_cb}{$signal} };
507 }
474} 508}
509
510sub disconnect_all {
511 my ($self, $signal) = @_;
512
513 delete $self->{signal_cb}{$signal};
514}
515
516my %has_coords = (
517 button_down => 1,
518 button_up => 1,
519 mouse_motion => 1,
520 mouse_wheel => 1,
521);
475 522
476sub emit { 523sub emit {
477 my ($self, $signal, @args) = @_; 524 my ($self, $signal, @args) = @_;
478 525
526 # I do not really like this solution, but I do not like duplication
527 # and needlessly verbose code, either.
528 my @append
529 = $has_coords{$signal}
530 ? $args[0]->xy ($self)
531 : ();
532
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534
479 #d##TODO# stop propagating at first true, do not use sum 535 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 539}
484 540
485sub find_widget { 541sub find_widget {
486 my ($self, $x, $y) = @_; 542 my ($self, $x, $y) = @_;
487 543
… …
571 glVertex $self->{w} - 1, 0; 627 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 628 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 629 glVertex 0 , $self->{h} - 1;
574 glEnd; 630 glEnd;
575 glPopMatrix; 631 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 632 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 633 }
578 634
579 $self->_draw; 635 $self->_draw;
580 glPopMatrix; 636 glPopMatrix;
581} 637}
… …
587} 643}
588 644
589sub DESTROY { 645sub DESTROY {
590 my ($self) = @_; 646 my ($self) = @_;
591 647
592 delete $WIDGET{$self+0}; 648 return if CFPlus::in_destruct;
593 649
594 eval { $self->destroy }; 650 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 651 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652
653 delete $WIDGET{$self+0};
596} 654}
597 655
598############################################################################# 656#############################################################################
599 657
600package CFClient::UI::DrawBG; 658package CFPlus::UI::DrawBG;
601 659
602our @ISA = CFClient::UI::Base::; 660our @ISA = CFPlus::UI::Base::;
603 661
604use strict; 662use strict;
605use CFClient::OpenGL; 663use CFPlus::OpenGL;
606 664
607sub new { 665sub new {
608 my $class = shift; 666 my $class = shift;
609 667
610 # range [value, low, high, page] 668 # range [value, low, high, page]
… …
641 } 699 }
642} 700}
643 701
644############################################################################# 702#############################################################################
645 703
646package CFClient::UI::Empty; 704package CFPlus::UI::Empty;
647 705
648our @ISA = CFClient::UI::Base::; 706our @ISA = CFPlus::UI::Base::;
649 707
650sub new { 708sub new {
651 my ($class, %arg) = @_; 709 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 710 $class->SUPER::new (can_events => 0, %arg);
653} 711}
… …
660 718
661sub draw { } 719sub draw { }
662 720
663############################################################################# 721#############################################################################
664 722
665package CFClient::UI::Container; 723package CFPlus::UI::Container;
666 724
667our @ISA = CFClient::UI::Base::; 725our @ISA = CFPlus::UI::Base::;
668 726
669sub new { 727sub new {
670 my ($class, %arg) = @_; 728 my ($class, %arg) = @_;
671 729
672 my $children = delete $arg{children}; 730 my $children = delete $arg{children};
… …
681 if $children; 739 if $children;
682 740
683 $self 741 $self
684} 742}
685 743
744sub realloc {
745 my ($self) = @_;
746
747 $self->{force_realloc} = 1;
748 $self->{force_size_alloc} = 1;
749 $self->SUPER::realloc;
750}
751
686sub add { 752sub add {
687 my ($self, @widgets) = @_; 753 my ($self, @widgets) = @_;
688 754
689 $_->set_parent ($self) 755 $_->set_parent ($self)
690 for @widgets; 756 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 816 $_->draw for @{$self->{children}};
751} 817}
752 818
753############################################################################# 819#############################################################################
754 820
755package CFClient::UI::Bin; 821package CFPlus::UI::Bin;
756 822
757our @ISA = CFClient::UI::Container::; 823our @ISA = CFPlus::UI::Container::;
758 824
759sub new { 825sub new {
760 my ($class, %arg) = @_; 826 my ($class, %arg) = @_;
761 827
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 828 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 829
764 $class->SUPER::new (children => [$child], %arg) 830 $class->SUPER::new (children => [$child], %arg)
765} 831}
766 832
767sub add { 833sub add {
… …
774sub remove { 840sub remove {
775 my ($self, $widget) = @_; 841 my ($self, $widget) = @_;
776 842
777 $self->SUPER::remove ($widget); 843 $self->SUPER::remove ($widget);
778 844
779 $self->{children} = [new CFClient::UI::Empty] 845 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 846 unless @{$self->{children}};
781} 847}
782 848
783sub child { $_[0]->{children}[0] } 849sub child { $_[0]->{children}[0] }
784 850
… …
796 862
797############################################################################# 863#############################################################################
798 864
799# back-buffered drawing area 865# back-buffered drawing area
800 866
801package CFClient::UI::Window; 867package CFPlus::UI::Window;
802 868
803our @ISA = CFClient::UI::Bin::; 869our @ISA = CFPlus::UI::Bin::;
804 870
805use CFClient::OpenGL; 871use CFPlus::OpenGL;
806 872
807sub new { 873sub new {
808 my ($class, %arg) = @_; 874 my ($class, %arg) = @_;
809 875
810 my $self = $class->SUPER::new (%arg); 876 my $self = $class->SUPER::new (%arg);
… …
832} 898}
833 899
834sub render_child { 900sub render_child {
835 my ($self) = @_; 901 my ($self) = @_;
836 902
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 903 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 904 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 905 glClear GL_COLOR_BUFFER_BIT;
840 906
841 { 907 {
842 package CFClient::UI::Base; 908 package CFPlus::UI::Base;
843 909
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 910 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 911 (0, 0, $self->{w}, $self->{h});
912
913 $self->_render;
846 } 914 }
847
848 $self->_render;
849 }; 915 };
850} 916}
851 917
852sub _draw { 918sub _draw {
853 my ($self) = @_; 919 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 920
857 my $tex = $self->{texture} 921 my $tex = $self->{texture}
858 or return; 922 or return;
859 923
860 glEnable GL_TEXTURE_2D; 924 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 926 glColor 0, 0, 0, 1;
863 927
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 928 $tex->draw_quad_alpha_premultiplied (0, 0);
865 929
866 glDisable GL_TEXTURE_2D; 930 glDisable GL_TEXTURE_2D;
867} 931}
868 932
869############################################################################# 933#############################################################################
870 934
871package CFClient::UI::ViewPort; 935package CFPlus::UI::ViewPort;
872 936
873our @ISA = CFClient::UI::Window::; 937our @ISA = CFPlus::UI::Window::;
874 938
875sub new { 939sub new {
876 my $class = shift; 940 my $class = shift;
877 941
878 $class->SUPER::new ( 942 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1004 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1005 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1006 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1007 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1008 }
945} 1009}
946 1010
947sub _render { 1011sub _render {
948 my ($self) = @_; 1012 my ($self) = @_;
949 1013
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1014 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}; 1015 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1016
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1017 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1018
955 $self->SUPER::_render; 1019 $self->SUPER::_render;
956} 1020}
957 1021
958############################################################################# 1022#############################################################################
959 1023
960package CFClient::UI::ScrolledWindow; 1024package CFPlus::UI::ScrolledWindow;
961 1025
962our @ISA = CFClient::UI::HBox::; 1026our @ISA = CFPlus::UI::HBox::;
963 1027
964sub new { 1028sub new {
965 my ($class, %arg) = @_; 1029 my ($class, %arg) = @_;
966 1030
967 my $child = delete $arg{child}; 1031 my $child = delete $arg{child};
968 1032
969 my $self; 1033 my $self;
970 1034
971 my $slider = new CFClient::UI::Slider 1035 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1036 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1037 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1038 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1039 $self->{vp}->set_offset (0, $_[1]);
976 }, 1040 },
977 ; 1041 ;
978 1042
979 $self = $class->SUPER::new ( 1043 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1044 vp => (new CFPlus::UI::ViewPort expand => 1),
1045 can_events => 1,
981 slider => $slider, 1046 slider => $slider,
982 %arg, 1047 %arg,
983 ); 1048 );
984 1049
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1050 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1051 $self->add ($child) if $child;
… …
994 my ($self, $widget) = @_; 1059 my ($self, $widget) = @_;
995 1060
996 $self->{vp}->add ($self->{child} = $widget); 1061 $self->{vp}->add ($self->{child} = $widget);
997} 1062}
998 1063
1064sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_;
1066
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->emit (mouse_wheel => $ev);
1070
1071 1
1072}
1073
999sub update_slider { 1074sub update_slider {
1000 my ($self) = @_; 1075 my ($self) = @_;
1001 1076
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1078}
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1093 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1094}
1020 1095
1021############################################################################# 1096#############################################################################
1022 1097
1023package CFClient::UI::Frame; 1098package CFPlus::UI::Frame;
1024 1099
1025our @ISA = CFClient::UI::Bin::; 1100our @ISA = CFPlus::UI::Bin::;
1026 1101
1027use CFClient::OpenGL; 1102use CFPlus::OpenGL;
1028 1103
1029sub new { 1104sub new {
1030 my $class = shift; 1105 my $class = shift;
1031 1106
1032 $class->SUPER::new ( 1107 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1133 $self->SUPER::_draw;
1059} 1134}
1060 1135
1061############################################################################# 1136#############################################################################
1062 1137
1063package CFClient::UI::FancyFrame; 1138package CFPlus::UI::FancyFrame;
1064 1139
1065our @ISA = CFClient::UI::Bin::; 1140our @ISA = CFPlus::UI::Bin::;
1066 1141
1067use CFClient::OpenGL; 1142use CFPlus::OpenGL;
1143
1144sub new {
1145 my ($class, %arg) = @_;
1146
1147 if ((exists $arg{label}) && !ref $arg{label}) {
1148 $arg{label} = new CFPlus::UI::Label
1149 align => 1,
1150 valign => 0,
1151 text => $arg{label},
1152 fontsize => ($arg{border} || 0.8) * 0.75;
1153 }
1154
1155 my $self = $class->SUPER::new (
1156 # label => "",
1157 fg => [0.6, 0.3, 0.1],
1158 border => 0.8,
1159 style => 'single',
1160 %arg,
1161 );
1162
1163 $self
1164}
1165
1166sub add {
1167 my ($self, @widgets) = @_;
1168
1169 $self->SUPER::add (@widgets);
1170 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1171}
1172
1173sub border {
1174 int $_[0]{border} * $::FONTSIZE
1175}
1176
1177sub size_request {
1178 my ($self) = @_;
1179
1180 ($self->{label_w}, undef) = $self->{label}->size_request
1181 if $self->{label};
1182
1183 my ($w, $h) = $self->SUPER::size_request;
1184
1185 (
1186 $w + $self->border * 2,
1187 $h + $self->border * 2,
1188 )
1189}
1190
1191sub invoke_size_allocate {
1192 my ($self, $w, $h) = @_;
1193
1194 my $border = $self->border;
1195
1196 $w -= List::Util::max 0, $border * 2;
1197 $h -= List::Util::max 0, $border * 2;
1198
1199 if (my $label = $self->{label}) {
1200 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1201 $label->{h} = List::Util::min $h, $border;
1202 $label->invoke_size_allocate ($label->{w}, $label->{h});
1203 }
1204
1205 $self->child->configure ($border, $border, $w, $h);
1206
1207 1
1208}
1209
1210sub _draw {
1211 my ($self) = @_;
1212
1213 my $child = $self->{children}[0];
1214
1215 my $border = $self->border;
1216 my ($w, $h) = ($self->{w}, $self->{h});
1217
1218 $child->draw;
1219
1220 glColor @{$self->{fg}};
1221 glBegin GL_LINE_STRIP;
1222 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1223 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1224 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1225 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1226 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1227 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1228 glEnd;
1229
1230 if ($self->{label}) {
1231 glTranslate $border * 2, 0;
1232 $self->{label}->_draw;
1233 }
1234}
1235
1236#############################################################################
1237
1238package CFPlus::UI::Toplevel;
1239
1240our @ISA = CFPlus::UI::Bin::;
1241
1242use CFPlus::OpenGL;
1068 1243
1069my $bg = 1244my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1245 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1246 mipmap => 1, wrap => 1;
1072 1247
1073my @border = 1248my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1249 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); 1250 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1251
1077sub new { 1252sub new {
1078 my ($class, %arg) = @_; 1253 my ($class, %arg) = @_;
1079 1254
1080 my $self = $class->SUPER::new ( 1255 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1256 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1257 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1258 border => 0.6,
1084 can_events => 1, 1259 can_events => 1,
1085 min_w => 16, 1260 min_w => 64,
1086 min_h => 16, 1261 min_h => 32,
1087 %arg, 1262 %arg,
1088 ); 1263 );
1089 1264
1090 $self->{title_widget} = new CFClient::UI::Label 1265 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1266 align => 0,
1092 valign => 1, 1267 valign => 1,
1093 text => $self->{title}, 1268 text => $self->{title},
1094 fontsize => $self->{border}, 1269 fontsize => $self->{border},
1095 if exists $self->{title}; 1270 if exists $self->{title};
1096 1271
1097 if ($self->{has_close_button}) { 1272 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1273 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1274 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1275 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1276 on_activate => sub { $self->emit ("delete") };
1102 1277
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1278 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1279 }
1105 1280
1106 $self 1281 $self
1107} 1282}
1108 1283
1109sub add { 1284sub add {
1110 my ($self, @widgets) = @_; 1285 my ($self, @widgets) = @_;
1111 1286
1112 $self->SUPER::add (@widgets); 1287 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1288 $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}; 1289 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1290}
1116 1291
1117sub border { 1292sub border {
1118 int $_[0]{border} * $::FONTSIZE 1293 int $_[0]{border} * $::FONTSIZE
1119} 1294}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1402 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1403
1229 ! ! $self->{motion} 1404 ! ! $self->{motion}
1230} 1405}
1231 1406
1407sub invoke_visibility_change {
1408 my ($self, $visible) = @_;
1409
1410 delete $self->{motion} unless $visible;
1411
1412 0
1413}
1414
1232sub _draw { 1415sub _draw {
1233 my ($self) = @_; 1416 my ($self) = @_;
1234 1417
1235 my $child = $self->{children}[0]; 1418 my $child = $self->{children}[0];
1236 1419
… …
1273 if $self->{close_button}; 1456 if $self->{close_button};
1274} 1457}
1275 1458
1276############################################################################# 1459#############################################################################
1277 1460
1278package CFClient::UI::Table; 1461package CFPlus::UI::Table;
1279 1462
1280our @ISA = CFClient::UI::Base::; 1463our @ISA = CFPlus::UI::Base::;
1281 1464
1282use List::Util qw(max sum); 1465use List::Util qw(max sum);
1283 1466
1284use CFClient::OpenGL; 1467use CFPlus::OpenGL;
1285 1468
1286sub new { 1469sub new {
1287 my $class = shift; 1470 my $class = shift;
1288 1471
1289 $class->SUPER::new ( 1472 $class->SUPER::new (
… …
1295sub children { 1478sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1480}
1298 1481
1299sub add { 1482sub add {
1300 my ($self, $x, $y, $child) = @_; 1483 my ($self) = shift;
1301 1484
1485 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1487 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1488 $self->{children}[$y][$x] = $child;
1489 }
1304 1490
1491 $self->{force_realloc} = 1;
1492 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1493 $self->realloc;
1306} 1494}
1307 1495
1308sub remove { 1496sub remove {
1309 my ($self, $child) = @_; 1497 my ($self, $child) = @_;
… …
1374 1562
1375 # linearly scale sizes 1563 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1566
1379 CFClient::UI::harmonize $ws; 1567 CFPlus::UI::harmonize $ws;
1380 CFClient::UI::harmonize $hs; 1568 CFPlus::UI::harmonize $hs;
1381 1569
1382 my $y; 1570 my $y;
1383 1571
1384 for my $r (0 .. $#{$self->{children}}) { 1572 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1573 my $row = $self->{children}[$r]
… …
1428 } 1616 }
1429} 1617}
1430 1618
1431############################################################################# 1619#############################################################################
1432 1620
1433package CFClient::UI::Box; 1621package CFPlus::UI::Box;
1434 1622
1435our @ISA = CFClient::UI::Container::; 1623our @ISA = CFPlus::UI::Container::;
1436 1624
1437sub size_request { 1625sub size_request {
1438 my ($self) = @_; 1626 my ($self) = @_;
1439 1627
1440 $self->{vertical} 1628 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1661 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1662 for 0 .. $#children;
1475 } 1663 }
1476 } 1664 }
1477 1665
1478 CFClient::UI::harmonize \@req; 1666 CFPlus::UI::harmonize \@req;
1479 1667
1480 my $pos = 0; 1668 my $pos = 0;
1481 for (0 .. $#children) { 1669 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1670 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1671 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1676 1
1489} 1677}
1490 1678
1491############################################################################# 1679#############################################################################
1492 1680
1493package CFClient::UI::HBox; 1681package CFPlus::UI::HBox;
1494 1682
1495our @ISA = CFClient::UI::Box::; 1683our @ISA = CFPlus::UI::Box::;
1496 1684
1497sub new { 1685sub new {
1498 my $class = shift; 1686 my $class = shift;
1499 1687
1500 $class->SUPER::new ( 1688 $class->SUPER::new (
… …
1503 ) 1691 )
1504} 1692}
1505 1693
1506############################################################################# 1694#############################################################################
1507 1695
1508package CFClient::UI::VBox; 1696package CFPlus::UI::VBox;
1509 1697
1510our @ISA = CFClient::UI::Box::; 1698our @ISA = CFPlus::UI::Box::;
1511 1699
1512sub new { 1700sub new {
1513 my $class = shift; 1701 my $class = shift;
1514 1702
1515 $class->SUPER::new ( 1703 $class->SUPER::new (
… …
1518 ) 1706 )
1519} 1707}
1520 1708
1521############################################################################# 1709#############################################################################
1522 1710
1523package CFClient::UI::Label; 1711package CFPlus::UI::Label;
1524 1712
1525our @ISA = CFClient::UI::DrawBG::; 1713our @ISA = CFPlus::UI::DrawBG::;
1526 1714
1527use CFClient::OpenGL; 1715use CFPlus::OpenGL;
1528 1716
1529sub new { 1717sub new {
1530 my ($class, %arg) = @_; 1718 my ($class, %arg) = @_;
1531 1719
1532 my $self = $class->SUPER::new ( 1720 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1723 #active_bg => none
1536 #font => default_font 1724 #font => default_font
1537 #text => initial text 1725 #text => initial text
1538 #markup => initial narkup 1726 #markup => initial narkup
1539 #max_w => maximum pixel width 1727 #max_w => maximum pixel width
1728 #style => 0, # render flags
1540 ellipsise => 3, # end 1729 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1730 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1731 fontsize => 1,
1543 align => -1, 1732 align => -1,
1544 valign => -1, 1733 valign => -1,
1545 padding_x => 2, 1734 padding_x => 2,
1546 padding_y => 2, 1735 padding_y => 2,
1547 can_events => 0, 1736 can_events => 0,
1548 %arg 1737 %arg
1549 ); 1738 );
1550 1739
1551 if (exists $self->{template}) { 1740 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1741 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1742 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1743 $self->{template} = $layout;
1555 } 1744 }
1556 1745
1557 if (exists $self->{markup}) { 1746 if (exists $self->{markup}) {
… …
1561 } 1750 }
1562 1751
1563 $self 1752 $self
1564} 1753}
1565 1754
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574}
1575
1576sub update { 1755sub update {
1577 my ($self) = @_; 1756 my ($self) = @_;
1578 1757
1579 delete $self->{texture}; 1758 delete $self->{texture};
1580 $self->SUPER::update; 1759 $self->SUPER::update;
… …
1591 my ($self, $text) = @_; 1770 my ($self, $text) = @_;
1592 1771
1593 return if $self->{text} eq "T$text"; 1772 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1773 $self->{text} = "T$text";
1595 1774
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1775 $self->{layout}->set_text ($text);
1598 1776
1599 delete $self->{size_req}; 1777 delete $self->{size_req};
1600 $self->realloc; 1778 $self->realloc;
1601 $self->update; 1779 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1785 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1786 $self->{text} = "M$markup";
1609 1787
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1788 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1789
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1790 $self->{layout}->set_markup ($markup);
1614 1791
1615 delete $self->{size_req}; 1792 delete $self->{size_req};
1616 $self->realloc; 1793 $self->realloc;
1617 $self->update; 1794 $self->update;
… …
1629 1806
1630 my ($w, $h) = $self->{layout}->size; 1807 my ($w, $h) = $self->{layout}->size;
1631 1808
1632 if (exists $self->{template}) { 1809 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 1810 $self->{template}->set_font ($self->{font}) if $self->{font};
1811 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1812 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1813
1636 my ($w2, $h2) = $self->{template}->size; 1814 my ($w2, $h2) = $self->{template}->size;
1637 1815
1638 $w = List::Util::max $w, $w2; 1816 $w = List::Util::max $w, $w2;
… …
1672 1850
1673sub reconfigure { 1851sub reconfigure {
1674 my ($self) = @_; 1852 my ($self) = @_;
1675 1853
1676 delete $self->{size_req}; 1854 delete $self->{size_req};
1855 delete $self->{texture};
1677 1856
1678 $self->SUPER::reconfigure; 1857 $self->SUPER::reconfigure;
1679} 1858}
1680 1859
1681sub _draw { 1860sub _draw {
1682 my ($self) = @_; 1861 my ($self) = @_;
1683 1862
1684 $self->SUPER::_draw; # draw background, if applicable 1863 $self->SUPER::_draw; # draw background, if applicable
1685 1864
1686 my $tex = $self->{texture} ||= do { 1865 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 1866 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1867 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 1868 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1869 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1870 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1871 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 1872
1694 new_from_layout CFClient::Texture $self->{layout} 1873 [$self->{layout}->size]
1695 }; 1874 };
1696 1875
1697 unless (exists $self->{ox}) { 1876 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1877 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1878 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 1879 : ($self->{w} - $size->[0]) * 0.5);
1701 1880
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 1883 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 1884 };
1706 1885
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1886 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1887 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 1888
1712 if ($tex->{format} == GL_ALPHA) { 1889 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1720
1721 glDisable GL_TEXTURE_2D;
1722} 1890}
1723 1891
1724############################################################################# 1892#############################################################################
1725 1893
1726package CFClient::UI::EntryBase; 1894package CFPlus::UI::EntryBase;
1727 1895
1728our @ISA = CFClient::UI::Label::; 1896our @ISA = CFPlus::UI::Label::;
1729 1897
1730use CFClient::OpenGL; 1898use CFPlus::OpenGL;
1731 1899
1732sub new { 1900sub new {
1733 my $class = shift; 1901 my $class = shift;
1734 1902
1735 $class->SUPER::new ( 1903 $class->SUPER::new (
… …
1739 active_fg => [0, 0, 0], 1907 active_fg => [0, 0, 0],
1740 can_hover => 1, 1908 can_hover => 1,
1741 can_focus => 1, 1909 can_focus => 1,
1742 valign => 0, 1910 valign => 0,
1743 can_events => 1, 1911 can_events => 1,
1912 ellipsise => 0,
1744 #text => ... 1913 #text => ...
1745 #hidden => "*", 1914 #hidden => "*",
1746 @_ 1915 @_
1747 ) 1916 )
1748} 1917}
… …
1797 1966
1798 if ($uni == 8) { 1967 if ($uni == 8) {
1799 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800 } elsif ($uni == 127) { 1969 } elsif ($uni == 127) {
1801 substr $text, $self->{cursor}, 1, ""; 1970 substr $text, $self->{cursor}, 1, "";
1802 } elsif ($sym == CFClient::SDLK_LEFT) { 1971 } elsif ($sym == CFPlus::SDLK_LEFT) {
1803 --$self->{cursor} if $self->{cursor}; 1972 --$self->{cursor} if $self->{cursor};
1804 } elsif ($sym == CFClient::SDLK_RIGHT) { 1973 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1805 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1974 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1806 } elsif ($sym == CFClient::SDLK_HOME) { 1975 } elsif ($sym == CFPlus::SDLK_HOME) {
1807 $self->{cursor} = 0; 1976 $self->{cursor} = 0;
1808 } elsif ($sym == CFClient::SDLK_END) { 1977 } elsif ($sym == CFPlus::SDLK_END) {
1809 $self->{cursor} = length $text; 1978 $self->{cursor} = length $text;
1979 } elsif ($uni == 21) { # ctrl-u
1980 $text = "";
1981 $self->{cursor} = 0;
1810 } elsif ($uni == 27) { 1982 } elsif ($uni == 27) {
1811 $self->emit ('escape'); 1983 $self->emit ('escape');
1812 } elsif ($uni) { 1984 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1813 substr $text, $self->{cursor}++, 0, chr $uni; 1985 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else { 1986 } else {
1815 return 0; 1987 return 0;
1816 } 1988 }
1817 1989
1818 $self->_set_text ($text); 1990 $self->_set_text ($text);
1819 1991
1820 $self->realloc; 1992 $self->realloc;
1993 $self->update;
1821 1994
1822 1 1995 1
1823} 1996}
1824 1997
1825sub invoke_focus_in { 1998sub invoke_focus_in {
… …
1837 2010
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 2011 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 2012
1840 # byte-index to char-index 2013 # byte-index to char-index
1841 my $text = $self->{text}; 2014 my $text = $self->{text};
1842 utf8::encode $text; 2015 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 2016 $self->{cursor} = length $text;
1844 2017
1845 $self->_set_text ($self->{text}); 2018 $self->_set_text ($self->{text});
1846 $self->update; 2019 $self->update;
1847 2020
1848 1 2021 1
… …
1887 utf8::encode $text; 2060 utf8::encode $text;
1888 2061
1889 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2062 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890 } 2063 }
1891 2064
1892 glColor @{$self->{fg}};
1893 glBegin GL_LINES; 2065 glBegin GL_LINES;
1894 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2066 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2067 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896 glEnd; 2068 glEnd;
1897 } 2069 }
1898} 2070}
1899 2071
2072#############################################################################
2073
1900package CFClient::UI::Entry; 2074package CFPlus::UI::Entry;
1901 2075
1902our @ISA = CFClient::UI::EntryBase::; 2076our @ISA = CFPlus::UI::EntryBase::;
1903 2077
1904use CFClient::OpenGL; 2078use CFPlus::OpenGL;
1905 2079
1906sub invoke_key_down { 2080sub invoke_key_down {
1907 my ($self, $ev) = @_; 2081 my ($self, $ev) = @_;
1908 2082
1909 my $sym = $ev->{sym}; 2083 my $sym = $ev->{sym};
1910 2084
1911 if ($sym == 13) { 2085 if ($ev->{uni} == 0x0d || $sym == 13) {
1912 unshift @{$self->{history}}, 2086 unshift @{$self->{history}},
1913 my $txt = $self->get_text; 2087 my $txt = $self->get_text;
1914 2088
1915 $self->{history_pointer} = -1; 2089 $self->{history_pointer} = -1;
1916 $self->{history_saveback} = ''; 2090 $self->{history_saveback} = '';
1917 $self->emit (activate => $txt); 2091 $self->emit (activate => $txt);
1918 $self->update; 2092 $self->update;
1919 2093
1920 } elsif ($sym == CFClient::SDLK_UP) { 2094 } elsif ($sym == CFPlus::SDLK_UP) {
1921 if ($self->{history_pointer} < 0) { 2095 if ($self->{history_pointer} < 0) {
1922 $self->{history_saveback} = $self->get_text; 2096 $self->{history_saveback} = $self->get_text;
1923 } 2097 }
1924 if (@{$self->{history} || []} > 0) { 2098 if (@{$self->{history} || []} > 0) {
1925 $self->{history_pointer}++; 2099 $self->{history_pointer}++;
… …
1927 $self->{history_pointer} = @{$self->{history} || []} - 1; 2101 $self->{history_pointer} = @{$self->{history} || []} - 1;
1928 } 2102 }
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2103 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1930 } 2104 }
1931 2105
1932 } elsif ($sym == CFClient::SDLK_DOWN) { 2106 } elsif ($sym == CFPlus::SDLK_DOWN) {
1933 $self->{history_pointer}--; 2107 $self->{history_pointer}--;
1934 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2108 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935 2109
1936 if ($self->{history_pointer} >= 0) { 2110 if ($self->{history_pointer} >= 0) {
1937 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2111 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1946 1 2120 1
1947} 2121}
1948 2122
1949############################################################################# 2123#############################################################################
1950 2124
2125package CFPlus::UI::TextEdit;
2126
2127our @ISA = CFPlus::UI::EntryBase::;
2128
2129use CFPlus::OpenGL;
2130
2131sub move_cursor_ver {
2132 my ($self, $dy) = @_;
2133
2134 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2135
2136 $y += $dy;
2137
2138 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2139 $self->{cursor} = $index;
2140 delete $self->{cur_h};
2141 $self->update;
2142 return;
2143 }
2144}
2145
2146sub invoke_key_down {
2147 my ($self, $ev) = @_;
2148
2149 my $sym = $ev->{sym};
2150
2151 if ($sym == CFPlus::SDLK_UP) {
2152 $self->move_cursor_ver (-1);
2153 } elsif ($sym == CFPlus::SDLK_DOWN) {
2154 $self->move_cursor_ver (+1);
2155 } else {
2156 return $self->SUPER::invoke_key_down ($ev)
2157 }
2158
2159 1
2160}
2161
2162#############################################################################
2163
1951package CFClient::UI::Button; 2164package CFPlus::UI::Button;
1952 2165
1953our @ISA = CFClient::UI::Label::; 2166our @ISA = CFPlus::UI::Label::;
1954 2167
1955use CFClient::OpenGL; 2168use CFPlus::OpenGL;
1956 2169
1957my @tex = 2170my @tex =
1958 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959 qw(b1_button_active.png); 2172 qw(b1_button_active.png);
1960 2173
1961sub new { 2174sub new {
1962 my $class = shift; 2175 my $class = shift;
1963 2176
… …
2000 $self->SUPER::_draw; 2213 $self->SUPER::_draw;
2001} 2214}
2002 2215
2003############################################################################# 2216#############################################################################
2004 2217
2218package CFPlus::UI::CheckBox;
2219
2220our @ISA = CFPlus::UI::DrawBG::;
2221
2222my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2225
2226use CFPlus::OpenGL;
2227
2228sub new {
2229 my $class = shift;
2230
2231 $class->SUPER::new (
2232 padding_x => 2,
2233 padding_y => 2,
2234 fg => [1, 1, 1],
2235 active_fg => [1, 1, 0],
2236 bg => [0, 0, 0, 0.2],
2237 active_bg => [1, 1, 1, 0.5],
2238 state => 0,
2239 can_hover => 1,
2240 @_
2241 )
2242}
2243
2244sub size_request {
2245 my ($self) = @_;
2246
2247 (6) x 2
2248}
2249
2250sub toggle {
2251 my ($self) = @_;
2252
2253 $self->{state} = !$self->{state};
2254 $self->emit (changed => $self->{state});
2255 $self->update;
2256}
2257
2258sub invoke_button_down {
2259 my ($self, $ev, $x, $y) = @_;
2260
2261 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2262 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2263 $self->toggle;
2264 } else {
2265 return 0
2266 }
2267
2268 1
2269}
2270
2271sub _draw {
2272 my ($self) = @_;
2273
2274 $self->SUPER::_draw;
2275
2276 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2277
2278 my ($w, $h) = @$self{qw(w h)};
2279
2280 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2281
2282 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2283
2284 my $tex = $self->{state} ? $tex[1] : $tex[0];
2285
2286 glEnable GL_TEXTURE_2D;
2287 $tex->draw_quad_alpha (0, 0, $s, $s);
2288 glDisable GL_TEXTURE_2D;
2289}
2290
2291#############################################################################
2292
2293package CFPlus::UI::Image;
2294
2295our @ISA = CFPlus::UI::Base::;
2296
2297use CFPlus::OpenGL;
2298
2299our %texture_cache;
2300
2301sub new {
2302 my $class = shift;
2303
2304 my $self = $class->SUPER::new (
2305 can_events => 0,
2306 @_,
2307 );
2308
2309 $self->{path} || $self->{tex}
2310 or Carp::croak "'path' or 'tex' attributes required";
2311
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314
2315 Scalar::Util::weaken $texture_cache{$self->{path}};
2316
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318
2319 $self
2320}
2321
2322sub STORABLE_freeze {
2323 my ($self, $cloning) = @_;
2324
2325 $self->{path}
2326 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2327
2328 $self->{path}
2329}
2330
2331sub STORABLE_attach {
2332 my ($self, $cloning, $path) = @_;
2333
2334 $self->new (path => $path)
2335}
2336
2337sub size_request {
2338 my ($self) = @_;
2339
2340 ($self->{tex}{w}, $self->{tex}{h})
2341}
2342
2343sub _draw {
2344 my ($self) = @_;
2345
2346 my $tex = $self->{tex};
2347
2348 my ($w, $h) = ($self->{w}, $self->{h});
2349
2350 if ($self->{rot90}) {
2351 glRotate 90, 0, 0, 1;
2352 glTranslate 0, -$self->{w}, 0;
2353
2354 ($w, $h) = ($h, $w);
2355 }
2356
2357 glEnable GL_TEXTURE_2D;
2358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2359
2360 $tex->draw_quad (0, 0, $w, $h);
2361
2362 glDisable GL_TEXTURE_2D;
2363}
2364
2365#############################################################################
2366
2005package CFClient::UI::ImageButton; 2367package CFPlus::UI::ImageButton;
2006 2368
2007our @ISA = CFClient::UI::Image::; 2369our @ISA = CFPlus::UI::Image::;
2008 2370
2009use CFClient::OpenGL; 2371use CFPlus::OpenGL;
2010 2372
2011my %textures; 2373my %textures;
2012 2374
2013sub new { 2375sub new {
2014 my $class = shift; 2376 my $class = shift;
… …
2036 1 2398 1
2037} 2399}
2038 2400
2039############################################################################# 2401#############################################################################
2040 2402
2041package CFClient::UI::CheckBox;
2042
2043our @ISA = CFClient::UI::DrawBG::;
2044
2045my @tex =
2046 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049use CFClient::OpenGL;
2050
2051sub new {
2052 my $class = shift;
2053
2054 $class->SUPER::new (
2055 padding_x => 2,
2056 padding_y => 2,
2057 fg => [1, 1, 1],
2058 active_fg => [1, 1, 0],
2059 bg => [0, 0, 0, 0.2],
2060 active_bg => [1, 1, 1, 0.5],
2061 state => 0,
2062 can_hover => 1,
2063 @_
2064 )
2065}
2066
2067sub size_request {
2068 my ($self) = @_;
2069
2070 (6) x 2
2071}
2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
2081sub invoke_button_down {
2082 my ($self, $ev, $x, $y) = @_;
2083
2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086 $self->toggle;
2087 } else {
2088 return 0
2089 }
2090
2091 1
2092}
2093
2094sub _draw {
2095 my ($self) = @_;
2096
2097 $self->SUPER::_draw;
2098
2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109 glEnable GL_TEXTURE_2D;
2110 $tex->draw_quad_alpha (0, 0, $s, $s);
2111 glDisable GL_TEXTURE_2D;
2112}
2113
2114#############################################################################
2115
2116package CFClient::UI::Image; 2403package CFPlus::UI::VGauge;
2117 2404
2118our @ISA = CFClient::UI::Base::; 2405our @ISA = CFPlus::UI::Base::;
2119
2120use CFClient::OpenGL;
2121
2122our %texture_cache;
2123
2124sub new {
2125 my $class = shift;
2126
2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
2131
2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
2134
2135 $self->{tex} = $texture_cache{$self->{path}} ||=
2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138 Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142 $self
2143}
2144
2145sub size_request {
2146 my ($self) = @_;
2147
2148 ($self->{tex}{w}, $self->{tex}{h})
2149}
2150
2151sub _draw {
2152 my ($self) = @_;
2153
2154 my $tex = $self->{tex};
2155
2156 my ($w, $h) = ($self->{w}, $self->{h});
2157
2158 if ($self->{rot90}) {
2159 glRotate 90, 0, 0, 1;
2160 glTranslate 0, -$self->{w}, 0;
2161
2162 ($w, $h) = ($h, $w);
2163 }
2164
2165 glEnable GL_TEXTURE_2D;
2166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168 $tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170 glDisable GL_TEXTURE_2D;
2171}
2172
2173#############################################################################
2174
2175package CFClient::UI::VGauge;
2176
2177our @ISA = CFClient::UI::Base::;
2178 2406
2179use List::Util qw(min max); 2407use List::Util qw(min max);
2180 2408
2181use CFClient::OpenGL; 2409use CFPlus::OpenGL;
2182 2410
2183my %tex = ( 2411my %tex = (
2184 food => [ 2412 food => [
2185 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2413 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2414 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187 ], 2415 ],
2188 grace => [ 2416 grace => [
2189 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2417 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2418 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191 ], 2419 ],
2192 hp => [ 2420 hp => [
2193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2194 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2422 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195 ], 2423 ],
2196 mana => [ 2424 mana => [
2197 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2425 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2198 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2426 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199 ], 2427 ],
2200); 2428);
2201 2429
2202# eg. VGauge->new (gauge => 'food'), default gauge: food 2430# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2305 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2306} 2534}
2307 2535
2308############################################################################# 2536#############################################################################
2309 2537
2310package CFClient::UI::Gauge; 2538package CFPlus::UI::Gauge;
2311 2539
2312our @ISA = CFClient::UI::VBox::; 2540our @ISA = CFPlus::UI::VBox::;
2313 2541
2314sub new { 2542sub new {
2315 my ($class, %arg) = @_; 2543 my ($class, %arg) = @_;
2316 2544
2317 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
… …
2319 can_hover => 1, 2547 can_hover => 1,
2320 can_events => 1, 2548 can_events => 1,
2321 %arg, 2549 %arg,
2322 ); 2550 );
2323 2551
2324 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2552 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2325 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2553 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2554 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2327 2555
2328 $self 2556 $self
2329} 2557}
2330 2558
2331sub set_fontsize { 2559sub set_fontsize {
… …
2352 $self->{value}->set_text ($val); 2580 $self->{value}->set_text ($val);
2353} 2581}
2354 2582
2355############################################################################# 2583#############################################################################
2356 2584
2357package CFClient::UI::Slider; 2585package CFPlus::UI::Slider;
2358 2586
2359use strict; 2587use strict;
2360 2588
2361use CFClient::OpenGL; 2589use CFPlus::OpenGL;
2362 2590
2363our @ISA = CFClient::UI::DrawBG::; 2591our @ISA = CFPlus::UI::DrawBG::;
2364 2592
2365my @tex = 2593my @tex =
2366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2367 qw(s1_slider.png s1_slider_bg.png); 2595 qw(s1_slider.png s1_slider_bg.png);
2368 2596
2369sub new { 2597sub new {
2370 my $class = shift; 2598 my $class = shift;
2371 2599
… …
2460 } 2688 }
2461 2689
2462 1 2690 1
2463} 2691}
2464 2692
2693sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_;
2695
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2699
2700 ! ! $delta
2701}
2702
2465sub update { 2703sub update {
2466 my ($self) = @_; 2704 my ($self) = @_;
2467 2705
2468 delete $self->{knob_w}; 2706 delete $self->{knob_w};
2469 $self->SUPER::update; 2707 $self->SUPER::update;
… …
2516 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2517} 2755}
2518 2756
2519############################################################################# 2757#############################################################################
2520 2758
2521package CFClient::UI::ValSlider; 2759package CFPlus::UI::ValSlider;
2522 2760
2523our @ISA = CFClient::UI::HBox::; 2761our @ISA = CFPlus::UI::HBox::;
2524 2762
2525sub new { 2763sub new {
2526 my ($class, %arg) = @_; 2764 my ($class, %arg) = @_;
2527 2765
2528 my $range = delete $arg{range}; 2766 my $range = delete $arg{range};
2529 2767
2530 my $self = $class->SUPER::new ( 2768 my $self = $class->SUPER::new (
2531 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2769 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2532 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2770 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2533 to_value => sub { shift }, 2771 to_value => sub { shift },
2534 from_value => sub { shift }, 2772 from_value => sub { shift },
2535 %arg, 2773 %arg,
2536 ); 2774 );
2537 2775
… …
2557sub set_range { shift->{slider}->set_range (@_) } 2795sub set_range { shift->{slider}->set_range (@_) }
2558sub set_value { shift->{slider}->set_value (@_) } 2796sub set_value { shift->{slider}->set_value (@_) }
2559 2797
2560############################################################################# 2798#############################################################################
2561 2799
2562package CFClient::UI::TextScroller; 2800package CFPlus::UI::TextScroller;
2563 2801
2564our @ISA = CFClient::UI::HBox::; 2802our @ISA = CFPlus::UI::HBox::;
2565 2803
2566use CFClient::OpenGL; 2804use CFPlus::OpenGL;
2567 2805
2568sub new { 2806sub new {
2569 my $class = shift; 2807 my $class = shift;
2570 2808
2571 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2572 fontsize => 1, 2810 fontsize => 1,
2573 can_events => 0, 2811 can_events => 1,
2574 indent => 0, 2812 indent => 0,
2575 #font => default_font 2813 #font => default_font
2576 @_, 2814 @_,
2577 2815
2578 layout => (new CFClient::Layout 1), 2816 layout => (new CFPlus::Layout),
2579 par => [], 2817 par => [],
2580 height => 0, 2818 height => 0,
2581 children => [ 2819 children => [
2582 (new CFClient::UI::Empty expand => 1), 2820 (new CFPlus::UI::Empty expand => 1),
2583 (new CFClient::UI::Slider vertical => 1), 2821 (new CFPlus::UI::Slider vertical => 1),
2584 ], 2822 ],
2585 ); 2823 );
2586 2824
2587 $self->{children}[1]->connect (changed => sub { $self->update }); 2825 $self->{children}[1]->connect (changed => sub { $self->update });
2588 2826
… …
2618 2856
2619 $self->reflow; 2857 $self->reflow;
2620 2858
2621 local $self->{children} = [$empty, $slider]; 2859 local $self->{children} = [$empty, $slider];
2622 $self->SUPER::invoke_size_allocate ($w, $h) 2860 $self->SUPER::invoke_size_allocate ($w, $h)
2861}
2862
2863sub invoke_mouse_wheel {
2864 my ($self, $ev) = @_;
2865
2866 return 0 unless $ev->{dy}; # only vertical movements
2867
2868 $self->{children}[1]->emit (mouse_wheel => $ev);
2869
2870 1
2623} 2871}
2624 2872
2625sub get_layout { 2873sub get_layout {
2626 my ($self, $para) = @_; 2874 my ($self, $para) = @_;
2627 2875
… …
2655 2903
2656 # todo: base offset on lines or so, not on pixels 2904 # todo: base offset on lines or so, not on pixels
2657 $self->{children}[1]->set_value ($offset); 2905 $self->{children}[1]->set_value ($offset);
2658} 2906}
2659 2907
2908sub current_paragraph {
2909 my ($self) = @_;
2910
2911 $self->{top_paragraph} - 1
2912}
2913
2914sub scroll_to {
2915 my ($self, $para) = @_;
2916
2917 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2918
2919 $self->{scroll_to} = $para;
2920 $self->update;
2921}
2922
2660sub clear { 2923sub clear {
2661 my ($self) = @_; 2924 my ($self) = @_;
2662 2925
2663 my (undef, undef, @other) = @{ $self->{children} }; 2926 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other; 2927 $self->remove ($_) for @other;
… …
2667 $self->{height} = 0; 2930 $self->{height} = 0;
2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2931 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669} 2932}
2670 2933
2671sub add_paragraph { 2934sub add_paragraph {
2672 my ($self, $color, $para, $indent) = @_; 2935 my $self = shift;
2673 2936
2674 my ($text, @w) = ref $para ? @$para : $para; 2937 for my $para (@_) {
2675
2676 $para = { 2938 $para = {
2939 fg => [1, 1, 1, 1],
2940 indent => 0,
2941 markup => "",
2942 widget => [],
2943 ref $para ? %$para : (markup => $para),
2677 w => 1e10, 2944 w => 1e10,
2678 wrapped => 1, 2945 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2683 }; 2946 };
2684 2947
2685 $self->add (@w) if @w; 2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686 push @{$self->{par}}, $para; 2949 push @{$self->{par}}, $para;
2950 }
2687 2951
2688 $self->{need_reflow}++; 2952 $self->{need_reflow}++;
2689 $self->update; 2953 $self->update;
2690} 2954}
2691 2955
2692sub scroll_to_bottom { 2956sub scroll_to_bottom {
2693 my ($self) = @_; 2957 my ($self) = @_;
2694 2958
2695 $self->{scroll_to_bottom} = 1; 2959 $self->{scroll_to} = $#{$self->{par}};
2696 $self->update; 2960 $self->update;
2697} 2961}
2698 2962
2963sub force_uptodate {
2964 my ($self) = @_;
2965
2966 if (delete $self->{need_reflow}) {
2967 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2968
2969 my $height = 0;
2970
2971 for my $para (@{$self->{par}}) {
2972 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2973 my $layout = $self->get_layout ($para);
2974 my ($w, $h) = $layout->size;
2975
2976 $para->{w} = $w + $para->{indent};
2977 $para->{h} = $h;
2978 $para->{wrapped} = $layout->has_wrapped;
2979 }
2980
2981 $para->{y} = $height;
2982 $height += $para->{h};
2983 }
2984
2985 $self->{height} = $height;
2986 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2987
2988 delete $self->{texture};
2989 }
2990
2991 if (my $paridx = delete $self->{scroll_to}) {
2992 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2993 }
2994}
2995
2699sub update { 2996sub update {
2700 my ($self) = @_; 2997 my ($self) = @_;
2701 2998
2702 $self->SUPER::update; 2999 $self->SUPER::update;
2703 3000
2704 return unless $self->{h} > 0; 3001 return unless $self->{h} > 0;
2705 3002
2706 delete $self->{texture}; 3003 delete $self->{texture};
2707 3004
2708 $ROOT->on_post_alloc ($self => sub { 3005 $ROOT->on_post_alloc ($self => sub {
3006 $self->force_uptodate;
3007
2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3008 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710 3009
2711 if (delete $self->{need_reflow}) {
2712 my $height = 0;
2713
2714 for my $para (@{$self->{par}}) {
2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716 my $layout = $self->get_layout ($para);
2717 my ($w, $h) = $layout->size;
2718
2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2722 }
2723
2724 $height += $para->{h};
2725 }
2726
2727 $self->{height} = $height;
2728
2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731 delete $self->{texture};
2732 }
2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3010 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2739 glClearColor 0, 0, 0, 0; 3011 glClearColor 0, 0, 0, 0;
2740 glClear GL_COLOR_BUFFER_BIT; 3012 glClear GL_COLOR_BUFFER_BIT;
2741 3013
3014 package CFPlus::UI::Base;
3015 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3016 (0, 0, $self->{w}, $self->{h});
3017
3018 my $top = int $self->{children}[1]{range}[0];
3019
3020 my $paridx = 0;
3021 my $top_paragraph;
2742 my $top = int $self->{children}[1]{range}[0]; 3022 my $top = int $self->{children}[1]{range}[0];
2743 3023
2744 my $y0 = $top; 3024 my $y0 = $top;
2745 my $y1 = $top + $H; 3025 my $y1 = $top + $H;
2746 3026
2747 my $y = 0;
2748
2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753 for my $para (@{$self->{par}}) { 3027 for my $para (@{$self->{par}}) {
2754 my $h = $para->{h}; 3028 my $h = $para->{h};
3029 my $y = $para->{y};
2755 3030
2756 if ($y0 < $y + $h && $y < $y1) { 3031 if ($y0 < $y + $h && $y < $y1) {
2757
2758 my $layout = $self->get_layout ($para); 3032 my $layout = $self->get_layout ($para);
2759 3033
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0; 3034 $layout->render ($para->{indent}, $y - $y0);
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764 3035
2765 if (my @w = @{ $para->{widget} }) { 3036 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes; 3037 my @s = $layout->get_shapes;
2767 3038
2768 glDisable GL_BLEND;
2769 for (@w) { 3039 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, (); 3040 my ($dx, $dy) = splice @s, 0, 2, ();
2771 3041
2772 $_->{x} = $dx + $para->{indent}; 3042 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0; 3043 $_->{y} = $dy + $y - $y0;
2774 3044
2775 $_->draw; 3045 $_->draw;
2776 } 3046 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 } 3047 }
2780 } 3048 }
2781 3049
2782 $y += $h; 3050 $paridx++;
3051 $top_paragraph ||= $paridx if $y >= $top;
2783 } 3052 }
2784 3053
2785 glDisable GL_BLEND; 3054 $self->{top_paragraph} = $top_paragraph;
2786 }; 3055 };
2787 }); 3056 });
2788} 3057}
2789 3058
2790sub reconfigure { 3059sub reconfigure {
… …
2808 $self->{children}[1]->draw; 3077 $self->{children}[1]->draw;
2809} 3078}
2810 3079
2811############################################################################# 3080#############################################################################
2812 3081
2813package CFClient::UI::Animator; 3082package CFPlus::UI::Animator;
2814 3083
2815use CFClient::OpenGL; 3084use CFPlus::OpenGL;
2816 3085
2817our @ISA = CFClient::UI::Bin::; 3086our @ISA = CFPlus::UI::Bin::;
2818 3087
2819sub moveto { 3088sub moveto {
2820 my ($self, $x, $y) = @_; 3089 my ($self, $x, $y) = @_;
2821 3090
2822 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3091 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2850 glPopMatrix; 3119 glPopMatrix;
2851} 3120}
2852 3121
2853############################################################################# 3122#############################################################################
2854 3123
2855package CFClient::UI::Flopper; 3124package CFPlus::UI::Flopper;
2856 3125
2857our @ISA = CFClient::UI::Button::; 3126our @ISA = CFPlus::UI::Button::;
2858 3127
2859sub new { 3128sub new {
2860 my $class = shift; 3129 my $class = shift;
2861 3130
2862 my $self = $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
… …
2874 $self->{other}->toggle_visibility; 3143 $self->{other}->toggle_visibility;
2875} 3144}
2876 3145
2877############################################################################# 3146#############################################################################
2878 3147
2879package CFClient::UI::Tooltip; 3148package CFPlus::UI::Tooltip;
2880 3149
2881our @ISA = CFClient::UI::Bin::; 3150our @ISA = CFPlus::UI::Bin::;
2882 3151
2883use CFClient::OpenGL; 3152use CFPlus::OpenGL;
2884 3153
2885sub new { 3154sub new {
2886 my $class = shift; 3155 my $class = shift;
2887 3156
2888 $class->SUPER::new ( 3157 $class->SUPER::new (
… …
2891 ) 3160 )
2892} 3161}
2893 3162
2894sub set_tooltip_from { 3163sub set_tooltip_from {
2895 my ($self, $widget) = @_; 3164 my ($self, $widget) = @_;
3165
3166 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3167 if $widget->{tooltip} =~ /^#(.*)$/;
2896 3168
2897 my $tooltip = $widget->{tooltip}; 3169 my $tooltip = $widget->{tooltip};
2898 3170
2899 if ($ENV{CFPLUS_DEBUG} & 2) { 3171 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n" 3172 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2904 } 3176 }
2905 3177
2906 $tooltip =~ s/^\n+//; 3178 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//; 3179 $tooltip =~ s/\n+$//;
2908 3180
2909 $self->add (new CFClient::UI::Label 3181 $self->add (new CFPlus::UI::Label
2910 markup => $tooltip, 3182 markup => $tooltip,
2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3183 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912 fontsize => 0.8, 3184 fontsize => 0.8,
2913 fg => [0, 0, 0, 1], 3185 style => 1, # FLAG_INVERSE
2914 ellipsise => 0, 3186 ellipsise => 0,
2915 font => ($widget->{tooltip_font} || $::FONT_PROP), 3187 font => ($widget->{tooltip_font} || $::FONT_PROP),
2916 ); 3188 );
2917} 3189}
2918 3190
… …
2937 3209
2938 $self->{root}->on_post_alloc ("move_$self" => sub { 3210 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner} 3211 my $widget = $self->{owner}
2940 or return; 3212 or return;
2941 3213
3214 if ($widget->{visible}) {
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3215 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943 3216
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3217 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w}; 3218 if $x + $self->{w} > $self->{root}{w};
2946 3219
2947 $self->move_abs ($x, $y); 3220 $self->move_abs ($x, $y);
3221 } else {
3222 $self->hide;
3223 }
2948 }); 3224 });
2949} 3225}
2950 3226
2951sub _draw { 3227sub _draw {
2952 my ($self) = @_; 3228 my ($self) = @_;
… …
2976 $self->SUPER::_draw; 3252 $self->SUPER::_draw;
2977} 3253}
2978 3254
2979############################################################################# 3255#############################################################################
2980 3256
2981package CFClient::UI::Face; 3257package CFPlus::UI::Face;
2982 3258
2983our @ISA = CFClient::UI::Base::; 3259our @ISA = CFPlus::UI::DrawBG::;
2984 3260
2985use CFClient::OpenGL; 3261use CFPlus::OpenGL;
2986 3262
2987sub new { 3263sub new {
2988 my $class = shift; 3264 my $class = shift;
2989 3265
2990 my $self = $class->SUPER::new ( 3266 my $self = $class->SUPER::new (
… …
3025sub _draw { 3301sub _draw {
3026 my ($self) = @_; 3302 my ($self) = @_;
3027 3303
3028 return unless $::CONN; 3304 return unless $::CONN;
3029 3305
3306 $self->SUPER::_draw;
3307
3030 my $face; 3308 my $face;
3031 3309
3032 if ($self->{frame}) { 3310 if ($self->{frame}) {
3033 my $anim = $::CONN->{anim}[$self->{anim}]; 3311 my $anim = $::CONN->{anim}[$self->{anim}];
3034 3312
… …
3056 $self->SUPER::destroy; 3334 $self->SUPER::destroy;
3057} 3335}
3058 3336
3059############################################################################# 3337#############################################################################
3060 3338
3061package CFClient::UI::Buttonbar; 3339package CFPlus::UI::Buttonbar;
3062 3340
3063our @ISA = CFClient::UI::HBox::; 3341our @ISA = CFPlus::UI::HBox::;
3064 3342
3065# TODO: should actualyl wrap buttons and other goodies. 3343# TODO: should actually wrap buttons and other goodies.
3066 3344
3067############################################################################# 3345#############################################################################
3068 3346
3069package CFClient::UI::Menu; 3347package CFPlus::UI::Menu;
3070 3348
3071our @ISA = CFClient::UI::FancyFrame::; 3349our @ISA = CFPlus::UI::Toplevel::;
3072 3350
3073use CFClient::OpenGL; 3351use CFPlus::OpenGL;
3074 3352
3075sub new { 3353sub new {
3076 my $class = shift; 3354 my $class = shift;
3077 3355
3078 my $self = $class->SUPER::new ( 3356 my $self = $class->SUPER::new (
3079 items => [], 3357 items => [],
3080 z => 100, 3358 z => 100,
3081 @_, 3359 @_,
3082 ); 3360 );
3083 3361
3084 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3362 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3085 3363
3086 for my $item (@{ $self->{items} }) { 3364 for my $item (@{ $self->{items} }) {
3087 my ($widget, $cb, $tooltip) = @$item; 3365 my ($widget, $cb, $tooltip) = @$item;
3088 3366
3089 # handle various types of items, only text for now 3367 # handle various types of items, only text for now
3090 if (!ref $widget) { 3368 if (!ref $widget) {
3369 if ($widget =~ /\t/) {
3370 my ($left, $right) = split /\t/, $widget, 2;
3371
3091 $widget = new CFClient::UI::Label 3372 $widget = new CFPlus::UI::HBox
3092 can_hover => 1, 3373 can_hover => 1,
3093 can_events => 1, 3374 can_events => 1,
3375 tooltip => $tooltip,
3376 children => [
3377 (new CFPlus::UI::Label markup => $left, expand => 1),
3378 (new CFPlus::UI::Label markup => $right, align => +1),
3379 ],
3380 ;
3381
3382 } else {
3383 $widget = new CFPlus::UI::Label
3384 can_hover => 1,
3385 can_events => 1,
3094 markup => $widget, 3386 markup => $widget,
3095 tooltip => $tooltip 3387 tooltip => $tooltip;
3388 }
3096 } 3389 }
3097 3390
3098 $self->{item}{$widget} = $item; 3391 $self->{item}{$widget} = $item;
3099 3392
3100 $self->{vbox}->add ($widget); 3393 $self->{vbox}->add ($widget);
… …
3143 1 3436 1
3144} 3437}
3145 3438
3146############################################################################# 3439#############################################################################
3147 3440
3148package CFClient::UI::Multiplexer; 3441package CFPlus::UI::Multiplexer;
3149 3442
3150our @ISA = CFClient::UI::Container::; 3443our @ISA = CFPlus::UI::Container::;
3151 3444
3152sub new { 3445sub new {
3153 my $class = shift; 3446 my $class = shift;
3154 3447
3155 my $self = $class->SUPER::new ( 3448 my $self = $class->SUPER::new (
… …
3216 $self->{current}->draw; 3509 $self->{current}->draw;
3217} 3510}
3218 3511
3219############################################################################# 3512#############################################################################
3220 3513
3221package CFClient::UI::Notebook; 3514package CFPlus::UI::Notebook;
3222 3515
3223our @ISA = CFClient::UI::VBox::; 3516our @ISA = CFPlus::UI::VBox::;
3224 3517
3225sub new { 3518sub new {
3226 my $class = shift; 3519 my $class = shift;
3227 3520
3228 my $self = $class->SUPER::new ( 3521 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar), 3522 buttonbar => (new CFPlus::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3523 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self 3524 # filter => # will be put between multiplexer and $self
3232 @_, 3525 @_,
3233 ); 3526 );
3234 3527
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3528 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3241sub add { 3534sub add {
3242 my ($self, $title, $widget, $tooltip) = @_; 3535 my ($self, $title, $widget, $tooltip) = @_;
3243 3536
3244 Scalar::Util::weaken $self; 3537 Scalar::Util::weaken $self;
3245 3538
3246 $self->{buttonbar}->add (new CFClient::UI::Button 3539 $self->{buttonbar}->add (new CFPlus::UI::Button
3247 markup => $title, 3540 markup => $title,
3248 tooltip => $tooltip, 3541 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) }, 3542 on_activate => sub { $self->set_current_page ($widget) },
3250 ); 3543 );
3251 3544
… …
3265 $self->emit (page_changed => $self->{multiplexer}{current}); 3558 $self->emit (page_changed => $self->{multiplexer}{current});
3266} 3559}
3267 3560
3268############################################################################# 3561#############################################################################
3269 3562
3270package CFClient::UI::Combobox; 3563package CFPlus::UI::Selector;
3271 3564
3272use utf8; 3565use utf8;
3273 3566
3274our @ISA = CFClient::UI::Button::; 3567our @ISA = CFPlus::UI::Button::;
3275 3568
3276sub new { 3569sub new {
3277 my $class = shift; 3570 my $class = shift;
3278 3571
3279 my $self = $class->SUPER::new ( 3572 my $self = $class->SUPER::new (
… …
3296 my ($value, $title, $tooltip) = @$_; 3589 my ($value, $title, $tooltip) = @$_;
3297 3590
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3591 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 } 3592 }
3300 3593
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3594 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302} 3595}
3303 3596
3304sub _set_value { 3597sub _set_value {
3305 my ($self, $value) = @_; 3598 my ($self, $value) = @_;
3306 3599
… …
3321 $self->emit (changed => $value); 3614 $self->emit (changed => $value);
3322} 3615}
3323 3616
3324############################################################################# 3617#############################################################################
3325 3618
3326package CFClient::UI::Statusbox; 3619package CFPlus::UI::Statusbox;
3327 3620
3328our @ISA = CFClient::UI::VBox::; 3621our @ISA = CFPlus::UI::VBox::;
3329 3622
3330sub new { 3623sub new {
3331 my $class = shift; 3624 my $class = shift;
3332 3625
3333 my $self = $class->SUPER::new ( 3626 my $self = $class->SUPER::new (
… …
3345sub reorder { 3638sub reorder {
3346 my ($self) = @_; 3639 my ($self) = @_;
3347 my $NOW = Time::HiRes::time; 3640 my $NOW = Time::HiRes::time;
3348 3641
3349 # freeze display when hovering over any label 3642 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner} 3643 return if $CFPlus::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3644 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} }; 3645 values %{ $self->{item} };
3353 3646
3354 while (my ($k, $v) = each %{ $self->{item} }) { 3647 while (my ($k, $v) = each %{ $self->{item} }) {
3355 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3648 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356 } 3649 }
… …
3377 for ($short) { 3670 for ($short) {
3378 s/^\s+//; 3671 s/^\s+//;
3379 s/\s+/ /g; 3672 s/\s+/ /g;
3380 } 3673 }
3381 3674
3382 new CFClient::UI::Label 3675 new CFPlus::UI::Label
3383 markup => $short, 3676 markup => $short,
3384 tooltip => $item->{tooltip}, 3677 tooltip => $item->{tooltip},
3385 tooltip_font => $::FONT_PROP, 3678 tooltip_font => $::FONT_PROP,
3386 tooltip_width => 0.67, 3679 tooltip_width => 0.67,
3387 fontsize => $item->{fontsize} || $self->{fontsize}, 3680 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3466 $self->SUPER::destroy; 3759 $self->SUPER::destroy;
3467} 3760}
3468 3761
3469############################################################################# 3762#############################################################################
3470 3763
3471package CFClient::UI::Inventory;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3635package CFClient::UI::Root; 3764package CFPlus::UI::Root;
3636 3765
3637our @ISA = CFClient::UI::Container::; 3766our @ISA = CFPlus::UI::Container::;
3638 3767
3639use List::Util qw(min max); 3768use List::Util qw(min max);
3640 3769
3641use CFClient::OpenGL; 3770use CFPlus::OpenGL;
3642 3771
3643sub new { 3772sub new {
3644 my $class = shift; 3773 my $class = shift;
3645 3774
3646 my $self = $class->SUPER::new ( 3775 my $self = $class->SUPER::new (
… …
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823 3952
3824 $w = 0 if $w < 0; 3953 $w = 0 if $w < 0;
3825 $h = 0 if $h < 0; 3954 $h = 0 if $h < 0;
3826 3955
3956 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h;
3958
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964
3827 $w = int $w + 0.5; 3965 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 3966 $h = int $h + 0.5;
3829 3967
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w}; 3969 $widget->{old_w} = $widget->{w};
… …
3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3992 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855 glMatrixMode GL_MODELVIEW; 3993 glMatrixMode GL_MODELVIEW;
3856 glLoadIdentity; 3994 glLoadIdentity;
3857 3995
3858 { 3996 {
3859 package CFClient::UI::Base; 3997 package CFPlus::UI::Base;
3860 3998
3861 ($draw_x, $draw_y, $draw_w, $draw_h) = 3999 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h}); 4000 (0, 0, $self->{w}, $self->{h});
3863 }
3864 4001
3865 $self->_draw; 4002 $self->_draw;
4003 }
3866} 4004}
3867 4005
3868############################################################################# 4006#############################################################################
3869 4007
3870package CFClient::UI; 4008package CFPlus::UI;
3871 4009
3872$ROOT = new CFClient::UI::Root; 4010$ROOT = new CFPlus::UI::Root;
3873$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4011$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874 4012
38751 40131
3876 4014

Diff Legend

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