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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
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 CFPlus::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};
… …
239 261
240sub destroy { 262sub destroy {
241 my ($self) = @_; 263 my ($self) = @_;
242 264
243 $self->hide; 265 $self->hide;
266 $self->emit ("destroy");
244 %$self = (); 267 %$self = ();
245} 268}
246 269
247sub show { 270sub show {
248 my ($self) = @_; 271 my ($self) = @_;
249 272
250 return if $self->{parent}; 273 return if $self->{parent};
251 274
252 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
253} 276}
254 277
255sub set_visible { 278sub set_visible {
256 my ($self) = @_; 279 my ($self) = @_;
257 280
… …
278 delete $self->{root}; 301 delete $self->{root};
279 302
280 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
282 305
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
285 308
286 $self->emit ("focus_out"); 309 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
288} 311}
… …
345 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
346 369
347 if ($self->{aspect}) { 370 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
349 372
350 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 375
353 # use alignment to adjust x, y 376 # use alignment to adjust x, y
354 377
355 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
397 420
398 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
399 422
400 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
401 424
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 428 }
406} 429}
407 430
408# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
409sub coord2local { 432sub coord2local {
410 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
411 434
435 Carp::confess unless $self->{parent};#d#
436
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 438}
414 439
415# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
416sub coord2global { 441sub coord2global {
417 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
418 443
444 Carp::confess unless $self->{parent};#d#
445
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 447}
421 448
422sub invoke_focus_in { 449sub invoke_focus_in {
423 my ($self) = @_; 450 my ($self) = @_;
424 451
425 return if $FOCUS == $self; 452 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
427 454
428 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
429 456
430 $focus->update if $focus; 457 $self->update;
431 $FOCUS->update;
432 458
433 0 459 0
434} 460}
435 461
436sub invoke_focus_out { 462sub invoke_focus_out {
437 my ($self) = @_; 463 my ($self) = @_;
438 464
439 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
440 466
441 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
442 468
443 $focus->update if $focus; #? 469 $self->update;
444 470
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 472 unless $FOCUS;
447 473
448 0 474 0
449} 475}
450 476
451sub grab_focus { 477sub grab_focus {
452 my ($self) = @_; 478 my ($self) = @_;
453 479
480 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 481 $self->emit ("focus_in");
455} 482}
456 483
457sub invoke_mouse_motion { 1 } 484sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 485sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 486sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
461 489
462sub invoke_button_down { 490sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
464 492
465 $self->grab_focus; 493 $self->grab_focus;
466 494
467 1 495 0
468} 496}
469 497
470sub connect { 498sub connect {
471 my ($self, $signal, $cb) = @_; 499 my ($self, $signal, $cb) = @_;
472 500
473 push @{ $self->{signal_cb}{$signal} }, $cb; 501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
474} 507}
508
509sub disconnect_all {
510 my ($self, $signal) = @_;
511
512 delete $self->{signal_cb}{$signal};
513}
514
515my %has_coords = (
516 button_down => 1,
517 button_up => 1,
518 mouse_motion => 1,
519 mouse_wheel => 1,
520);
475 521
476sub emit { 522sub emit {
477 my ($self, $signal, @args) = @_; 523 my ($self, $signal, @args) = @_;
478 524
479 #d##TODO# stop propagating at first true, do not use sum 525 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 526 # and needlessly verbose code, either.
527 my @append
528 = $has_coords{$signal}
529 ? $args[0]->xy ($self)
530 : ();
531
532 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
533
534 for my $cb (
535 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 536 ($self->can ("invoke_$signal") || sub { 1 }), # closure
537 ) {
538 return $cb->($self, @args, @append) || next;
539 }
540
541 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 542 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 543}
484 544
485sub find_widget { 545sub find_widget {
486 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
487 547
… …
495} 555}
496 556
497sub set_parent { 557sub set_parent {
498 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
499 559
500 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 561 $self->set_visible if $parent->{visible};
502} 562}
503 563
504sub realloc { 564sub realloc {
505 my ($self) = @_; 565 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 631 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 632 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 633 glVertex 0 , $self->{h} - 1;
574 glEnd; 634 glEnd;
575 glPopMatrix; 635 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 637 }
578 638
579 $self->_draw; 639 $self->_draw;
580 glPopMatrix; 640 glPopMatrix;
581} 641}
… …
584 my ($self) = @_; 644 my ($self) = @_;
585 645
586 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
587} 647}
588 648
649my $cntx;#d#
589sub DESTROY { 650sub DESTROY {
590 my ($self) = @_; 651 my ($self) = @_;
591 652
592 delete $WIDGET{$self+0}; 653 return if CFPlus::in_destruct;
593 654
594 eval { $self->destroy }; 655 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657
658 delete $WIDGET{$self+0};
596} 659}
597 660
598############################################################################# 661#############################################################################
599 662
600package CFClient::UI::DrawBG; 663package CFPlus::UI::DrawBG;
601 664
602our @ISA = CFClient::UI::Base::; 665our @ISA = CFPlus::UI::Base::;
603 666
604use strict; 667use strict;
605use CFClient::OpenGL; 668use CFPlus::OpenGL;
606 669
607sub new { 670sub new {
608 my $class = shift; 671 my $class = shift;
609 672
610 # range [value, low, high, page] 673 # range [value, low, high, page]
… …
641 } 704 }
642} 705}
643 706
644############################################################################# 707#############################################################################
645 708
646package CFClient::UI::Empty; 709package CFPlus::UI::Empty;
647 710
648our @ISA = CFClient::UI::Base::; 711our @ISA = CFPlus::UI::Base::;
649 712
650sub new { 713sub new {
651 my ($class, %arg) = @_; 714 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 715 $class->SUPER::new (can_events => 0, %arg);
653} 716}
… …
660 723
661sub draw { } 724sub draw { }
662 725
663############################################################################# 726#############################################################################
664 727
665package CFClient::UI::Container; 728package CFPlus::UI::Container;
666 729
667our @ISA = CFClient::UI::Base::; 730our @ISA = CFPlus::UI::Base::;
668 731
669sub new { 732sub new {
670 my ($class, %arg) = @_; 733 my ($class, %arg) = @_;
671 734
672 my $children = delete $arg{children}; 735 my $children = delete $arg{children};
… …
681 if $children; 744 if $children;
682 745
683 $self 746 $self
684} 747}
685 748
749sub realloc {
750 my ($self) = @_;
751
752 $self->{force_realloc} = 1;
753 $self->{force_size_alloc} = 1;
754 $self->SUPER::realloc;
755}
756
686sub add { 757sub add {
687 my ($self, @widgets) = @_; 758 my ($self, @widgets) = @_;
688 759
689 $_->set_parent ($self) 760 $_->set_parent ($self)
690 for @widgets; 761 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 821 $_->draw for @{$self->{children}};
751} 822}
752 823
753############################################################################# 824#############################################################################
754 825
755package CFClient::UI::Bin; 826package CFPlus::UI::Bin;
756 827
757our @ISA = CFClient::UI::Container::; 828our @ISA = CFPlus::UI::Container::;
758 829
759sub new { 830sub new {
760 my ($class, %arg) = @_; 831 my ($class, %arg) = @_;
761 832
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 833 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 834
764 $class->SUPER::new (children => [$child], %arg) 835 $class->SUPER::new (children => [$child], %arg)
765} 836}
766 837
767sub add { 838sub add {
… …
774sub remove { 845sub remove {
775 my ($self, $widget) = @_; 846 my ($self, $widget) = @_;
776 847
777 $self->SUPER::remove ($widget); 848 $self->SUPER::remove ($widget);
778 849
779 $self->{children} = [new CFClient::UI::Empty] 850 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 851 unless @{$self->{children}};
781} 852}
782 853
783sub child { $_[0]->{children}[0] } 854sub child { $_[0]->{children}[0] }
784 855
… …
796 867
797############################################################################# 868#############################################################################
798 869
799# back-buffered drawing area 870# back-buffered drawing area
800 871
801package CFClient::UI::Window; 872package CFPlus::UI::Window;
802 873
803our @ISA = CFClient::UI::Bin::; 874our @ISA = CFPlus::UI::Bin::;
804 875
805use CFClient::OpenGL; 876use CFPlus::OpenGL;
806 877
807sub new { 878sub new {
808 my ($class, %arg) = @_; 879 my ($class, %arg) = @_;
809 880
810 my $self = $class->SUPER::new (%arg); 881 my $self = $class->SUPER::new (%arg);
… …
832} 903}
833 904
834sub render_child { 905sub render_child {
835 my ($self) = @_; 906 my ($self) = @_;
836 907
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 908 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 909 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
840 911
841 { 912 {
842 package CFClient::UI::Base; 913 package CFPlus::UI::Base;
843 914
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
846 } 919 }
847
848 $self->_render;
849 }; 920 };
850} 921}
851 922
852sub _draw { 923sub _draw {
853 my ($self) = @_; 924 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 925
857 my $tex = $self->{texture} 926 my $tex = $self->{texture}
858 or return; 927 or return;
859 928
860 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
863 932
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
865 934
866 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
867} 936}
868 937
869############################################################################# 938#############################################################################
870 939
871package CFClient::UI::ViewPort; 940package CFPlus::UI::ViewPort;
872 941
873our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
874 943
875sub new { 944sub new {
876 my $class = shift; 945 my $class = shift;
877 946
878 $class->SUPER::new ( 947 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1009 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1011 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1013 }
945} 1014}
946 1015
947sub _render { 1016sub _render {
948 my ($self) = @_; 1017 my ($self) = @_;
949 1018
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1019 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}; 1020 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1021
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1023
955 $self->SUPER::_render; 1024 $self->SUPER::_render;
956} 1025}
957 1026
958############################################################################# 1027#############################################################################
959 1028
960package CFClient::UI::ScrolledWindow; 1029package CFPlus::UI::ScrolledWindow;
961 1030
962our @ISA = CFClient::UI::HBox::; 1031our @ISA = CFPlus::UI::HBox::;
963 1032
964sub new { 1033sub new {
965 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
966 1035
967 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
968 1037
969 my $self; 1038 my $self;
970 1039
971 my $slider = new CFClient::UI::Slider 1040 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1041 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1042 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1043 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1044 $self->{vp}->set_offset (0, $_[1]);
976 }, 1045 },
977 ; 1046 ;
978 1047
979 $self = $class->SUPER::new ( 1048 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1049 vp => (new CFPlus::UI::ViewPort expand => 1),
1050 can_events => 1,
981 slider => $slider, 1051 slider => $slider,
982 %arg, 1052 %arg,
983 ); 1053 );
984 1054
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1055 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1056 $self->add ($child) if $child;
987 1057
988 $self 1058 $self
989} 1059}
990 1060
1061#TODO# update range on size_allocate depending on child
1062
991sub add { 1063sub add {
992 my ($self, $widget) = @_; 1064 my ($self, $widget) = @_;
993 1065
994 $self->{vp}->add ($self->{child} = $widget); 1066 $self->{vp}->add ($self->{child} = $widget);
995} 1067}
996 1068
1069sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_;
1071
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev);
1075
1076 1
1077}
1078
1079sub update_slider {
1080 my ($self) = @_;
1081
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1083}
1084
997sub update { 1085sub update {
998 my ($self) = @_; 1086 my ($self) = @_;
999 1087
1000 $self->SUPER::update; 1088 $self->SUPER::update;
1001 1089
1002 # todo: overwrite size_allocate of child 1090 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1091}
1006 1092
1007sub invoke_size_allocate { 1093sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1094 my ($self, $w, $h) = @_;
1009 1095
1010 my $child = $self->{vp}->child; 1096 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012 1097
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1098 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1099}
1015 1100
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1101#############################################################################
1020 1102
1021package CFClient::UI::Frame; 1103package CFPlus::UI::Frame;
1022 1104
1023our @ISA = CFClient::UI::Bin::; 1105our @ISA = CFPlus::UI::Bin::;
1024 1106
1025use CFClient::OpenGL; 1107use CFPlus::OpenGL;
1026 1108
1027sub new { 1109sub new {
1028 my $class = shift; 1110 my $class = shift;
1029 1111
1030 $class->SUPER::new ( 1112 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1138 $self->SUPER::_draw;
1057} 1139}
1058 1140
1059############################################################################# 1141#############################################################################
1060 1142
1061package CFClient::UI::FancyFrame; 1143package CFPlus::UI::FancyFrame;
1062 1144
1063our @ISA = CFClient::UI::Bin::; 1145our @ISA = CFPlus::UI::Bin::;
1064 1146
1065use CFClient::OpenGL; 1147use CFPlus::OpenGL;
1148
1149sub new {
1150 my ($class, %arg) = @_;
1151
1152 if ((exists $arg{label}) && !ref $arg{label}) {
1153 $arg{label} = new CFPlus::UI::Label
1154 align => 1,
1155 valign => 0,
1156 text => $arg{label},
1157 fontsize => ($arg{border} || 0.8) * 0.75;
1158 }
1159
1160 my $self = $class->SUPER::new (
1161 # label => "",
1162 fg => [0.6, 0.3, 0.1],
1163 border => 0.8,
1164 style => 'single',
1165 %arg,
1166 );
1167
1168 $self
1169}
1170
1171sub add {
1172 my ($self, @widgets) = @_;
1173
1174 $self->SUPER::add (@widgets);
1175 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1176}
1177
1178sub border {
1179 int $_[0]{border} * $::FONTSIZE
1180}
1181
1182sub size_request {
1183 my ($self) = @_;
1184
1185 ($self->{label_w}, undef) = $self->{label}->size_request
1186 if $self->{label};
1187
1188 my ($w, $h) = $self->SUPER::size_request;
1189
1190 (
1191 $w + $self->border * 2,
1192 $h + $self->border * 2,
1193 )
1194}
1195
1196sub invoke_size_allocate {
1197 my ($self, $w, $h) = @_;
1198
1199 my $border = $self->border;
1200
1201 $w -= List::Util::max 0, $border * 2;
1202 $h -= List::Util::max 0, $border * 2;
1203
1204 if (my $label = $self->{label}) {
1205 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1206 $label->{h} = List::Util::min $h, $border;
1207 $label->invoke_size_allocate ($label->{w}, $label->{h});
1208 }
1209
1210 $self->child->configure ($border, $border, $w, $h);
1211
1212 1
1213}
1214
1215sub _draw {
1216 my ($self) = @_;
1217
1218 my $child = $self->{children}[0];
1219
1220 my $border = $self->border;
1221 my ($w, $h) = ($self->{w}, $self->{h});
1222
1223 $child->draw;
1224
1225 glColor @{$self->{fg}};
1226 glBegin GL_LINE_STRIP;
1227 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1228 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1230 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1233 glEnd;
1234
1235 if ($self->{label}) {
1236 glTranslate $border * 2, 0;
1237 $self->{label}->_draw;
1238 }
1239}
1240
1241#############################################################################
1242
1243package CFPlus::UI::Toplevel;
1244
1245our @ISA = CFPlus::UI::Bin::;
1246
1247use CFPlus::OpenGL;
1066 1248
1067my $bg = 1249my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1250 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1251 mipmap => 1, wrap => 1;
1070 1252
1071my @border = 1253my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1256
1075sub new { 1257sub new {
1076 my ($class, %arg) = @_; 1258 my ($class, %arg) = @_;
1077 1259
1078 my $self = $class->SUPER::new ( 1260 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1261 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1262 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1263 border => 0.6,
1082 can_events => 1, 1264 can_events => 1,
1083 min_w => 16, 1265 min_w => 64,
1084 min_h => 16, 1266 min_h => 32,
1085 %arg, 1267 %arg,
1086 ); 1268 );
1087 1269
1088 $self->{title_widget} = new CFClient::UI::Label 1270 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1271 align => 0,
1090 valign => 1, 1272 valign => 1,
1091 text => $self->{title}, 1273 text => $self->{title},
1092 fontsize => $self->{border}, 1274 fontsize => $self->{border},
1093 if exists $self->{title}; 1275 if exists $self->{title};
1094 1276
1095 if ($self->{has_close_button}) { 1277 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1278 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1279 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1280 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1281 on_activate => sub { $self->emit ("delete") };
1100 1282
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1283 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1284 }
1103 1285
1104 $self 1286 $self
1105} 1287}
1106 1288
1107sub add { 1289sub add {
1108 my ($self, @widgets) = @_; 1290 my ($self, @widgets) = @_;
1109 1291
1110 $self->SUPER::add (@widgets); 1292 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1293 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1294 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1295}
1114 1296
1115sub border { 1297sub border {
1116 int $_[0]{border} * $::FONTSIZE 1298 int $_[0]{border} * $::FONTSIZE
1117} 1299}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1332 $self->child->configure ($border, $border, $w, $h);
1151 1333
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1334 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1335 if $self->{close_button};
1154 1336
1337 1
1338}
1339
1340sub invoke_delete {
1341 my ($self) = @_;
1342
1343 $self->hide;
1344
1155 1 1345 1
1156} 1346}
1157 1347
1158sub invoke_button_down { 1348sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1349 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1408
1219 ! ! $self->{motion} 1409 ! ! $self->{motion}
1220} 1410}
1221 1411
1412sub invoke_visibility_change {
1413 my ($self, $visible) = @_;
1414
1415 delete $self->{motion} unless $visible;
1416
1417 0
1418}
1419
1222sub _draw { 1420sub _draw {
1223 my ($self) = @_; 1421 my ($self) = @_;
1224 1422
1225 my $child = $self->{children}[0]; 1423 my $child = $self->{children}[0];
1226 1424
… …
1263 if $self->{close_button}; 1461 if $self->{close_button};
1264} 1462}
1265 1463
1266############################################################################# 1464#############################################################################
1267 1465
1268package CFClient::UI::Table; 1466package CFPlus::UI::Table;
1269 1467
1270our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
1271 1469
1272use List::Util qw(max sum); 1470use List::Util qw(max sum);
1273 1471
1274use CFClient::OpenGL; 1472use CFPlus::OpenGL;
1275 1473
1276sub new { 1474sub new {
1277 my $class = shift; 1475 my $class = shift;
1278 1476
1279 $class->SUPER::new ( 1477 $class->SUPER::new (
… …
1285sub children { 1483sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1485}
1288 1486
1289sub add { 1487sub add {
1290 my ($self, $x, $y, $child) = @_; 1488 my ($self) = shift;
1291 1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
1292 $child->set_parent ($self); 1492 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1493 $self->{children}[$y][$x] = $child;
1494 }
1294 1495
1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1498 $self->realloc;
1296} 1499}
1297 1500
1298sub remove { 1501sub remove {
1299 my ($self, $child) = @_; 1502 my ($self, $child) = @_;
… …
1364 1567
1365 # linearly scale sizes 1568 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1571
1369 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
1370 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
1371 1574
1372 my $y; 1575 my $y;
1373 1576
1374 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
1418 } 1621 }
1419} 1622}
1420 1623
1421############################################################################# 1624#############################################################################
1422 1625
1423package CFClient::UI::Box; 1626package CFPlus::UI::Box;
1424 1627
1425our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
1426 1629
1427sub size_request { 1630sub size_request {
1428 my ($self) = @_; 1631 my ($self) = @_;
1429 1632
1430 $self->{vertical} 1633 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1666 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1667 for 0 .. $#children;
1465 } 1668 }
1466 } 1669 }
1467 1670
1468 CFClient::UI::harmonize \@req; 1671 CFPlus::UI::harmonize \@req;
1469 1672
1470 my $pos = 0; 1673 my $pos = 0;
1471 for (0 .. $#children) { 1674 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1675 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1676 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1681 1
1479} 1682}
1480 1683
1481############################################################################# 1684#############################################################################
1482 1685
1483package CFClient::UI::HBox; 1686package CFPlus::UI::HBox;
1484 1687
1485our @ISA = CFClient::UI::Box::; 1688our @ISA = CFPlus::UI::Box::;
1486 1689
1487sub new { 1690sub new {
1488 my $class = shift; 1691 my $class = shift;
1489 1692
1490 $class->SUPER::new ( 1693 $class->SUPER::new (
… …
1493 ) 1696 )
1494} 1697}
1495 1698
1496############################################################################# 1699#############################################################################
1497 1700
1498package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1499 1702
1500our @ISA = CFClient::UI::Box::; 1703our @ISA = CFPlus::UI::Box::;
1501 1704
1502sub new { 1705sub new {
1503 my $class = shift; 1706 my $class = shift;
1504 1707
1505 $class->SUPER::new ( 1708 $class->SUPER::new (
… …
1508 ) 1711 )
1509} 1712}
1510 1713
1511############################################################################# 1714#############################################################################
1512 1715
1513package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1514 1717
1515our @ISA = CFClient::UI::DrawBG::; 1718our @ISA = CFPlus::UI::DrawBG::;
1516 1719
1517use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1518 1721
1519sub new { 1722sub new {
1520 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1521 1724
1522 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1728 #active_bg => none
1526 #font => default_font 1729 #font => default_font
1527 #text => initial text 1730 #text => initial text
1528 #markup => initial narkup 1731 #markup => initial narkup
1529 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1530 ellipsise => 3, # end 1734 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1735 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1736 fontsize => 1,
1533 align => -1, 1737 align => -1,
1534 valign => -1, 1738 valign => -1,
1535 padding_x => 2, 1739 padding_x => 2,
1536 padding_y => 2, 1740 padding_y => 2,
1537 can_events => 0, 1741 can_events => 0,
1538 %arg 1742 %arg
1539 ); 1743 );
1540 1744
1541 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1748 $self->{template} = $layout;
1545 } 1749 }
1546 1750
1547 if (exists $self->{markup}) { 1751 if (exists $self->{markup}) {
… …
1551 } 1755 }
1552 1756
1553 $self 1757 $self
1554} 1758}
1555 1759
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1760sub update {
1567 my ($self) = @_; 1761 my ($self) = @_;
1568 1762
1569 delete $self->{texture}; 1763 delete $self->{texture};
1570 $self->SUPER::update; 1764 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1582 1776
1583 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1585 1779
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1588 1781
1589 delete $self->{size_req}; 1782 delete $self->{size_req};
1590 $self->realloc; 1783 $self->realloc;
1591 $self->update; 1784 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1790 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1791 $self->{text} = "M$markup";
1599 1792
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1794
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1604 1796
1605 delete $self->{size_req}; 1797 delete $self->{size_req};
1606 $self->realloc; 1798 $self->realloc;
1607 $self->update; 1799 $self->update;
… …
1619 1811
1620 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1621 1813
1622 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1815 $self->{template}->set_font ($self->{font}) if $self->{font};
1816 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1818
1626 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1627 1820
1628 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
… …
1652 1845
1653sub set_fontsize { 1846sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1655 1848
1656 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1657 delete $self->{texture}; 1851 delete $self->{texture};
1658 1852
1659 $self->realloc; 1853 $self->realloc;
1660} 1854}
1661 1855
1662sub reconfigure { 1856sub reconfigure {
1663 my ($self) = @_; 1857 my ($self) = @_;
1664 1858
1665 delete $self->{size_req}; 1859 delete $self->{size_req};
1860 delete $self->{texture};
1666 1861
1667 $self->SUPER::reconfigure; 1862 $self->SUPER::reconfigure;
1668} 1863}
1669 1864
1670sub _draw { 1865sub _draw {
1671 my ($self) = @_; 1866 my ($self) = @_;
1672 1867
1673 $self->SUPER::_draw; # draw background, if applicable 1868 $self->SUPER::_draw; # draw background, if applicable
1674 1869
1675 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1877
1683 new_from_layout CFClient::Texture $self->{layout} 1878 [$self->{layout}->size]
1684 }; 1879 };
1685 1880
1686 unless (exists $self->{ox}) { 1881 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1884 : ($self->{w} - $size->[0]) * 0.5);
1690 1885
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1888 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1889 };
1695 1890
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1893
1701 if ($tex->{format} == GL_ALPHA) { 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 1895}
1712 1896
1713############################################################################# 1897#############################################################################
1714 1898
1715package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1716 1900
1717our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1718 1902
1719use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1720 1904
1721sub new { 1905sub new {
1722 my $class = shift; 1906 my $class = shift;
1723 1907
1724 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1729 can_hover => 1, 1913 can_hover => 1,
1730 can_focus => 1, 1914 can_focus => 1,
1731 valign => 0, 1915 valign => 0,
1732 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1733 #text => ... 1918 #text => ...
1734 #hidden => "*", 1919 #hidden => "*",
1735 @_ 1920 @_
1736 ) 1921 )
1737} 1922}
… …
1786 1971
1787 if ($uni == 8) { 1972 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1796 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1798 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1799 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 1988 $self->emit ('escape');
1801 } elsif ($uni) { 1989 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 1991 } else {
1804 return 0; 1992 return 0;
1805 } 1993 }
1806 1994
1807 $self->_set_text ($text); 1995 $self->_set_text ($text);
1808 1996
1809 $self->realloc; 1997 $self->realloc;
1998 $self->update;
1810 1999
1811 1 2000 1
1812} 2001}
1813 2002
1814sub invoke_focus_in { 2003sub invoke_focus_in {
… …
1826 2015
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2016 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2017
1829 # byte-index to char-index 2018 # byte-index to char-index
1830 my $text = $self->{text}; 2019 my $text = $self->{text};
1831 utf8::encode $text; 2020 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2021 $self->{cursor} = length $text;
1833 2022
1834 $self->_set_text ($self->{text}); 2023 $self->_set_text ($self->{text});
1835 $self->update; 2024 $self->update;
1836 2025
1837 1 2026 1
… …
1876 utf8::encode $text; 2065 utf8::encode $text;
1877 2066
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2068 }
1880 2069
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2070 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2072 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2073 glEnd;
1886 } 2074 }
1887} 2075}
1888 2076
2077#############################################################################
2078
1889package CFClient::UI::Entry; 2079package CFPlus::UI::Entry;
1890 2080
1891our @ISA = CFClient::UI::EntryBase::; 2081our @ISA = CFPlus::UI::EntryBase::;
1892 2082
1893use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1894 2084
1895sub invoke_key_down { 2085sub invoke_key_down {
1896 my ($self, $ev) = @_; 2086 my ($self, $ev) = @_;
1897 2087
1898 my $sym = $ev->{sym}; 2088 my $sym = $ev->{sym};
1899 2089
1900 if ($sym == 13) { 2090 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2091 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2092 my $txt = $self->get_text;
1903 2093
1904 $self->{history_pointer} = -1; 2094 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2095 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2096 $self->emit (activate => $txt);
1907 $self->update; 2097 $self->update;
1908 2098
1909 } elsif ($sym == CFClient::SDLK_UP) { 2099 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2100 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2101 $self->{history_saveback} = $self->get_text;
1912 } 2102 }
1913 if (@{$self->{history} || []} > 0) { 2103 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2104 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2106 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2107 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2108 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2109 }
1920 2110
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2111 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2112 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2113 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2114
1925 if ($self->{history_pointer} >= 0) { 2115 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2116 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2125 1
1936} 2126}
1937 2127
1938############################################################################# 2128#############################################################################
1939 2129
2130package CFPlus::UI::TextEdit;
2131
2132our @ISA = CFPlus::UI::EntryBase::;
2133
2134use CFPlus::OpenGL;
2135
2136sub move_cursor_ver {
2137 my ($self, $dy) = @_;
2138
2139 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2140
2141 $y += $dy;
2142
2143 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2144 $self->{cursor} = $index;
2145 delete $self->{cur_h};
2146 $self->update;
2147 return;
2148 }
2149}
2150
2151sub invoke_key_down {
2152 my ($self, $ev) = @_;
2153
2154 my $sym = $ev->{sym};
2155
2156 if ($sym == CFPlus::SDLK_UP) {
2157 $self->move_cursor_ver (-1);
2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
2159 $self->move_cursor_ver (+1);
2160 } else {
2161 return $self->SUPER::invoke_key_down ($ev)
2162 }
2163
2164 1
2165}
2166
2167#############################################################################
2168
1940package CFClient::UI::Button; 2169package CFPlus::UI::Button;
1941 2170
1942our @ISA = CFClient::UI::Label::; 2171our @ISA = CFPlus::UI::Label::;
1943 2172
1944use CFClient::OpenGL; 2173use CFPlus::OpenGL;
1945 2174
1946my @tex = 2175my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2177 qw(b1_button_active.png);
1949 2178
1950sub new { 2179sub new {
1951 my $class = shift; 2180 my $class = shift;
1952 2181
… …
1989 $self->SUPER::_draw; 2218 $self->SUPER::_draw;
1990} 2219}
1991 2220
1992############################################################################# 2221#############################################################################
1993 2222
2223package CFPlus::UI::CheckBox;
2224
2225our @ISA = CFPlus::UI::DrawBG::;
2226
2227my @tex =
2228 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2229 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2230
2231use CFPlus::OpenGL;
2232
2233sub new {
2234 my $class = shift;
2235
2236 $class->SUPER::new (
2237 padding_x => 2,
2238 padding_y => 2,
2239 fg => [1, 1, 1],
2240 active_fg => [1, 1, 0],
2241 bg => [0, 0, 0, 0.2],
2242 active_bg => [1, 1, 1, 0.5],
2243 state => 0,
2244 can_hover => 1,
2245 @_
2246 )
2247}
2248
2249sub size_request {
2250 my ($self) = @_;
2251
2252 (6) x 2
2253}
2254
2255sub toggle {
2256 my ($self) = @_;
2257
2258 $self->{state} = !$self->{state};
2259 $self->emit (changed => $self->{state});
2260 $self->update;
2261}
2262
2263sub invoke_button_down {
2264 my ($self, $ev, $x, $y) = @_;
2265
2266 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2267 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2268 $self->toggle;
2269 } else {
2270 return 0
2271 }
2272
2273 1
2274}
2275
2276sub _draw {
2277 my ($self) = @_;
2278
2279 $self->SUPER::_draw;
2280
2281 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2282
2283 my ($w, $h) = @$self{qw(w h)};
2284
2285 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2286
2287 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2288
2289 my $tex = $self->{state} ? $tex[1] : $tex[0];
2290
2291 glEnable GL_TEXTURE_2D;
2292 $tex->draw_quad_alpha (0, 0, $s, $s);
2293 glDisable GL_TEXTURE_2D;
2294}
2295
2296#############################################################################
2297
2298package CFPlus::UI::Image;
2299
2300our @ISA = CFPlus::UI::Base::;
2301
2302use CFPlus::OpenGL;
2303
2304our %texture_cache;
2305
2306sub new {
2307 my $class = shift;
2308
2309 my $self = $class->SUPER::new (
2310 can_events => 0,
2311 @_,
2312 );
2313
2314 $self->{path} || $self->{tex}
2315 or Carp::croak "'path' or 'tex' attributes required";
2316
2317 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2318 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2319
2320 CFPlus::weaken $texture_cache{$self->{path}};
2321
2322 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2323
2324 $self
2325}
2326
2327sub STORABLE_freeze {
2328 my ($self, $cloning) = @_;
2329
2330 $self->{path}
2331 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2332
2333 $self->{path}
2334}
2335
2336sub STORABLE_attach {
2337 my ($self, $cloning, $path) = @_;
2338
2339 $self->new (path => $path)
2340}
2341
2342sub size_request {
2343 my ($self) = @_;
2344
2345 ($self->{tex}{w}, $self->{tex}{h})
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 my $tex = $self->{tex};
2352
2353 my ($w, $h) = ($self->{w}, $self->{h});
2354
2355 if ($self->{rot90}) {
2356 glRotate 90, 0, 0, 1;
2357 glTranslate 0, -$self->{w}, 0;
2358
2359 ($w, $h) = ($h, $w);
2360 }
2361
2362 glEnable GL_TEXTURE_2D;
2363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2364
2365 $tex->draw_quad (0, 0, $w, $h);
2366
2367 glDisable GL_TEXTURE_2D;
2368}
2369
2370#############################################################################
2371
1994package CFClient::UI::ImageButton; 2372package CFPlus::UI::ImageButton;
1995 2373
1996our @ISA = CFClient::UI::Image::; 2374our @ISA = CFPlus::UI::Image::;
1997 2375
1998use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1999 2377
2000my %textures; 2378my %textures;
2001 2379
2002sub new { 2380sub new {
2003 my $class = shift; 2381 my $class = shift;
… …
2025 1 2403 1
2026} 2404}
2027 2405
2028############################################################################# 2406#############################################################################
2029 2407
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2408package CFPlus::UI::VGauge;
2099 2409
2100our @ISA = CFClient::UI::Base::; 2410our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2411
2161use List::Util qw(min max); 2412use List::Util qw(min max);
2162 2413
2163use CFClient::OpenGL; 2414use CFPlus::OpenGL;
2164 2415
2165my %tex = ( 2416my %tex = (
2166 food => [ 2417 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2419 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2420 ],
2170 grace => [ 2421 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2423 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2424 ],
2174 hp => [ 2425 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2427 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2428 ],
2178 mana => [ 2429 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2431 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2432 ],
2182); 2433);
2183 2434
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2435# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2495 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2496 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2497
2247 my $h1 = $self->{h} * (1 - $ycut1); 2498 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2499 my $h2 = $self->{h} * (1 - $ycut2);
2500 my $h3 = $self->{h};
2501
2502 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2503
2250 glEnable GL_BLEND; 2504 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2505 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2506 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2507 glEnable GL_TEXTURE_2D;
… …
2272 2526
2273 if ($t3) { 2527 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2528 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2529 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2530 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2531 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2532 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2533 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2534 glEnd;
2281 } 2535 }
2282 2536
2283 glDisable GL_BLEND; 2537 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2538 glDisable GL_TEXTURE_2D;
2285} 2539}
2286 2540
2287############################################################################# 2541#############################################################################
2288 2542
2289package CFClient::UI::Gauge; 2543package CFPlus::UI::Gauge;
2290 2544
2291our @ISA = CFClient::UI::VBox::; 2545our @ISA = CFPlus::UI::VBox::;
2292 2546
2293sub new { 2547sub new {
2294 my ($class, %arg) = @_; 2548 my ($class, %arg) = @_;
2295 2549
2296 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2552 can_hover => 1,
2299 can_events => 1, 2553 can_events => 1,
2300 %arg, 2554 %arg,
2301 ); 2555 );
2302 2556
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2557 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2558 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2559 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2560
2307 $self 2561 $self
2308} 2562}
2309 2563
2310sub set_fontsize { 2564sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2585 $self->{value}->set_text ($val);
2332} 2586}
2333 2587
2334############################################################################# 2588#############################################################################
2335 2589
2336package CFClient::UI::Slider; 2590package CFPlus::UI::Slider;
2337 2591
2338use strict; 2592use strict;
2339 2593
2340use CFClient::OpenGL; 2594use CFPlus::OpenGL;
2341 2595
2342our @ISA = CFClient::UI::DrawBG::; 2596our @ISA = CFPlus::UI::DrawBG::;
2343 2597
2344my @tex = 2598my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2600 qw(s1_slider.png s1_slider_bg.png);
2347 2601
2348sub new { 2602sub new {
2349 my $class = shift; 2603 my $class = shift;
2350 2604
… …
2439 } 2693 }
2440 2694
2441 1 2695 1
2442} 2696}
2443 2697
2698sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_;
2700
2701 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702
2703 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2704
2705 ! ! $delta
2706}
2707
2444sub update { 2708sub update {
2445 my ($self) = @_; 2709 my ($self) = @_;
2446 2710
2447 delete $self->{knob_w}; 2711 delete $self->{knob_w};
2448 $self->SUPER::update; 2712 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2496} 2760}
2497 2761
2498############################################################################# 2762#############################################################################
2499 2763
2500package CFClient::UI::ValSlider; 2764package CFPlus::UI::ValSlider;
2501 2765
2502our @ISA = CFClient::UI::HBox::; 2766our @ISA = CFPlus::UI::HBox::;
2503 2767
2504sub new { 2768sub new {
2505 my ($class, %arg) = @_; 2769 my ($class, %arg) = @_;
2506 2770
2507 my $range = delete $arg{range}; 2771 my $range = delete $arg{range};
2508 2772
2509 my $self = $class->SUPER::new ( 2773 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2774 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2775 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2776 to_value => sub { shift },
2513 from_value => sub { shift }, 2777 from_value => sub { shift },
2514 %arg, 2778 %arg,
2515 ); 2779 );
2516 2780
… …
2536sub set_range { shift->{slider}->set_range (@_) } 2800sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 2801sub set_value { shift->{slider}->set_value (@_) }
2538 2802
2539############################################################################# 2803#############################################################################
2540 2804
2541package CFClient::UI::TextScroller; 2805package CFPlus::UI::TextScroller;
2542 2806
2543our @ISA = CFClient::UI::HBox::; 2807our @ISA = CFPlus::UI::HBox::;
2544 2808
2545use CFClient::OpenGL; 2809use CFPlus::OpenGL;
2546 2810
2547sub new { 2811sub new {
2548 my $class = shift; 2812 my $class = shift;
2549 2813
2550 my $self = $class->SUPER::new ( 2814 my $self = $class->SUPER::new (
2551 fontsize => 1, 2815 fontsize => 1,
2552 can_events => 0, 2816 can_events => 1,
2553 indent => 0, 2817 indent => 0,
2554 #font => default_font 2818 #font => default_font
2555 @_, 2819 @_,
2556 2820
2557 layout => (new CFClient::Layout 1), 2821 layout => (new CFPlus::Layout),
2558 par => [], 2822 par => [],
2559 height => 0, 2823 height => 0,
2560 children => [ 2824 children => [
2561 (new CFClient::UI::Empty expand => 1), 2825 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2826 (new CFPlus::UI::Slider vertical => 1),
2563 ], 2827 ],
2564 ); 2828 );
2565 2829
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 2830 $self->{children}[1]->connect (changed => sub { $self->update });
2567 2831
… …
2597 2861
2598 $self->reflow; 2862 $self->reflow;
2599 2863
2600 local $self->{children} = [$empty, $slider]; 2864 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 2865 $self->SUPER::invoke_size_allocate ($w, $h)
2866}
2867
2868sub invoke_mouse_wheel {
2869 my ($self, $ev) = @_;
2870
2871 return 0 unless $ev->{dy}; # only vertical movements
2872
2873 $self->{children}[1]->emit (mouse_wheel => $ev);
2874
2875 1
2602} 2876}
2603 2877
2604sub get_layout { 2878sub get_layout {
2605 my ($self, $para) = @_; 2879 my ($self, $para) = @_;
2606 2880
… …
2634 2908
2635 # todo: base offset on lines or so, not on pixels 2909 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 2910 $self->{children}[1]->set_value ($offset);
2637} 2911}
2638 2912
2913sub current_paragraph {
2914 my ($self) = @_;
2915
2916 $self->{top_paragraph} - 1
2917}
2918
2919sub scroll_to {
2920 my ($self, $para) = @_;
2921
2922 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2923
2924 $self->{scroll_to} = $para;
2925 $self->update;
2926}
2927
2639sub clear { 2928sub clear {
2640 my ($self) = @_; 2929 my ($self) = @_;
2641 2930
2642 my (undef, undef, @other) = @{ $self->{children} }; 2931 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 2932 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 2935 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2936 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 2937}
2649 2938
2650sub add_paragraph { 2939sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 2940 my $self = shift;
2652 2941
2653 my ($text, @w) = ref $para ? @$para : $para; 2942 for my $para (@_) {
2654
2655 $para = { 2943 $para = {
2944 fg => [1, 1, 1, 1],
2945 indent => 0,
2946 markup => "",
2947 widget => [],
2948 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 2949 w => 1e10,
2657 wrapped => 1, 2950 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 2951 };
2663 2952
2664 $self->add (@w) if @w; 2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 2954 push @{$self->{par}}, $para;
2955 }
2666 2956
2667 $self->{need_reflow}++; 2957 $self->{need_reflow}++;
2668 $self->update; 2958 $self->update;
2669} 2959}
2670 2960
2671sub scroll_to_bottom { 2961sub scroll_to_bottom {
2672 my ($self) = @_; 2962 my ($self) = @_;
2673 2963
2674 $self->{scroll_to_bottom} = 1; 2964 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 2965 $self->update;
2676} 2966}
2677 2967
2968sub force_uptodate {
2969 my ($self) = @_;
2970
2971 if (delete $self->{need_reflow}) {
2972 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2973
2974 my $height = 0;
2975
2976 for my $para (@{$self->{par}}) {
2977 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2978 my $layout = $self->get_layout ($para);
2979 my ($w, $h) = $layout->size;
2980
2981 $para->{w} = $w + $para->{indent};
2982 $para->{h} = $h;
2983 $para->{wrapped} = $layout->has_wrapped;
2984 }
2985
2986 $para->{y} = $height;
2987 $height += $para->{h};
2988 }
2989
2990 $self->{height} = $height;
2991 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2992
2993 delete $self->{texture};
2994 }
2995
2996 if (my $paridx = delete $self->{scroll_to}) {
2997 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2998 }
2999}
3000
2678sub update { 3001sub update {
2679 my ($self) = @_; 3002 my ($self) = @_;
2680 3003
2681 $self->SUPER::update; 3004 $self->SUPER::update;
2682 3005
2683 return unless $self->{h} > 0; 3006 return unless $self->{h} > 0;
2684 3007
2685 delete $self->{texture}; 3008 delete $self->{texture};
2686 3009
2687 $ROOT->on_post_alloc ($self => sub { 3010 $ROOT->on_post_alloc ($self => sub {
3011 $self->force_uptodate;
3012
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3013 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3014
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3015 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3016 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3017 glClear GL_COLOR_BUFFER_BIT;
2720 3018
3019 package CFPlus::UI::Base;
3020 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3021 (0, 0, $self->{w}, $self->{h});
3022
3023 my $top = int $self->{children}[1]{range}[0];
3024
3025 my $paridx = 0;
3026 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3027 my $top = int $self->{children}[1]{range}[0];
2722 3028
2723 my $y0 = $top; 3029 my $y0 = $top;
2724 my $y1 = $top + $H; 3030 my $y1 = $top + $H;
2725 3031
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3032 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3033 my $h = $para->{h};
3034 my $y = $para->{y};
2734 3035
2735 if ($y0 < $y + $h && $y < $y1) { 3036 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3037 my $layout = $self->get_layout ($para);
2738 3038
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3039 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3040
2744 if (my @w = @{ $para->{widget} }) { 3041 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3042 my @s = $layout->get_shapes;
2746 3043
2747 for (@w) { 3044 for (@w) {
… …
2753 $_->draw; 3050 $_->draw;
2754 } 3051 }
2755 } 3052 }
2756 } 3053 }
2757 3054
2758 $y += $h; 3055 $paridx++;
3056 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3057 }
2760 3058
2761 glDisable GL_BLEND; 3059 $self->{top_paragraph} = $top_paragraph;
2762 }; 3060 };
2763 }); 3061 });
2764} 3062}
2765 3063
2766sub reconfigure { 3064sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3082 $self->{children}[1]->draw;
2785} 3083}
2786 3084
2787############################################################################# 3085#############################################################################
2788 3086
2789package CFClient::UI::Animator; 3087package CFPlus::UI::Animator;
2790 3088
2791use CFClient::OpenGL; 3089use CFPlus::OpenGL;
2792 3090
2793our @ISA = CFClient::UI::Bin::; 3091our @ISA = CFPlus::UI::Bin::;
2794 3092
2795sub moveto { 3093sub moveto {
2796 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2797 3095
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3096 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3124 glPopMatrix;
2827} 3125}
2828 3126
2829############################################################################# 3127#############################################################################
2830 3128
2831package CFClient::UI::Flopper; 3129package CFPlus::UI::Flopper;
2832 3130
2833our @ISA = CFClient::UI::Button::; 3131our @ISA = CFPlus::UI::Button::;
2834 3132
2835sub new { 3133sub new {
2836 my $class = shift; 3134 my $class = shift;
2837 3135
2838 my $self = $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3148 $self->{other}->toggle_visibility;
2851} 3149}
2852 3150
2853############################################################################# 3151#############################################################################
2854 3152
2855package CFClient::UI::Tooltip; 3153package CFPlus::UI::Tooltip;
2856 3154
2857our @ISA = CFClient::UI::Bin::; 3155our @ISA = CFPlus::UI::Bin::;
2858 3156
2859use CFClient::OpenGL; 3157use CFPlus::OpenGL;
2860 3158
2861sub new { 3159sub new {
2862 my $class = shift; 3160 my $class = shift;
2863 3161
2864 $class->SUPER::new ( 3162 $class->SUPER::new (
… …
2867 ) 3165 )
2868} 3166}
2869 3167
2870sub set_tooltip_from { 3168sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3169 my ($self, $widget) = @_;
3170
3171 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3172 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3173
2873 my $tooltip = $widget->{tooltip}; 3174 my $tooltip = $widget->{tooltip};
2874 3175
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3176 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3177 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3181 }
2881 3182
2882 $tooltip =~ s/^\n+//; 3183 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3184 $tooltip =~ s/\n+$//;
2884 3185
2885 $self->add (new CFClient::UI::Label 3186 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3187 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3188 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3189 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3190 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3191 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3192 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3193 );
2893} 3194}
2894 3195
… …
2913 3214
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3215 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3216 my $widget = $self->{owner}
2916 or return; 3217 or return;
2917 3218
3219 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3220 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3221
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3222 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3223 if $x + $self->{w} > $self->{root}{w};
2922 3224
2923 $self->move_abs ($x, $y); 3225 $self->move_abs ($x, $y);
3226 } else {
3227 $self->hide;
3228 }
2924 }); 3229 });
2925} 3230}
2926 3231
2927sub _draw { 3232sub _draw {
2928 my ($self) = @_; 3233 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3257 $self->SUPER::_draw;
2953} 3258}
2954 3259
2955############################################################################# 3260#############################################################################
2956 3261
2957package CFClient::UI::Face; 3262package CFPlus::UI::Face;
2958 3263
2959our @ISA = CFClient::UI::Base::; 3264our @ISA = CFPlus::UI::DrawBG::;
2960 3265
2961use CFClient::OpenGL; 3266use CFPlus::OpenGL;
2962 3267
2963sub new { 3268sub new {
2964 my $class = shift; 3269 my $class = shift;
2965 3270
2966 my $self = $class->SUPER::new ( 3271 my $self = $class->SUPER::new (
… …
2968 can_events => 0, 3273 can_events => 0,
2969 @_, 3274 @_,
2970 ); 3275 );
2971 3276
2972 if ($self->{anim} && $self->{animspeed}) { 3277 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3278 CFPlus::weaken (my $widget = $self);
2974 3279
2975 $self->{timer} = Event->timer ( 3280 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3282 hard => 1,
2978 interval => $self->{animspeed}, 3283 interval => $self->{animspeed},
… …
3001sub _draw { 3306sub _draw {
3002 my ($self) = @_; 3307 my ($self) = @_;
3003 3308
3004 return unless $::CONN; 3309 return unless $::CONN;
3005 3310
3311 $self->SUPER::_draw;
3312
3006 my $face; 3313 my $face;
3007 3314
3008 if ($self->{frame}) { 3315 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}]; 3316 my $anim = $::CONN->{anim}[$self->{anim}];
3010 3317
… …
3032 $self->SUPER::destroy; 3339 $self->SUPER::destroy;
3033} 3340}
3034 3341
3035############################################################################# 3342#############################################################################
3036 3343
3037package CFClient::UI::Buttonbar; 3344package CFPlus::UI::Buttonbar;
3038 3345
3039our @ISA = CFClient::UI::HBox::; 3346our @ISA = CFPlus::UI::HBox::;
3040 3347
3041# TODO: should actualyl wrap buttons and other goodies. 3348# TODO: should actually wrap buttons and other goodies.
3042 3349
3043############################################################################# 3350#############################################################################
3044 3351
3045package CFClient::UI::Menu; 3352package CFPlus::UI::Menu;
3046 3353
3047our @ISA = CFClient::UI::FancyFrame::; 3354our @ISA = CFPlus::UI::Toplevel::;
3048 3355
3049use CFClient::OpenGL; 3356use CFPlus::OpenGL;
3050 3357
3051sub new { 3358sub new {
3052 my $class = shift; 3359 my $class = shift;
3053 3360
3054 my $self = $class->SUPER::new ( 3361 my $self = $class->SUPER::new (
3055 items => [], 3362 items => [],
3056 z => 100, 3363 z => 100,
3057 @_, 3364 @_,
3058 ); 3365 );
3059 3366
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3367 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3368
3062 for my $item (@{ $self->{items} }) { 3369 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3370 my ($widget, $cb, $tooltip) = @$item;
3064 3371
3065 # handle various types of items, only text for now 3372 # handle various types of items, only text for now
3066 if (!ref $widget) { 3373 if (!ref $widget) {
3374 if ($widget =~ /\t/) {
3375 my ($left, $right) = split /\t/, $widget, 2;
3376
3067 $widget = new CFClient::UI::Label 3377 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3378 can_hover => 1,
3069 can_events => 1, 3379 can_events => 1,
3380 tooltip => $tooltip,
3381 children => [
3382 (new CFPlus::UI::Label markup => $left, expand => 1),
3383 (new CFPlus::UI::Label markup => $right, align => +1),
3384 ],
3385 ;
3386
3387 } else {
3388 $widget = new CFPlus::UI::Label
3389 can_hover => 1,
3390 can_events => 1,
3070 markup => $widget, 3391 markup => $widget,
3071 tooltip => $tooltip 3392 tooltip => $tooltip;
3393 }
3072 } 3394 }
3073 3395
3074 $self->{item}{$widget} = $item; 3396 $self->{item}{$widget} = $item;
3075 3397
3076 $self->{vbox}->add ($widget); 3398 $self->{vbox}->add ($widget);
… …
3119 1 3441 1
3120} 3442}
3121 3443
3122############################################################################# 3444#############################################################################
3123 3445
3124package CFClient::UI::Multiplexer; 3446package CFPlus::UI::Multiplexer;
3125 3447
3126our @ISA = CFClient::UI::Container::; 3448our @ISA = CFPlus::UI::Container::;
3127 3449
3128sub new { 3450sub new {
3129 my $class = shift; 3451 my $class = shift;
3130 3452
3131 my $self = $class->SUPER::new ( 3453 my $self = $class->SUPER::new (
… …
3145 3467
3146 $self->{current} = $self->{children}[0] 3468 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3469 if @{ $self->{children} };
3148} 3470}
3149 3471
3472sub get_current_page {
3473 my ($self) = @_;
3474
3475 $self->{current}
3476}
3477
3150sub set_current_page { 3478sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3479 my ($self, $page_or_widget) = @_;
3152 3480
3153 my $widget = ref $page_or_widget 3481 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3482 ? $page_or_widget
… …
3186 $self->{current}->draw; 3514 $self->{current}->draw;
3187} 3515}
3188 3516
3189############################################################################# 3517#############################################################################
3190 3518
3191package CFClient::UI::Notebook; 3519package CFPlus::UI::Notebook;
3192 3520
3193our @ISA = CFClient::UI::VBox::; 3521our @ISA = CFPlus::UI::VBox::;
3194 3522
3195sub new { 3523sub new {
3196 my $class = shift; 3524 my $class = shift;
3197 3525
3198 my $self = $class->SUPER::new ( 3526 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3527 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3528 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self 3529 # filter => # will be put between multiplexer and $self
3202 @_, 3530 @_,
3203 ); 3531 );
3204 3532
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3533 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3209} 3537}
3210 3538
3211sub add { 3539sub add {
3212 my ($self, $title, $widget, $tooltip) = @_; 3540 my ($self, $title, $widget, $tooltip) = @_;
3213 3541
3214 Scalar::Util::weaken $self; 3542 CFPlus::weaken $self;
3215 3543
3216 $self->{buttonbar}->add (new CFClient::UI::Button 3544 $self->{buttonbar}->add (new CFPlus::UI::Button
3217 markup => $title, 3545 markup => $title,
3218 tooltip => $tooltip, 3546 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3547 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3548 );
3221 3549
3222 $self->{multiplexer}->add ($widget); 3550 $self->{multiplexer}->add ($widget);
3223} 3551}
3224 3552
3553sub get_current_page {
3554 my ($self) = @_;
3555
3556 $self->{multiplexer}->get_current_page
3557}
3558
3225sub set_current_page { 3559sub set_current_page {
3226 my ($self, $page) = @_; 3560 my ($self, $page) = @_;
3227 3561
3228 $self->{multiplexer}->set_current_page ($page); 3562 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 3563 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 3564}
3231 3565
3232############################################################################# 3566#############################################################################
3233 3567
3234package CFClient::UI::Combobox; 3568package CFPlus::UI::Selector;
3235 3569
3236use utf8; 3570use utf8;
3237 3571
3238our @ISA = CFClient::UI::Button::; 3572our @ISA = CFPlus::UI::Button::;
3239 3573
3240sub new { 3574sub new {
3241 my $class = shift; 3575 my $class = shift;
3242 3576
3243 my $self = $class->SUPER::new ( 3577 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 3594 my ($value, $title, $tooltip) = @$_;
3261 3595
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3596 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 3597 }
3264 3598
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3599 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 3600}
3267 3601
3268sub _set_value { 3602sub _set_value {
3269 my ($self, $value) = @_; 3603 my ($self, $value) = @_;
3270 3604
… …
3285 $self->emit (changed => $value); 3619 $self->emit (changed => $value);
3286} 3620}
3287 3621
3288############################################################################# 3622#############################################################################
3289 3623
3290package CFClient::UI::Statusbox; 3624package CFPlus::UI::Statusbox;
3291 3625
3292our @ISA = CFClient::UI::VBox::; 3626our @ISA = CFPlus::UI::VBox::;
3293 3627
3294sub new { 3628sub new {
3295 my $class = shift; 3629 my $class = shift;
3296 3630
3297 my $self = $class->SUPER::new ( 3631 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 3632 fontsize => 0.8,
3299 @_, 3633 @_,
3300 ); 3634 );
3301 3635
3302 Scalar::Util::weaken (my $this = $self); 3636 CFPlus::weaken (my $this = $self);
3303 3637
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3638 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305 3639
3306 $self 3640 $self
3307} 3641}
… …
3309sub reorder { 3643sub reorder {
3310 my ($self) = @_; 3644 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 3645 my $NOW = Time::HiRes::time;
3312 3646
3313 # freeze display when hovering over any label 3647 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 3648 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3649 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 3650 values %{ $self->{item} };
3317 3651
3318 while (my ($k, $v) = each %{ $self->{item} }) { 3652 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3653 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 3654 }
… …
3341 for ($short) { 3675 for ($short) {
3342 s/^\s+//; 3676 s/^\s+//;
3343 s/\s+/ /g; 3677 s/\s+/ /g;
3344 } 3678 }
3345 3679
3346 new CFClient::UI::Label 3680 new CFPlus::UI::Label
3347 markup => $short, 3681 markup => $short,
3348 tooltip => $item->{tooltip}, 3682 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 3683 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 3684 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 3685 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 3739 count => 1,
3406 %arg, 3740 %arg,
3407 }; 3741 };
3408 } 3742 }
3409 3743
3744 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3745 $self->reorder;
3746 });
3411} 3747}
3412 3748
3413sub reconfigure { 3749sub reconfigure {
3414 my ($self) = @_; 3750 my ($self) = @_;
3415 3751
… …
3428 $self->SUPER::destroy; 3764 $self->SUPER::destroy;
3429} 3765}
3430 3766
3431############################################################################# 3767#############################################################################
3432 3768
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 3769package CFPlus::UI::Root;
3806 3770
3807our @ISA = CFClient::UI::Container::; 3771our @ISA = CFPlus::UI::Container::;
3808 3772
3809use List::Util qw(min max); 3773use List::Util qw(min max);
3810 3774
3811use CFClient::OpenGL; 3775use CFPlus::OpenGL;
3812 3776
3813sub new { 3777sub new {
3814 my $class = shift; 3778 my $class = shift;
3815 3779
3816 my $self = $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3817 visible => 1, 3781 visible => 1,
3818 @_, 3782 @_,
3819 ); 3783 );
3820 3784
3821 Scalar::Util::weaken ($self->{root} = $self); 3785 CFPlus::weaken ($self->{root} = $self);
3822 3786
3823 $self 3787 $self
3824} 3788}
3825 3789
3826sub size_request { 3790sub size_request {
… …
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3956 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 3957
3994 $w = 0 if $w < 0; 3958 $w = 0 if $w < 0;
3995 $h = 0 if $h < 0; 3959 $h = 0 if $h < 0;
3996 3960
3961 $w = max $widget->{min_w}, $w;
3962 $h = max $widget->{min_h}, $h;
3963
3964# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3965# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3966
3967 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3968 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3969
3997 $w = int $w + 0.5; 3970 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 3971 $h = int $h + 0.5;
3999 3972
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3973 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 3974 $widget->{old_w} = $widget->{w};
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3997 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 3998 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 3999 glLoadIdentity;
4027 4000
4028 { 4001 {
4029 package CFClient::UI::Base; 4002 package CFPlus::UI::Base;
4030 4003
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4004 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4005 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4006
4035 $self->_draw; 4007 $self->_draw;
4008 }
4036} 4009}
4037 4010
4038############################################################################# 4011#############################################################################
4039 4012
4040package CFClient::UI; 4013package CFPlus::UI;
4041 4014
4042$ROOT = new CFClient::UI::Root; 4015$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4016$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4017
40451 40181
4046 4019

Diff Legend

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