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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 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 CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->cb->();
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
98 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
100 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $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; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
193 reconfigure_widgets; 207 reconfigure_widgets;
194} 208}
195 209
196############################################################################# 210#############################################################################
197 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
198package CFClient::UI::Base; 220package CFPlus::UI::Base;
199 221
200use strict; 222use strict;
201 223
202use CFClient::OpenGL; 224use CFPlus::OpenGL;
203 225
204sub new { 226sub new {
205 my $class = shift; 227 my $class = shift;
206 228
207 my $self = bless { 229 my $self = bless {
… …
212 h => undef, 234 h => undef,
213 can_events => 1, 235 can_events => 1,
214 @_ 236 @_
215 }, $class; 237 }, $class;
216 238
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 240
219 for (keys %$self) { 241 for (keys %$self) {
220 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
222 } 244 }
223 } 245 }
224 246
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 248 $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}; 249 $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}; 250 $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}; 251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 252
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 255
234 $self->show if $layout->{show}; 256 $self->show if $layout->{show};
… …
247sub show { 269sub show {
248 my ($self) = @_; 270 my ($self) = @_;
249 271
250 return if $self->{parent}; 272 return if $self->{parent};
251 273
252 $CFClient::UI::ROOT->add ($self); 274 $CFPlus::UI::ROOT->add ($self);
253} 275}
254 276
255sub set_visible { 277sub set_visible {
256 my ($self) = @_; 278 my ($self) = @_;
257 279
… …
278 delete $self->{root}; 300 delete $self->{root};
279 301
280 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
282 304
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 305 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
285 307
286 $self->emit ("focus_out"); 308 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
… …
345 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
346 368
347 if ($self->{aspect}) { 369 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
349 371
350 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 374
353 # use alignment to adjust x, y 375 # use alignment to adjust x, y
354 376
355 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
397 419
398 return if $self->{tooltip} eq $tooltip; 420 return if $self->{tooltip} eq $tooltip;
399 421
400 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
401 423
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 426 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 427 }
406} 428}
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
443 Carp::confess unless $self->{parent};#d#
444
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 446}
421 447
422sub invoke_focus_in { 448sub invoke_focus_in {
423 my ($self) = @_; 449 my ($self) = @_;
424 450
425 return if $FOCUS == $self; 451 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
427 453
428 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
429 455
430 $focus->update if $focus; 456 $self->update;
431 $FOCUS->update;
432 457
433 0 458 0
434} 459}
435 460
436sub invoke_focus_out { 461sub invoke_focus_out {
437 my ($self) = @_; 462 my ($self) = @_;
438 463
439 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
440 465
441 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
442 467
443 $focus->update if $focus; #? 468 $self->update;
444 469
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 471 unless $FOCUS;
447 472
448 0 473 0
449} 474}
450 475
451sub grab_focus { 476sub grab_focus {
452 my ($self) = @_; 477 my ($self) = @_;
453 478
479 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 480 $self->emit ("focus_in");
455} 481}
456 482
457sub invoke_mouse_motion { 1 } 483sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 484sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 485sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
461 488
462sub invoke_button_down { 489sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
464 491
465 $self->grab_focus; 492 $self->grab_focus;
466 493
467 1 494 0
468} 495}
469 496
470sub connect { 497sub connect {
471 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
472 499
473 push @{ $self->{signal_cb}{$signal} }, $cb; 500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
474} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
475 514
476sub emit { 515sub emit {
477 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
478 517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
479 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 531}
484 532
485sub find_widget { 533sub find_widget {
486 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
487 535
… …
571 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
574 glEnd; 622 glEnd;
575 glPopMatrix; 623 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 625 }
578 626
579 $self->_draw; 627 $self->_draw;
580 glPopMatrix; 628 glPopMatrix;
581} 629}
… …
587} 635}
588 636
589sub DESTROY { 637sub DESTROY {
590 my ($self) = @_; 638 my ($self) = @_;
591 639
640 return if CFPlus::in_destruct;
641
592 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
593 643
594 eval { $self->destroy }; 644 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 646}
597 647
598############################################################################# 648#############################################################################
599 649
600package CFClient::UI::DrawBG; 650package CFPlus::UI::DrawBG;
601 651
602our @ISA = CFClient::UI::Base::; 652our @ISA = CFPlus::UI::Base::;
603 653
604use strict; 654use strict;
605use CFClient::OpenGL; 655use CFPlus::OpenGL;
606 656
607sub new { 657sub new {
608 my $class = shift; 658 my $class = shift;
609 659
610 # range [value, low, high, page] 660 # range [value, low, high, page]
… …
641 } 691 }
642} 692}
643 693
644############################################################################# 694#############################################################################
645 695
646package CFClient::UI::Empty; 696package CFPlus::UI::Empty;
647 697
648our @ISA = CFClient::UI::Base::; 698our @ISA = CFPlus::UI::Base::;
649 699
650sub new { 700sub new {
651 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
653} 703}
… …
660 710
661sub draw { } 711sub draw { }
662 712
663############################################################################# 713#############################################################################
664 714
665package CFClient::UI::Container; 715package CFPlus::UI::Container;
666 716
667our @ISA = CFClient::UI::Base::; 717our @ISA = CFPlus::UI::Base::;
668 718
669sub new { 719sub new {
670 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
671 721
672 my $children = delete $arg{children}; 722 my $children = delete $arg{children};
… …
681 if $children; 731 if $children;
682 732
683 $self 733 $self
684} 734}
685 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
686sub add { 744sub add {
687 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
688 746
689 $_->set_parent ($self) 747 $_->set_parent ($self)
690 for @widgets; 748 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 808 $_->draw for @{$self->{children}};
751} 809}
752 810
753############################################################################# 811#############################################################################
754 812
755package CFClient::UI::Bin; 813package CFPlus::UI::Bin;
756 814
757our @ISA = CFClient::UI::Container::; 815our @ISA = CFPlus::UI::Container::;
758 816
759sub new { 817sub new {
760 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
761 819
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 821
764 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
765} 823}
766 824
767sub add { 825sub add {
… …
774sub remove { 832sub remove {
775 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
776 834
777 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
778 836
779 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 838 unless @{$self->{children}};
781} 839}
782 840
783sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
784 842
… …
796 854
797############################################################################# 855#############################################################################
798 856
799# back-buffered drawing area 857# back-buffered drawing area
800 858
801package CFClient::UI::Window; 859package CFPlus::UI::Window;
802 860
803our @ISA = CFClient::UI::Bin::; 861our @ISA = CFPlus::UI::Bin::;
804 862
805use CFClient::OpenGL; 863use CFPlus::OpenGL;
806 864
807sub new { 865sub new {
808 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
809 867
810 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
832} 890}
833 891
834sub render_child { 892sub render_child {
835 my ($self) = @_; 893 my ($self) = @_;
836 894
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
840 898
841 { 899 {
842 package CFClient::UI::Base; 900 package CFPlus::UI::Base;
843 901
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 902 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
846 } 904 }
847 905
… …
866 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
867} 925}
868 926
869############################################################################# 927#############################################################################
870 928
871package CFClient::UI::ViewPort; 929package CFPlus::UI::ViewPort;
872 930
873our @ISA = CFClient::UI::Window::; 931our @ISA = CFPlus::UI::Window::;
874 932
875sub new { 933sub new {
876 my $class = shift; 934 my $class = shift;
877 935
878 $class->SUPER::new ( 936 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 998 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1000 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1002 }
945} 1003}
946 1004
947sub _render { 1005sub _render {
948 my ($self) = @_; 1006 my ($self) = @_;
949 1007
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1008 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}; 1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1010
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1012
955 $self->SUPER::_render; 1013 $self->SUPER::_render;
956} 1014}
957 1015
958############################################################################# 1016#############################################################################
959 1017
960package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
961 1019
962our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::HBox::;
963 1021
964sub new { 1022sub new {
965 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
966 1024
967 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
968 1026
969 my $self; 1027 my $self;
970 1028
971 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1030 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1032 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
976 }, 1034 },
977 ; 1035 ;
978 1036
979 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1,
981 slider => $slider, 1040 slider => $slider,
982 %arg, 1041 %arg,
983 ); 1042 );
984 1043
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
… …
994 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
995 1054
996 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
997} 1056}
998 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
999sub update_slider { 1068sub update_slider {
1000 my ($self) = @_; 1069 my ($self) = @_;
1001 1070
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1072}
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1088}
1020 1089
1021############################################################################# 1090#############################################################################
1022 1091
1023package CFClient::UI::Frame; 1092package CFPlus::UI::Frame;
1024 1093
1025our @ISA = CFClient::UI::Bin::; 1094our @ISA = CFPlus::UI::Bin::;
1026 1095
1027use CFClient::OpenGL; 1096use CFPlus::OpenGL;
1028 1097
1029sub new { 1098sub new {
1030 my $class = shift; 1099 my $class = shift;
1031 1100
1032 $class->SUPER::new ( 1101 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1127 $self->SUPER::_draw;
1059} 1128}
1060 1129
1061############################################################################# 1130#############################################################################
1062 1131
1063package CFClient::UI::FancyFrame; 1132package CFPlus::UI::FancyFrame;
1064 1133
1065our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1066 1135
1067use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1068 1137
1069my $bg = 1138my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1140 mipmap => 1, wrap => 1;
1072 1141
1073my @border = 1142my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 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); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1145
1077sub new { 1146sub new {
1078 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1079 1148
1080 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1152 border => 0.6,
1084 can_events => 1, 1153 can_events => 1,
1085 min_w => 16, 1154 min_w => 64,
1086 min_h => 16, 1155 min_h => 32,
1087 %arg, 1156 %arg,
1088 ); 1157 );
1089 1158
1090 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1160 align => 0,
1092 valign => 1, 1161 valign => 1,
1093 text => $self->{title}, 1162 text => $self->{title},
1094 fontsize => $self->{border}, 1163 fontsize => $self->{border},
1095 if exists $self->{title}; 1164 if exists $self->{title};
1096 1165
1097 if ($self->{has_close_button}) { 1166 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1167 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1168 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1169 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1170 on_activate => sub { $self->emit ("delete") };
1102 1171
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1172 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1173 }
1105 1174
1106 $self 1175 $self
1107} 1176}
1108 1177
1109sub add { 1178sub add {
1110 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1111 1180
1112 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1182 $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}; 1183 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1184}
1116 1185
1117sub border { 1186sub border {
1118 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1119} 1188}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1153 1222
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1224 if $self->{close_button};
1156 1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1157 1 1234 1
1158} 1235}
1159 1236
1160sub invoke_button_down { 1237sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1297
1221 ! ! $self->{motion} 1298 ! ! $self->{motion}
1222} 1299}
1223 1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1307}
1308
1224sub _draw { 1309sub _draw {
1225 my ($self) = @_; 1310 my ($self) = @_;
1226 1311
1227 my $child = $self->{children}[0]; 1312 my $child = $self->{children}[0];
1228 1313
… …
1265 if $self->{close_button}; 1350 if $self->{close_button};
1266} 1351}
1267 1352
1268############################################################################# 1353#############################################################################
1269 1354
1270package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1271 1356
1272our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1273 1358
1274use List::Util qw(max sum); 1359use List::Util qw(max sum);
1275 1360
1276use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1277 1362
1278sub new { 1363sub new {
1279 my $class = shift; 1364 my $class = shift;
1280 1365
1281 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1287sub children { 1372sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1374}
1290 1375
1291sub add { 1376sub add {
1292 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1293 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1381 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1296 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1387 $self->realloc;
1298} 1388}
1299 1389
1300sub remove { 1390sub remove {
1301 my ($self, $child) = @_; 1391 my ($self, $child) = @_;
… …
1366 1456
1367 # linearly scale sizes 1457 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1460
1371 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1372 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1373 1463
1374 my $y; 1464 my $y;
1375 1465
1376 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1420 } 1510 }
1421} 1511}
1422 1512
1423############################################################################# 1513#############################################################################
1424 1514
1425package CFClient::UI::Box; 1515package CFPlus::UI::Box;
1426 1516
1427our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1428 1518
1429sub size_request { 1519sub size_request {
1430 my ($self) = @_; 1520 my ($self) = @_;
1431 1521
1432 $self->{vertical} 1522 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1556 for 0 .. $#children;
1467 } 1557 }
1468 } 1558 }
1469 1559
1470 CFClient::UI::harmonize \@req; 1560 CFPlus::UI::harmonize \@req;
1471 1561
1472 my $pos = 0; 1562 my $pos = 0;
1473 for (0 .. $#children) { 1563 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1570 1
1481} 1571}
1482 1572
1483############################################################################# 1573#############################################################################
1484 1574
1485package CFClient::UI::HBox; 1575package CFPlus::UI::HBox;
1486 1576
1487our @ISA = CFClient::UI::Box::; 1577our @ISA = CFPlus::UI::Box::;
1488 1578
1489sub new { 1579sub new {
1490 my $class = shift; 1580 my $class = shift;
1491 1581
1492 $class->SUPER::new ( 1582 $class->SUPER::new (
… …
1495 ) 1585 )
1496} 1586}
1497 1587
1498############################################################################# 1588#############################################################################
1499 1589
1500package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1501 1591
1502our @ISA = CFClient::UI::Box::; 1592our @ISA = CFPlus::UI::Box::;
1503 1593
1504sub new { 1594sub new {
1505 my $class = shift; 1595 my $class = shift;
1506 1596
1507 $class->SUPER::new ( 1597 $class->SUPER::new (
… …
1510 ) 1600 )
1511} 1601}
1512 1602
1513############################################################################# 1603#############################################################################
1514 1604
1515package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1516 1606
1517our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1518 1608
1519use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1520 1610
1521sub new { 1611sub new {
1522 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1523 1613
1524 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1528 #font => default_font 1618 #font => default_font
1529 #text => initial text 1619 #text => initial text
1530 #markup => initial narkup 1620 #markup => initial narkup
1531 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1532 ellipsise => 3, # end 1622 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1624 fontsize => 1,
1535 align => -1, 1625 align => -1,
1536 valign => -1, 1626 valign => -1,
1537 padding_x => 2, 1627 padding_x => 2,
1538 padding_y => 2, 1628 padding_y => 2,
1539 can_events => 0, 1629 can_events => 0,
1540 %arg 1630 %arg
1541 ); 1631 );
1542 1632
1543 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1636 $self->{template} = $layout;
1547 } 1637 }
1548 1638
1549 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1553 } 1643 }
1554 1644
1555 $self 1645 $self
1556} 1646}
1557 1647
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1648sub update {
1569 my ($self) = @_; 1649 my ($self) = @_;
1570 1650
1571 delete $self->{texture}; 1651 delete $self->{texture};
1572 $self->SUPER::update; 1652 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1584 1664
1585 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1587 1667
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1590 1669
1591 delete $self->{size_req}; 1670 delete $self->{size_req};
1592 $self->realloc; 1671 $self->realloc;
1593 $self->update; 1672 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1601 1680
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1682
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1606 1684
1607 delete $self->{size_req}; 1685 delete $self->{size_req};
1608 $self->realloc; 1686 $self->realloc;
1609 $self->update; 1687 $self->update;
… …
1621 1699
1622 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1623 1701
1624 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1706
1628 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1629 1708
1630 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
… …
1654 1733
1655sub set_fontsize { 1734sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1657 1736
1658 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1659 delete $self->{texture}; 1739 delete $self->{texture};
1660 1740
1661 $self->realloc; 1741 $self->realloc;
1662} 1742}
1663 1743
1664sub reconfigure { 1744sub reconfigure {
1665 my ($self) = @_; 1745 my ($self) = @_;
1666 1746
1667 delete $self->{size_req}; 1747 delete $self->{size_req};
1748 delete $self->{texture};
1668 1749
1669 $self->SUPER::reconfigure; 1750 $self->SUPER::reconfigure;
1670} 1751}
1671 1752
1672sub _draw { 1753sub _draw {
1673 my ($self) = @_; 1754 my ($self) = @_;
1674 1755
1675 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1676 1757
1677 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1765
1685 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1686 }; 1767 };
1687 1768
1688 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1692 1773
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1777 };
1697 1778
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1781
1703 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1783}
1714 1784
1715############################################################################# 1785#############################################################################
1716 1786
1717package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1718 1788
1719our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1720 1790
1721use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1722 1792
1723sub new { 1793sub new {
1724 my $class = shift; 1794 my $class = shift;
1725 1795
1726 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1788 1858
1789 if ($uni == 8) { 1859 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1798 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1800 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 1872 $self->emit ('escape');
1803 } elsif ($uni) { 1873 } elsif ($uni) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
… …
1828 1898
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 1900
1831 # byte-index to char-index 1901 # byte-index to char-index
1832 my $text = $self->{text}; 1902 my $text = $self->{text};
1833 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1835 1905
1836 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1837 $self->update; 1907 $self->update;
1838 1908
1839 1 1909 1
… …
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 1957 glEnd;
1888 } 1958 }
1889} 1959}
1890 1960
1891package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1892 1962
1893our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1894 1964
1895use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1896 1966
1897sub invoke_key_down { 1967sub invoke_key_down {
1898 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1899 1969
1900 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
… …
1906 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 1978 $self->emit (activate => $txt);
1909 $self->update; 1979 $self->update;
1910 1980
1911 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1914 } 1984 }
1915 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 1989 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 1991 }
1922 1992
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 1996
1927 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2007 1
1938} 2008}
1939 2009
1940############################################################################# 2010#############################################################################
1941 2011
1942package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1943 2013
1944our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1945 2015
1946use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1947 2017
1948my @tex = 2018my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1951 2021
1952sub new { 2022sub new {
1953 my $class = shift; 2023 my $class = shift;
1954 2024
… …
1991 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1992} 2062}
1993 2063
1994############################################################################# 2064#############################################################################
1995 2065
2066package CFPlus::UI::CheckBox;
2067
2068our @ISA = CFPlus::UI::DrawBG::;
2069
2070my @tex =
2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073
2074use CFPlus::OpenGL;
2075
2076sub new {
2077 my $class = shift;
2078
2079 $class->SUPER::new (
2080 padding_x => 2,
2081 padding_y => 2,
2082 fg => [1, 1, 1],
2083 active_fg => [1, 1, 0],
2084 bg => [0, 0, 0, 0.2],
2085 active_bg => [1, 1, 1, 0.5],
2086 state => 0,
2087 can_hover => 1,
2088 @_
2089 )
2090}
2091
2092sub size_request {
2093 my ($self) = @_;
2094
2095 (6) x 2
2096}
2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
2106sub invoke_button_down {
2107 my ($self, $ev, $x, $y) = @_;
2108
2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2111 $self->toggle;
2112 } else {
2113 return 0
2114 }
2115
2116 1
2117}
2118
2119sub _draw {
2120 my ($self) = @_;
2121
2122 $self->SUPER::_draw;
2123
2124 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2125
2126 my ($w, $h) = @$self{qw(w h)};
2127
2128 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2129
2130 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2131
2132 my $tex = $self->{state} ? $tex[1] : $tex[0];
2133
2134 glEnable GL_TEXTURE_2D;
2135 $tex->draw_quad_alpha (0, 0, $s, $s);
2136 glDisable GL_TEXTURE_2D;
2137}
2138
2139#############################################################################
2140
2141package CFPlus::UI::Image;
2142
2143our @ISA = CFPlus::UI::Base::;
2144
2145use CFPlus::OpenGL;
2146
2147our %texture_cache;
2148
2149sub new {
2150 my $class = shift;
2151
2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2156
2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2159
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162
2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2164
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166
2167 $self
2168}
2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
2185sub size_request {
2186 my ($self) = @_;
2187
2188 ($self->{tex}{w}, $self->{tex}{h})
2189}
2190
2191sub _draw {
2192 my ($self) = @_;
2193
2194 my $tex = $self->{tex};
2195
2196 my ($w, $h) = ($self->{w}, $self->{h});
2197
2198 if ($self->{rot90}) {
2199 glRotate 90, 0, 0, 1;
2200 glTranslate 0, -$self->{w}, 0;
2201
2202 ($w, $h) = ($h, $w);
2203 }
2204
2205 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207
2208 $tex->draw_quad (0, 0, $w, $h);
2209
2210 glDisable GL_TEXTURE_2D;
2211}
2212
2213#############################################################################
2214
1996package CFClient::UI::ImageButton; 2215package CFPlus::UI::ImageButton;
1997 2216
1998our @ISA = CFClient::UI::Image::; 2217our @ISA = CFPlus::UI::Image::;
1999 2218
2000use CFClient::OpenGL; 2219use CFPlus::OpenGL;
2001 2220
2002my %textures; 2221my %textures;
2003 2222
2004sub new { 2223sub new {
2005 my $class = shift; 2224 my $class = shift;
… …
2027 1 2246 1
2028} 2247}
2029 2248
2030############################################################################# 2249#############################################################################
2031 2250
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2251package CFPlus::UI::VGauge;
2101 2252
2102our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2254
2163use List::Util qw(min max); 2255use List::Util qw(min max);
2164 2256
2165use CFClient::OpenGL; 2257use CFPlus::OpenGL;
2166 2258
2167my %tex = ( 2259my %tex = (
2168 food => [ 2260 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2263 ],
2172 grace => [ 2264 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2267 ],
2176 hp => [ 2268 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2271 ],
2180 mana => [ 2272 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2275 ],
2184); 2276);
2185 2277
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2340
2249 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2346
2252 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2274 2369
2275 if ($t3) { 2370 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2377 glEnd;
2283 } 2378 }
2284 2379
2285 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2287} 2382}
2288 2383
2289############################################################################# 2384#############################################################################
2290 2385
2291package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2292 2387
2293our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2294 2389
2295sub new { 2390sub new {
2296 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2297 2392
2298 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2395 can_hover => 1,
2301 can_events => 1, 2396 can_events => 1,
2302 %arg, 2397 %arg,
2303 ); 2398 );
2304 2399
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2400 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2401 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2402 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2403
2309 $self 2404 $self
2310} 2405}
2311 2406
2312sub set_fontsize { 2407sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2334} 2429}
2335 2430
2336############################################################################# 2431#############################################################################
2337 2432
2338package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2339 2434
2340use strict; 2435use strict;
2341 2436
2342use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2343 2438
2344our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2345 2440
2346my @tex = 2441my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2349 2444
2350sub new { 2445sub new {
2351 my $class = shift; 2446 my $class = shift;
2352 2447
… …
2441 } 2536 }
2442 2537
2443 1 2538 1
2444} 2539}
2445 2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2549}
2550
2446sub update { 2551sub update {
2447 my ($self) = @_; 2552 my ($self) = @_;
2448 2553
2449 delete $self->{knob_w}; 2554 delete $self->{knob_w};
2450 $self->SUPER::update; 2555 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2498} 2603}
2499 2604
2500############################################################################# 2605#############################################################################
2501 2606
2502package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2503 2608
2504our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2505 2610
2506sub new { 2611sub new {
2507 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2508 2613
2509 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2510 2615
2511 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2619 to_value => sub { shift },
2515 from_value => sub { shift }, 2620 from_value => sub { shift },
2516 %arg, 2621 %arg,
2517 ); 2622 );
2518 2623
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2540 2645
2541############################################################################# 2646#############################################################################
2542 2647
2543package CFClient::UI::TextScroller; 2648package CFPlus::UI::TextScroller;
2544 2649
2545our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2546 2651
2547use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2548 2653
2549sub new { 2654sub new {
2550 my $class = shift; 2655 my $class = shift;
2551 2656
2552 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2553 fontsize => 1, 2658 fontsize => 1,
2554 can_events => 0, 2659 can_events => 1,
2555 indent => 0, 2660 indent => 0,
2556 #font => default_font 2661 #font => default_font
2557 @_, 2662 @_,
2558 2663
2559 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2560 par => [], 2665 par => [],
2561 height => 0, 2666 height => 0,
2562 children => [ 2667 children => [
2563 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2565 ], 2670 ],
2566 ); 2671 );
2567 2672
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2569 2674
… …
2599 2704
2600 $self->reflow; 2705 $self->reflow;
2601 2706
2602 local $self->{children} = [$empty, $slider]; 2707 local $self->{children} = [$empty, $slider];
2603 $self->SUPER::invoke_size_allocate ($w, $h) 2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2604} 2719}
2605 2720
2606sub get_layout { 2721sub get_layout {
2607 my ($self, $para) = @_; 2722 my ($self, $para) = @_;
2608 2723
… …
2648 $self->{height} = 0; 2763 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 2765}
2651 2766
2652sub add_paragraph { 2767sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 2768 my $self = shift;
2654 2769
2655 my ($text, @w) = ref $para ? @$para : $para; 2770 for my $para (@_) {
2656
2657 $para = { 2771 $para = {
2772 fg => [1, 1, 1, 1],
2773 indent => 0,
2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 2777 w => 1e10,
2659 wrapped => 1, 2778 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 2779 };
2665 2780
2666 $self->add (@w) if @w; 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 push @{$self->{par}}, $para; 2782 push @{$self->{par}}, $para;
2783 }
2668 2784
2669 $self->{need_reflow}++; 2785 $self->{need_reflow}++;
2670 $self->update; 2786 $self->update;
2671} 2787}
2672 2788
… …
2714 2830
2715 if (delete $self->{scroll_to_bottom}) { 2831 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10); 2832 $self->{children}[1]->set_value (1e10);
2717 } 2833 }
2718 2834
2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 2836 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2722 2838
2723 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2724 2840
2725 my $y0 = $top; 2841 my $y0 = $top;
2726 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2727 2843
2728 my $y = 0; 2844 my $y = 0;
2729 2845
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 2847 my $h = $para->{h};
2736 2848
2737 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2738 2850
2739 my $layout = $self->get_layout ($para); 2851 my $layout = $self->get_layout ($para);
2740 2852
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 2854
2746 if (my @w = @{ $para->{widget} }) { 2855 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 2856 my @s = $layout->get_shapes;
2748 2857
2749 glDisable GL_BLEND;
2750 for (@w) { 2858 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 2859 my ($dx, $dy) = splice @s, 0, 2, ();
2752 2860
2753 $_->{x} = $dx + $para->{indent}; 2861 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 2862 $_->{y} = $dy + $y - $y0;
2755 2863
2756 $_->draw; 2864 $_->draw;
2757 } 2865 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 2866 }
2761 } 2867 }
2762 2868
2763 $y += $h; 2869 $y += $h;
2764 } 2870 }
2765
2766 glDisable GL_BLEND;
2767 }; 2871 };
2768 }); 2872 });
2769} 2873}
2770 2874
2771sub reconfigure { 2875sub reconfigure {
… …
2789 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2790} 2894}
2791 2895
2792############################################################################# 2896#############################################################################
2793 2897
2794package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2795 2899
2796use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2797 2901
2798our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2799 2903
2800sub moveto { 2904sub moveto {
2801 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2802 2906
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 2935 glPopMatrix;
2832} 2936}
2833 2937
2834############################################################################# 2938#############################################################################
2835 2939
2836package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2837 2941
2838our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2839 2943
2840sub new { 2944sub new {
2841 my $class = shift; 2945 my $class = shift;
2842 2946
2843 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2856} 2960}
2857 2961
2858############################################################################# 2962#############################################################################
2859 2963
2860package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2861 2965
2862our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2863 2967
2864use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2865 2969
2866sub new { 2970sub new {
2867 my $class = shift; 2971 my $class = shift;
2868 2972
2869 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2885 } 2989 }
2886 2990
2887 $tooltip =~ s/^\n+//; 2991 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 2992 $tooltip =~ s/\n+$//;
2889 2993
2890 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2891 markup => $tooltip, 2995 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8, 2997 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2895 ellipsise => 0, 2999 ellipsise => 0,
… …
2918 3022
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2921 or return; 3025 or return;
2922 3026
3027 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3029
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3031 if $x + $self->{w} > $self->{root}{w};
2927 3032
2928 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2929 }); 3037 });
2930} 3038}
2931 3039
2932sub _draw { 3040sub _draw {
2933 my ($self) = @_; 3041 my ($self) = @_;
… …
2957 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2958} 3066}
2959 3067
2960############################################################################# 3068#############################################################################
2961 3069
2962package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2963 3071
2964our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2965 3073
2966use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2967 3075
2968sub new { 3076sub new {
2969 my $class = shift; 3077 my $class = shift;
2970 3078
2971 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
3006sub _draw { 3114sub _draw {
3007 my ($self) = @_; 3115 my ($self) = @_;
3008 3116
3009 return unless $::CONN; 3117 return unless $::CONN;
3010 3118
3119 $self->SUPER::_draw;
3120
3011 my $face; 3121 my $face;
3012 3122
3013 if ($self->{frame}) { 3123 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
3015 3125
… …
3037 $self->SUPER::destroy; 3147 $self->SUPER::destroy;
3038} 3148}
3039 3149
3040############################################################################# 3150#############################################################################
3041 3151
3042package CFClient::UI::Buttonbar; 3152package CFPlus::UI::Buttonbar;
3043 3153
3044our @ISA = CFClient::UI::HBox::; 3154our @ISA = CFPlus::UI::HBox::;
3045 3155
3046# TODO: should actualyl wrap buttons and other goodies. 3156# TODO: should actualyl wrap buttons and other goodies.
3047 3157
3048############################################################################# 3158#############################################################################
3049 3159
3050package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
3051 3161
3052our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
3053 3163
3054use CFClient::OpenGL; 3164use CFPlus::OpenGL;
3055 3165
3056sub new { 3166sub new {
3057 my $class = shift; 3167 my $class = shift;
3058 3168
3059 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
3060 items => [], 3170 items => [],
3061 z => 100, 3171 z => 100,
3062 @_, 3172 @_,
3063 ); 3173 );
3064 3174
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066 3176
3067 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
3069 3179
3070 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
3071 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
3072 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
3073 can_hover => 1, 3186 can_hover => 1,
3074 can_events => 1, 3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
3196 $widget = new CFPlus::UI::Label
3197 can_hover => 1,
3198 can_events => 1,
3075 markup => $widget, 3199 markup => $widget,
3076 tooltip => $tooltip 3200 tooltip => $tooltip;
3201 }
3077 } 3202 }
3078 3203
3079 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
3080 3205
3081 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
3124 1 3249 1
3125} 3250}
3126 3251
3127############################################################################# 3252#############################################################################
3128 3253
3129package CFClient::UI::Multiplexer; 3254package CFPlus::UI::Multiplexer;
3130 3255
3131our @ISA = CFClient::UI::Container::; 3256our @ISA = CFPlus::UI::Container::;
3132 3257
3133sub new { 3258sub new {
3134 my $class = shift; 3259 my $class = shift;
3135 3260
3136 my $self = $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
… …
3150 3275
3151 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3277 if @{ $self->{children} };
3153} 3278}
3154 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
3155sub set_current_page { 3286sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
3157 3288
3158 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3290 ? $page_or_widget
… …
3191 $self->{current}->draw; 3322 $self->{current}->draw;
3192} 3323}
3193 3324
3194############################################################################# 3325#############################################################################
3195 3326
3196package CFClient::UI::Notebook; 3327package CFPlus::UI::Notebook;
3197 3328
3198our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFPlus::UI::VBox::;
3199 3330
3200sub new { 3331sub new {
3201 my $class = shift; 3332 my $class = shift;
3202 3333
3203 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFPlus::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self 3337 # filter => # will be put between multiplexer and $self
3207 @_, 3338 @_,
3208 ); 3339 );
3209 3340
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3216sub add { 3347sub add {
3217 my ($self, $title, $widget, $tooltip) = @_; 3348 my ($self, $title, $widget, $tooltip) = @_;
3218 3349
3219 Scalar::Util::weaken $self; 3350 Scalar::Util::weaken $self;
3220 3351
3221 $self->{buttonbar}->add (new CFClient::UI::Button 3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3222 markup => $title, 3353 markup => $title,
3223 tooltip => $tooltip, 3354 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3355 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3356 );
3226 3357
3227 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3228} 3359}
3229 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3230sub set_current_page { 3367sub set_current_page {
3231 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3232 3369
3233 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 3372}
3236 3373
3237############################################################################# 3374#############################################################################
3238 3375
3239package CFClient::UI::Combobox; 3376package CFPlus::UI::Selector;
3240 3377
3241use utf8; 3378use utf8;
3242 3379
3243our @ISA = CFClient::UI::Button::; 3380our @ISA = CFPlus::UI::Button::;
3244 3381
3245sub new { 3382sub new {
3246 my $class = shift; 3383 my $class = shift;
3247 3384
3248 my $self = $class->SUPER::new ( 3385 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 3402 my ($value, $title, $tooltip) = @$_;
3266 3403
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 3405 }
3269 3406
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3407 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 3408}
3272 3409
3273sub _set_value { 3410sub _set_value {
3274 my ($self, $value) = @_; 3411 my ($self, $value) = @_;
3275 3412
… …
3290 $self->emit (changed => $value); 3427 $self->emit (changed => $value);
3291} 3428}
3292 3429
3293############################################################################# 3430#############################################################################
3294 3431
3295package CFClient::UI::Statusbox; 3432package CFPlus::UI::Statusbox;
3296 3433
3297our @ISA = CFClient::UI::VBox::; 3434our @ISA = CFPlus::UI::VBox::;
3298 3435
3299sub new { 3436sub new {
3300 my $class = shift; 3437 my $class = shift;
3301 3438
3302 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
… …
3314sub reorder { 3451sub reorder {
3315 my ($self) = @_; 3452 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 3453 my $NOW = Time::HiRes::time;
3317 3454
3318 # freeze display when hovering over any label 3455 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 3456 return if $CFPlus::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 3458 values %{ $self->{item} };
3322 3459
3323 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 3462 }
… …
3346 for ($short) { 3483 for ($short) {
3347 s/^\s+//; 3484 s/^\s+//;
3348 s/\s+/ /g; 3485 s/\s+/ /g;
3349 } 3486 }
3350 3487
3351 new CFClient::UI::Label 3488 new CFPlus::UI::Label
3352 markup => $short, 3489 markup => $short,
3353 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3410 count => 1, 3547 count => 1,
3411 %arg, 3548 %arg,
3412 }; 3549 };
3413 } 3550 }
3414 3551
3552 $ROOT->on_refresh (reorder => sub {
3415 $self->reorder; 3553 $self->reorder;
3554 });
3416} 3555}
3417 3556
3418sub reconfigure { 3557sub reconfigure {
3419 my ($self) = @_; 3558 my ($self) = @_;
3420 3559
… …
3433 $self->SUPER::destroy; 3572 $self->SUPER::destroy;
3434} 3573}
3435 3574
3436############################################################################# 3575#############################################################################
3437 3576
3438package CFClient::UI::Inventory; 3577package CFPlus::UI::Inventory;
3439 3578
3440our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFPlus::UI::Table::;
3441 3580
3442sub new { 3581sub new {
3443 my $class = shift; 3582 my $class = shift;
3444 3583
3445 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3447 @_, 3587 @_,
3448 ); 3588 );
3449 3589
3590 $self->set_sort_order (undef);
3591
3450 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3451} 3628}
3452 3629
3453sub set_items { 3630sub set_items {
3454 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3455 3632
3456 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3457 return unless $items; 3634 $self->update_items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476} 3635}
3477 3636
3478############################################################################# 3637#############################################################################
3479 3638
3480package CFClient::UI::SpellList; 3639package CFPlus::UI::SpellList;
3481 3640
3482our @ISA = CFClient::UI::Table::; 3641our @ISA = CFPlus::UI::Table::;
3483 3642
3484sub new { 3643sub new {
3485 my $class = shift; 3644 my $class = shift;
3486 3645
3487 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506 3665
3507sub rebuild_spell_list { 3666sub rebuild_spell_list {
3508 my ($self) = @_; 3667 my ($self) = @_;
3509 3668
3510 $CFClient::UI::ROOT->on_refresh ($self => sub { 3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear; 3670 $self->clear;
3512 3671
3513 return unless $::CONN; 3672 return unless $::CONN;
3514 3673
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520 3679
3521 my $row = 0; 3680 my $row = 0;
3522 3681
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_}; 3683 my $spell = $self->{spell}{$_};
… …
3531 if ($ev->{button} == 1) { 3690 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}"); 3691 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) { 3692 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}"); 3693 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) { 3694 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu 3695 (new CFPlus::UI::Menu
3537 items => [ 3696 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ], 3699 ],
3541 )->popup ($ev); 3700 )->popup ($ev);
… …
3547 }; 3706 };
3548 3707
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550 3709
3551 #TODO: add path info to tooltip 3710 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3553 3712
3554 $self->add (0, $row, new CFClient::UI::Face 3713 $self->add (0, $row, new CFPlus::UI::Face
3555 face => $spell->{face}, 3714 face => $spell->{face},
3556 can_hover => 1, 3715 can_hover => 1,
3557 can_events => 1, 3716 can_events => 1,
3558 tooltip => $tooltip, 3717 tooltip => $tooltip,
3559 on_button_down => $spell_cb, 3718 on_button_down => $spell_cb,
3560 ); 3719 );
3561 3720
3562 $self->add (1, $row, new CFClient::UI::Label 3721 $self->add (1, $row, new CFPlus::UI::Label
3563 expand => 1, 3722 expand => 1,
3564 text => $spell->{name}, 3723 text => $spell->{name},
3565 can_hover => 1, 3724 can_hover => 1,
3566 can_events => 1, 3725 can_events => 1,
3567 tooltip => $tooltip, 3726 tooltip => $tooltip,
3568 on_button_down => $spell_cb, 3727 on_button_down => $spell_cb,
3569 ); 3728 );
3570 3729
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 } 3734 }
3576 }); 3735 });
3577} 3736}
3578 3737
3579sub add_spell { 3738sub add_spell {
… …
3597 $self->rebuild_spell_list; 3756 $self->rebuild_spell_list;
3598} 3757}
3599 3758
3600############################################################################# 3759#############################################################################
3601 3760
3602package CFClient::UI::Root; 3761package CFPlus::UI::Root;
3603 3762
3604our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3605 3764
3606use List::Util qw(min max); 3765use List::Util qw(min max);
3607 3766
3608use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3609 3768
3610sub new { 3769sub new {
3611 my $class = shift; 3770 my $class = shift;
3612 3771
3613 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790 3949
3791 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3792 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3793 3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3794 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3795 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3796 3964
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};
… …
3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3823 glLoadIdentity; 3991 glLoadIdentity;
3824 3992
3825 { 3993 {
3826 package CFClient::UI::Base; 3994 package CFPlus::UI::Base;
3827 3995
3828 ($draw_x, $draw_y, $draw_w, $draw_h) = 3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h}); 3997 (0, 0, $self->{w}, $self->{h});
3830 } 3998 }
3831 3999
3832 $self->_draw; 4000 $self->_draw;
3833} 4001}
3834 4002
3835############################################################################# 4003#############################################################################
3836 4004
3837package CFClient::UI; 4005package CFPlus::UI;
3838 4006
3839$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3840$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841 4009
38421 40101
3843 4011

Diff Legend

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