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.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 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;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
96 99
97sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
98 my ($ev) = @_; 101 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
100 103
101 unless ($BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
103 108
104 $GRAB = $widget; 109 $GRAB = $widget;
105 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
106 111
107 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
108 } 113 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
207 reconfigure_widgets; 214 reconfigure_widgets;
208} 215}
209 216
210############################################################################# 217#############################################################################
211 218
212package CFClient::UI::Event; 219package CFPlus::UI::Event;
213 220
214sub xy { 221sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 223}
217 224
218############################################################################# 225#############################################################################
219 226
220package CFClient::UI::Base; 227package CFPlus::UI::Base;
221 228
222use strict; 229use strict;
223 230
224use CFClient::OpenGL; 231use CFPlus::OpenGL;
225 232
226sub new { 233sub new {
227 my $class = shift; 234 my $class = shift;
228 235
229 my $self = bless { 236 my $self = bless {
… …
234 h => undef, 241 h => undef,
235 can_events => 1, 242 can_events => 1,
236 @_ 243 @_
237 }, $class; 244 }, $class;
238 245
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 247
241 for (keys %$self) { 248 for (keys %$self) {
242 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
244 } 251 }
245 } 252 }
246 253
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 259
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 262
256 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
261 268
262sub destroy { 269sub destroy {
263 my ($self) = @_; 270 my ($self) = @_;
264 271
265 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
266 %$self = (); 274 %$self = ();
267} 275}
268 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
269sub show { 281sub show {
270 my ($self) = @_; 282 my ($self) = @_;
271 283
272 return if $self->{parent}; 284 return if $self->{parent};
273 285
274 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
275} 287}
276 288
277sub set_visible { 289sub set_visible {
278 my ($self) = @_; 290 my ($self) = @_;
279 291
… …
300 delete $self->{root}; 312 delete $self->{root};
301 313
302 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
304 316
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
307 319
308 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
310} 322}
… …
312sub set_visibility { 324sub set_visibility {
313 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
314 326
315 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
316 328
317 $visible ? $self->hide 329 $visible ? $self->show
318 : $self->show; 330 : $self->hide;
319} 331}
320 332
321sub toggle_visibility { 333sub toggle_visibility {
322 my ($self) = @_; 334 my ($self) = @_;
323 335
… …
367 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
368 380
369 if ($self->{aspect}) { 381 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
371 383
372 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 386
375 # use alignment to adjust x, y 387 # use alignment to adjust x, y
376 388
377 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
419 431
420 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
421 433
422 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
423 435
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 439 }
428} 440}
429 441
430# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
431sub coord2local { 443sub coord2local {
432 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
433 445
446 Carp::confess unless $self->{parent};#d#
447
434 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435} 449}
436 450
437# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
438sub coord2global { 452sub coord2global {
439 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
454
455 Carp::confess unless $self->{parent};#d#
440 456
441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442} 458}
443 459
444sub invoke_focus_in { 460sub invoke_focus_in {
… …
492 508
493sub connect { 509sub connect {
494 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
495 511
496 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
497} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
498 532
499sub emit { 533sub emit {
500 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
501 535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
502 my @append 538 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event") 539 = $has_coords{$signal}
504 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
505 : (); 541 : ();
506 542
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508 544
509 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
513} 554}
514 555
515sub find_widget { 556#sub find_widget {
516 my ($self, $x, $y) = @_; 557# in .xs
517
518 return () unless $self->{can_events};
519
520 return $self
521 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
522 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
523
524 ()
525}
526 558
527sub set_parent { 559sub set_parent {
528 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
529 561
530 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
531 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
532} 564}
533 565
534sub realloc { 566sub realloc {
535 my ($self) = @_; 567 my ($self) = @_;
… …
561 593
562# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
563# functions seems pointless. 595# functions seems pointless.
564our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
565 597
566sub draw { 598#sub draw {
567 my ($self) = @_; 599#CFPlus.xs
568
569 return unless $self->{h} && $self->{w};
570
571 # update screen rectangle
572 local $draw_x = $draw_x + $self->{x};
573 local $draw_y = $draw_y + $self->{y};
574
575 # skip widgets that are entirely outside the drawing area
576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
578
579 glPushMatrix;
580 glTranslate $self->{x}, $self->{y}, 0;
581
582 if ($self == $HOVER && $self->{can_hover}) {
583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
584 glEnable GL_BLEND;
585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
586 glBegin GL_QUADS;
587 glVertex 0 , 0;
588 glVertex $self->{w}, 0;
589 glVertex $self->{w}, $self->{h};
590 glVertex 0 , $self->{h};
591 glEnd;
592 glDisable GL_BLEND;
593 }
594
595 if ($ENV{CFPLUS_DEBUG} & 1) {
596 glPushMatrix;
597 glColor 1, 1, 0, 1;
598 glTranslate 0.375, 0.375;
599 glBegin GL_LINE_LOOP;
600 glVertex 0 , 0;
601 glVertex $self->{w} - 1, 0;
602 glVertex $self->{w} - 1, $self->{h} - 1;
603 glVertex 0 , $self->{h} - 1;
604 glEnd;
605 glPopMatrix;
606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
607 }
608
609 $self->_draw;
610 glPopMatrix;
611}
612 600
613sub _draw { 601sub _draw {
614 my ($self) = @_; 602 my ($self) = @_;
615 603
616 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
617} 605}
618 606
619sub DESTROY { 607sub DESTROY {
620 my ($self) = @_; 608 my ($self) = @_;
621 609
622 return if CFClient::in_destruct; 610 return if CFPlus::in_destruct;
623 611
624 delete $WIDGET{$self+0}; 612 local $@;
625
626 eval { $self->destroy }; 613 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
615
616 delete $WIDGET{$self+0};
628} 617}
629 618
630############################################################################# 619#############################################################################
631 620
632package CFClient::UI::DrawBG; 621package CFPlus::UI::DrawBG;
633 622
634our @ISA = CFClient::UI::Base::; 623our @ISA = CFPlus::UI::Base::;
635 624
636use strict; 625use strict;
637use CFClient::OpenGL; 626use CFPlus::OpenGL;
638 627
639sub new { 628sub new {
640 my $class = shift; 629 my $class = shift;
641
642 # range [value, low, high, page]
643 630
644 $class->SUPER::new ( 631 $class->SUPER::new (
645 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
646 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
647 @_ 634 @_
… …
659 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
660 647
661 glEnable GL_BLEND; 648 glEnable GL_BLEND;
662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
663 glColor_premultiply @$color; 650 glColor_premultiply @$color;
664
665 glBegin GL_QUADS;
666 glVertex 0 , 0;
667 glVertex 0 , $h;
668 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
669 glVertex $w, 0;
670 glEnd;
671
672 glDisable GL_BLEND; 652 glDisable GL_BLEND;
673 } 653 }
674} 654}
675 655
676############################################################################# 656#############################################################################
677 657
678package CFClient::UI::Empty; 658package CFPlus::UI::Empty;
679 659
680our @ISA = CFClient::UI::Base::; 660our @ISA = CFPlus::UI::Base::;
681 661
682sub new { 662sub new {
683 my ($class, %arg) = @_; 663 my ($class, %arg) = @_;
684 $class->SUPER::new (can_events => 0, %arg); 664 $class->SUPER::new (can_events => 0, %arg);
685} 665}
… …
692 672
693sub draw { } 673sub draw { }
694 674
695############################################################################# 675#############################################################################
696 676
697package CFClient::UI::Container; 677package CFPlus::UI::Container;
698 678
699our @ISA = CFClient::UI::Base::; 679our @ISA = CFPlus::UI::Base::;
700 680
701sub new { 681sub new {
702 my ($class, %arg) = @_; 682 my ($class, %arg) = @_;
703 683
704 my $children = delete $arg{children}; 684 my $children = delete $arg{children};
… …
708 can_events => 0, 688 can_events => 0,
709 %arg, 689 %arg,
710 ); 690 );
711 691
712 $self->add (@$children) 692 $self->add (@$children)
713 if $children; 693 if $children && @$children;
714 694
715 $self 695 $self
696}
697
698sub realloc {
699 my ($self) = @_;
700
701 $self->{force_realloc} = 1;
702 $self->{force_size_alloc} = 1;
703 $self->SUPER::realloc;
716} 704}
717 705
718sub add { 706sub add {
719 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
720 708
721 $_->set_parent ($self) 709 $_->set_parent ($self)
722 for @widgets; 710 for @widgets;
723 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
724 use sort 'stable'; 713 use sort 'stable';
725 714
726 $self->{children} = [ 715 $self->{children} = [
727 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
728 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
729 ]; 718 ];
730 719
731 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
732} 725}
733 726
734sub children { 727sub children {
735 @{ $_[0]{children} } 728 @{ $_[0]{children} }
736} 729}
737 730
738sub remove { 731sub remove {
739 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
740 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
741 delete $child->{parent}; 737 delete $child->{parent};
742 $child->hide; 738 $child->hide;
743
744 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
745 741
746 $self->realloc; 742 $self->realloc;
747} 743}
748 744
749sub clear { 745sub clear {
750 my ($self) = @_; 746 my ($self) = @_;
751 747
752 my $children = delete $self->{children}; 748 my $children = $self->{children};
753 $self->{children} = []; 749 $self->{children} = [];
754 750
755 for (@$children) { 751 for (@$children) {
756 delete $_->{parent}; 752 delete $_->{parent};
757 $_->hide; 753 $_->hide;
… …
777} 773}
778 774
779sub _draw { 775sub _draw {
780 my ($self) = @_; 776 my ($self) = @_;
781 777
782 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
783} 779}
784 780
785############################################################################# 781#############################################################################
786 782
787package CFClient::UI::Bin; 783package CFPlus::UI::Bin;
788 784
789our @ISA = CFClient::UI::Container::; 785our @ISA = CFPlus::UI::Container::;
790 786
791sub new { 787sub new {
792 my ($class, %arg) = @_; 788 my ($class, %arg) = @_;
793 789
794 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 790 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795 791
796 $class->SUPER::new (children => [$child], %arg) 792 $class->SUPER::new (children => [$child], %arg)
797} 793}
798 794
799sub add { 795sub add {
800 my ($self, $child) = @_; 796 my ($self, $child) = @_;
801 797
802 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
803 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
804} 800}
805 801
806sub remove { 802sub remove {
807 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
808 804
809 $self->SUPER::remove ($widget); 805 $self->SUPER::remove ($widget);
810 806
811 $self->{children} = [new CFClient::UI::Empty] 807 $self->{children} = [new CFPlus::UI::Empty]
812 unless @{$self->{children}}; 808 unless @{$self->{children}};
813} 809}
814 810
815sub child { $_[0]->{children}[0] } 811sub child { $_[0]->{children}[0] }
816 812
… …
828 824
829############################################################################# 825#############################################################################
830 826
831# back-buffered drawing area 827# back-buffered drawing area
832 828
833package CFClient::UI::Window; 829package CFPlus::UI::Window;
834 830
835our @ISA = CFClient::UI::Bin::; 831our @ISA = CFPlus::UI::Bin::;
836 832
837use CFClient::OpenGL; 833use CFPlus::OpenGL;
838 834
839sub new { 835sub new {
840 my ($class, %arg) = @_; 836 my ($class, %arg) = @_;
841 837
842 my $self = $class->SUPER::new (%arg); 838 my $self = $class->SUPER::new (%arg);
… …
864} 860}
865 861
866sub render_child { 862sub render_child {
867 my ($self) = @_; 863 my ($self) = @_;
868 864
869 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 865 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
870 glClearColor 0, 0, 0, 0; 866 glClearColor 0, 0, 0, 0;
871 glClear GL_COLOR_BUFFER_BIT; 867 glClear GL_COLOR_BUFFER_BIT;
872 868
873 { 869 {
874 package CFClient::UI::Base; 870 package CFPlus::UI::Base;
875 871
876 ($draw_x, $draw_y, $draw_w, $draw_h) = 872 local ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h}); 873 (0, 0, $self->{w}, $self->{h});
874
875 $self->_render;
878 } 876 }
879
880 $self->_render;
881 }; 877 };
882} 878}
883 879
884sub _draw { 880sub _draw {
885 my ($self) = @_; 881 my ($self) = @_;
886
887 my ($w, $h) = @$self{qw(w h)};
888 882
889 my $tex = $self->{texture} 883 my $tex = $self->{texture}
890 or return; 884 or return;
891 885
892 glEnable GL_TEXTURE_2D; 886 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894 glColor 0, 0, 0, 1; 888 glColor 0, 0, 0, 1;
895 889
896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 890 $tex->draw_quad_alpha_premultiplied (0, 0);
897 891
898 glDisable GL_TEXTURE_2D; 892 glDisable GL_TEXTURE_2D;
899} 893}
900 894
901############################################################################# 895#############################################################################
902 896
903package CFClient::UI::ViewPort; 897package CFPlus::UI::ViewPort;
904 898
899use List::Util qw(min max);
900
905our @ISA = CFClient::UI::Window::; 901our @ISA = CFPlus::UI::Window::;
906 902
907sub new { 903sub new {
908 my $class = shift; 904 my $class = shift;
909 905
910 $class->SUPER::new ( 906 $class->SUPER::new (
… …
917sub size_request { 913sub size_request {
918 my ($self) = @_; 914 my ($self) = @_;
919 915
920 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
921 917
922 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
923 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
924 920
925 ($w, $h) 921 ($w, $h)
926} 922}
927 923
928sub invoke_size_allocate { 924sub invoke_size_allocate {
… …
940} 936}
941 937
942sub set_offset { 938sub set_offset {
943 my ($self, $x, $y) = @_; 939 my ($self, $x, $y) = @_;
944 940
941 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
942 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
943
944 if ($x != $self->{view_x} or $y != $self->{view_y}) {
945 $self->{view_x} = int $x; 945 $self->{view_x} = $x;
946 $self->{view_y} = int $y; 946 $self->{view_y} = $y;
947 947
948 $self->emit (changed => $x, $y);
948 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
968 }
949} 969}
950 970
951# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
952sub coord2local { 972sub coord2local {
953 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
… …
968 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
969 989
970 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
972 ) { 992 ) {
973 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974 } else { 994 } else {
975 $self->CFClient::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
976 } 996 }
977} 997}
978 998
979sub _render { 999sub _render {
980 my ($self) = @_; 1000 my ($self) = @_;
981 1001
982 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1002 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
983 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1003 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984 1004
985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1005 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986 1006
987 $self->SUPER::_render; 1007 $self->SUPER::_render;
988} 1008}
989 1009
990############################################################################# 1010#############################################################################
991 1011
992package CFClient::UI::ScrolledWindow; 1012package CFPlus::UI::ScrolledWindow;
993 1013
994our @ISA = CFClient::UI::HBox::; 1014our @ISA = CFPlus::UI::Table::;
995 1015
996sub new { 1016sub new {
997 my ($class, %arg) = @_; 1017 my ($class, %arg) = @_;
998 1018
999 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1000 1020
1001 my $self; 1021 my $self;
1002 1022
1003 my $slider = new CFClient::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1026 vertical => 0,
1027 range => [0, 0, 1, 0.01], # HACK fix
1028 on_changed => sub {
1029 $self->{hpos} = $_[1];
1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1031 },
1032 ;
1033
1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
1004 vertical => 1, 1037 vertical => 1,
1005 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1006 on_changed => sub { 1039 on_changed => sub {
1007 $self->{vp}->set_offset (0, $_[1]); 1040 $self->{vpos} = $_[1];
1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008 }, 1042 },
1009 ; 1043 ;
1010 1044
1011 $self = $class->SUPER::new ( 1045 $self = $class->SUPER::new (
1012 vp => (new CFClient::UI::ViewPort expand => 1), 1046 scroll_x => 0,
1047 scroll_y => 1,
1013 can_events => 1, 1048 can_events => 1,
1014 slider => $slider, 1049 hslider => $hslider,
1050 vslider => $vslider,
1051 col_expand => [1, 0],
1052 row_expand => [1, 0],
1015 %arg, 1053 %arg,
1016 ); 1054 );
1017 1055
1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1059 expand => 1,
1060 scroll_x => $self->{scroll_x},
1061 scroll_y => $self->{scroll_y},
1062 on_changed => sub {
1063 my ($vp, $x, $y) = @_;
1064
1065 $vp->{parent}{hslider}->set_value ($x);
1066 $vp->{parent}{vslider}->set_value ($y);
1067
1068 0
1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1075 ;
1076
1018 $self->SUPER::add ($self->{vp}, $self->{slider}); 1077 $self->SUPER::add ($self->{vp});
1078
1019 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1020 1080
1021 $self 1081 $self
1022} 1082}
1023
1024#TODO# update range on size_allocate depending on child
1025 1083
1026sub add { 1084sub add {
1027 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1028 1086
1029 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1030} 1088}
1031 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1094sub update_slider {
1095 my ($self) = @_;
1096
1097 my $child = ($self->{vp} or return)->child;
1098
1099 if ($self->{scroll_x}) {
1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1102
1103 my $visible = $w1 > $w2;
1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1106 $visible ? $self->SUPER::add ($self->{hslider})
1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1109 }
1110
1111 if ($self->{scroll_y}) {
1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1114
1115 my $visible = $h1 > $h2;
1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
1125 my ($self, $ev) = @_;
1126
1127 $self->grab_focus;
1128
1129 my $ox = $self->{vp}{view_x};
1130 my $oy = $self->{vp}{view_y};
1131
1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1139 };
1140}
1141
1032sub invoke_mouse_wheel { 1142sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_; 1143 my ($self, $ev) = @_;
1034 1144
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev); 1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1038 1147
1039 1 1148 1
1040} 1149}
1041 1150
1042sub update_slider { 1151sub invoke_button_down {
1043 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1044 1153
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1046} 1155 $self->start_dragging ($ev);
1156 return 1;
1157 }
1047 1158
1048sub update { 1159 0
1049 my ($self) = @_; 1160}
1050 1161
1051 $self->SUPER::update; 1162sub invoke_button_up {
1163 my ($self, $ev, $x, $y) = @_;
1052 1164
1053 $self->update_slider; 1165 if (delete $self->{motion}) {
1166 return 1;
1167 }
1168
1169 0
1170}
1171
1172sub invoke_mouse_motion {
1173 my ($self, $ev, $x, $y) = @_;
1174
1175 if ($self->{motion}) {
1176 $self->{motion}->($ev, $x, $y);
1177 return 1;
1178 }
1179
1180 0
1054} 1181}
1055 1182
1056sub invoke_size_allocate { 1183sub invoke_size_allocate {
1057 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1058 1185
1059 $self->update_slider; 1186 $self->update_slider;
1060
1061 $self->SUPER::invoke_size_allocate ($w, $h) 1187 $self->SUPER::invoke_size_allocate ($w, $h)
1062} 1188}
1063 1189
1064############################################################################# 1190#############################################################################
1065 1191
1066package CFClient::UI::Frame; 1192package CFPlus::UI::Frame;
1067 1193
1068our @ISA = CFClient::UI::Bin::; 1194our @ISA = CFPlus::UI::Bin::;
1069 1195
1070use CFClient::OpenGL; 1196use CFPlus::OpenGL;
1071 1197
1072sub new { 1198sub new {
1073 my $class = shift; 1199 my $class = shift;
1074 1200
1075 $class->SUPER::new ( 1201 $class->SUPER::new (
… …
1085 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1086 1212
1087 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1089 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1090
1091 glBegin GL_QUADS;
1092 glVertex 0 , 0;
1093 glVertex 0 , $h;
1094 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1095 glVertex $w, 0;
1096 glEnd;
1097
1098 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1099 } 1218 }
1100 1219
1101 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1102} 1221}
1103 1222
1104############################################################################# 1223#############################################################################
1105 1224
1106package CFClient::UI::FancyFrame; 1225package CFPlus::UI::FancyFrame;
1107 1226
1108our @ISA = CFClient::UI::Bin::; 1227our @ISA = CFPlus::UI::Bin::;
1109 1228
1110use CFClient::OpenGL; 1229use CFPlus::OpenGL;
1230
1231sub new {
1232 my ($class, %arg) = @_;
1233
1234 if ((exists $arg{label}) && !ref $arg{label}) {
1235 $arg{label} = new CFPlus::UI::Label
1236 align => 1,
1237 valign => 0,
1238 text => $arg{label},
1239 fontsize => ($arg{border} || 0.8) * 0.75;
1240 }
1241
1242 my $self = $class->SUPER::new (
1243 # label => "",
1244 fg => [0.6, 0.3, 0.1],
1245 border => 0.8,
1246 style => 'single',
1247 %arg,
1248 );
1249
1250 $self
1251}
1252
1253sub add {
1254 my ($self, @widgets) = @_;
1255
1256 $self->SUPER::add (@widgets);
1257 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1258}
1259
1260sub border {
1261 int $_[0]{border} * $::FONTSIZE
1262}
1263
1264sub size_request {
1265 my ($self) = @_;
1266
1267 ($self->{label_w}, undef) = $self->{label}->size_request
1268 if $self->{label};
1269
1270 my ($w, $h) = $self->SUPER::size_request;
1271
1272 (
1273 $w + $self->border * 2,
1274 $h + $self->border * 2,
1275 )
1276}
1277
1278sub invoke_size_allocate {
1279 my ($self, $w, $h) = @_;
1280
1281 my $border = $self->border;
1282
1283 $w -= List::Util::max 0, $border * 2;
1284 $h -= List::Util::max 0, $border * 2;
1285
1286 if (my $label = $self->{label}) {
1287 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1288 $label->{h} = List::Util::min $h, $border;
1289 $label->invoke_size_allocate ($label->{w}, $label->{h});
1290 }
1291
1292 $self->child->configure ($border, $border, $w, $h);
1293
1294 1
1295}
1296
1297sub _draw {
1298 my ($self) = @_;
1299
1300 my $child = $self->{children}[0];
1301
1302 my $border = $self->border;
1303 my ($w, $h) = ($self->{w}, $self->{h});
1304
1305 $child->draw;
1306
1307 glColor @{$self->{fg}};
1308 glBegin GL_LINE_STRIP;
1309 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1310 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1311 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1312 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1313 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1314 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1315 glEnd;
1316
1317 if ($self->{label}) {
1318 glTranslate $border * 2, 0;
1319 $self->{label}->_draw;
1320 }
1321}
1322
1323#############################################################################
1324
1325package CFPlus::UI::Toplevel;
1326
1327our @ISA = CFPlus::UI::Bin::;
1328
1329use CFPlus::OpenGL;
1111 1330
1112my $bg = 1331my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1332 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1; 1333 mipmap => 1, wrap => 1;
1115 1334
1116my @border = 1335my @border =
1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1338
1339my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png);
1119 1342
1120sub new { 1343sub new {
1121 my ($class, %arg) = @_; 1344 my ($class, %arg) = @_;
1122 1345
1123 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
… …
1128 min_w => 64, 1351 min_w => 64,
1129 min_h => 32, 1352 min_h => 32,
1130 %arg, 1353 %arg,
1131 ); 1354 );
1132 1355
1133 $self->{title_widget} = new CFClient::UI::Label 1356 $self->{title_widget} = new CFPlus::UI::Label
1134 align => 0, 1357 align => 0,
1135 valign => 1, 1358 valign => 1,
1136 text => $self->{title}, 1359 text => $self->{title},
1137 fontsize => $self->{border}, 1360 fontsize => $self->{border},
1138 if exists $self->{title}; 1361 if exists $self->{title};
1139 1362
1140 if ($self->{has_close_button}) { 1363 if ($self->{has_close_button}) {
1141 $self->{close_button} = 1364 $self->{close_button} =
1142 new CFClient::UI::ImageButton 1365 new CFPlus::UI::ImageButton
1143 path => 'x1_close.png', 1366 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") }; 1367 on_activate => sub { $self->emit ("delete") };
1145 1368
1146 $self->CFClient::UI::Container::add ($self->{close_button}); 1369 $self->CFPlus::UI::Container::add ($self->{close_button});
1147 } 1370 }
1148 1371
1149 $self 1372 $self
1150} 1373}
1151 1374
1152sub add { 1375sub add {
1153 my ($self, @widgets) = @_; 1376 my ($self, @widgets) = @_;
1154 1377
1155 $self->SUPER::add (@widgets); 1378 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1379 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1380 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158} 1381}
1159 1382
1160sub border { 1383sub border {
1161 int $_[0]{border} * $::FONTSIZE 1384 int $_[0]{border} * $::FONTSIZE
1162} 1385}
… …
1270 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1493 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271 1494
1272 ! ! $self->{motion} 1495 ! ! $self->{motion}
1273} 1496}
1274 1497
1498sub invoke_visibility_change {
1499 my ($self, $visible) = @_;
1500
1501 delete $self->{motion} unless $visible;
1502
1503 0
1504}
1505
1275sub _draw { 1506sub _draw {
1276 my ($self) = @_; 1507 my ($self) = @_;
1277 1508
1278 my $child = $self->{children}[0]; 1509 my $child = $self->{children}[0];
1279 1510
… …
1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1285 1516
1286 my $border = $self->border; 1517 my $border = $self->border;
1287 1518
1288 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1289 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1292 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524
1525 # move
1526 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531
1532 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1293 1538
1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1295 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1296 1541
1297 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
… …
1316 if $self->{close_button}; 1561 if $self->{close_button};
1317} 1562}
1318 1563
1319############################################################################# 1564#############################################################################
1320 1565
1321package CFClient::UI::Table; 1566package CFPlus::UI::Table;
1322 1567
1323our @ISA = CFClient::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1324 1569
1325use List::Util qw(max sum); 1570use List::Util qw(max sum);
1326 1571
1327use CFClient::OpenGL; 1572use CFPlus::OpenGL;
1328 1573
1329sub new { 1574sub new {
1330 my $class = shift; 1575 my $class = shift;
1331 1576
1332 $class->SUPER::new ( 1577 $class->SUPER::new (
1333 col_expand => [], 1578 col_expand => [],
1579 row_expand => [],
1334 @_, 1580 @_,
1335 ) 1581 )
1336} 1582}
1337 1583
1338sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340}
1341
1342sub add { 1584sub add {
1343 my ($self, $x, $y, $child) = @_; 1585 my ($self, @widgets) = @_;
1344 1586
1345 $child->set_parent ($self); 1587 for my $child (@widgets) {
1346 $self->{children}[$y][$x] = $child; 1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1347 1591
1348 $self->realloc; 1592 $self->SUPER::add (@widgets);
1349} 1593}
1350 1594
1351sub remove { 1595sub add_at {
1596 my $self = shift;
1597
1598 my @widgets;
1599
1600 while (@_) {
1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1602
1603 $child->{c_row} = $row;
1604 $child->{c_col} = $col;
1605
1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1352 my ($self, $child) = @_; 1613 my ($self) = @_;
1353 1614
1354 # TODO: not yet implemented 1615 my (@w, @h);
1355}
1356
1357# TODO: move to container class maybe? send children a signal on removal?
1358sub clear {
1359 my ($self) = @_;
1360 1616
1361 my @children = $self->children; 1617 my @children = $self->children;
1362 delete $self->{children}; 1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 }
1363 1628 }
1364 for (@children) {
1365 delete $_->{parent};
1366 $_->hide;
1367 }
1368 1629
1369 $self->realloc; 1630 # second pass, rows
1370} 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1371
1372sub get_wh {
1373 my ($self) = @_;
1374
1375 my (@w, @h);
1376
1377 for my $y (0 .. $#{$self->{children}}) {
1378 my $row = $self->{children}[$y]
1379 or next;
1380
1381 for my $x (0 .. $#$row) {
1382 my $widget = $row->[$x]
1383 or next;
1384 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1385 1633
1386 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1387 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1388 } 1638 }
1389 } 1639 }
1390 1640
1391 (\@w, \@h) 1641 (\@w, \@h)
1392} 1642}
… …
1408 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1409 1659
1410 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1411 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1412 1662
1413 # TODO: nicer code && do row_expand 1663 # now linearly scale the rows/columns to the allocated size
1414 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1415 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1416 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1417 1667
1418 # linearly scale sizes
1419 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421 1669
1422 CFClient::UI::harmonize $ws; 1670 CFPlus::UI::harmonize $ws;
1671
1672 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1;
1675
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677
1423 CFClient::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1424 1679
1425 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1426 1682
1427 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1428 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1429 or next;
1430 1685
1431 my $x = 0; 1686 $widget->configure (
1432 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1433 1689 );
1434 for my $c (0 .. $#$row) { 1690 }
1435 my $col_w = $ws->[$c];
1436 1691
1437 if (my $widget = $row->[$c]) { 1692 1
1438 $widget->configure ($x, $y, $col_w, $row_h); 1693}
1439 }
1440 1694
1441 $x += $col_w; 1695#############################################################################
1696
1697package CFPlus::UI::Fixed;
1698
1699use List::Util qw(min max);
1700
1701our @ISA = CFPlus::UI::Container::;
1702
1703sub _scale($$$) {
1704 my ($rel, $val, $max) = @_;
1705
1706 $rel ? $val * $max : $val
1707}
1708
1709sub size_request {
1710 my ($self) = @_;
1711
1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1713
1714 # determine overall size by querying abs widgets
1715 for my $child ($self->visible_children) {
1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1719
1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1442 } 1722 }
1723 }
1443 1724
1444 $y += $row_h; 1725 my $W = $x2 - $x1;
1726 my $H = $y2 - $y1;
1727
1728 # now layout remaining widgets
1729 for my $child ($self->visible_children) {
1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x += $child->{c_halign} * $child->{req_w};
1753 $y += $child->{c_valign} * $child->{req_h};
1754
1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1445 } 1756 }
1446 1757
1447 1 1758 1
1448} 1759}
1449 1760
1450sub find_widget {
1451 my ($self, $x, $y) = @_;
1452
1453 $x -= $self->{x};
1454 $y -= $self->{y};
1455
1456 my $res;
1457
1458 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1459 $res = $_->find_widget ($x, $y)
1460 and return $res;
1461 }
1462
1463 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1464}
1465
1466sub _draw {
1467 my ($self) = @_;
1468
1469 for (grep $_, @{$self->{children}}) {
1470 $_->draw for grep $_, @$_;
1471 }
1472}
1473
1474############################################################################# 1761#############################################################################
1475 1762
1476package CFClient::UI::Box; 1763package CFPlus::UI::Box;
1477 1764
1478our @ISA = CFClient::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1479 1766
1480sub size_request { 1767sub size_request {
1481 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1482 1771
1483 $self->{vertical} 1772 $self->{vertical}
1484 ? ( 1773 ? (
1485 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1486 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1487 ) 1776 )
1488 : ( 1777 : (
1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1490 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1491 ) 1780 )
1492} 1781}
1493 1782
1494sub invoke_size_allocate { 1783sub invoke_size_allocate {
1495 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1516 $req[$_] += $space * $children[$_]{expand} 1805 $req[$_] += $space * $children[$_]{expand}
1517 for 0 .. $#children; 1806 for 0 .. $#children;
1518 } 1807 }
1519 } 1808 }
1520 1809
1521 CFClient::UI::harmonize \@req; 1810 CFPlus::UI::harmonize \@req;
1522 1811
1523 my $pos = 0; 1812 my $pos = 0;
1524 for (0 .. $#children) { 1813 for (0 .. $#children) {
1525 my $alloc = $req[$_]; 1814 my $alloc = $req[$_];
1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1815 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1531 1 1820 1
1532} 1821}
1533 1822
1534############################################################################# 1823#############################################################################
1535 1824
1536package CFClient::UI::HBox; 1825package CFPlus::UI::HBox;
1537 1826
1538our @ISA = CFClient::UI::Box::; 1827our @ISA = CFPlus::UI::Box::;
1539 1828
1540sub new { 1829sub new {
1541 my $class = shift; 1830 my $class = shift;
1542 1831
1543 $class->SUPER::new ( 1832 $class->SUPER::new (
… …
1546 ) 1835 )
1547} 1836}
1548 1837
1549############################################################################# 1838#############################################################################
1550 1839
1551package CFClient::UI::VBox; 1840package CFPlus::UI::VBox;
1552 1841
1553our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1554 1843
1555sub new { 1844sub new {
1556 my $class = shift; 1845 my $class = shift;
1557 1846
1558 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1561 ) 1850 )
1562} 1851}
1563 1852
1564############################################################################# 1853#############################################################################
1565 1854
1566package CFClient::UI::Label; 1855package CFPlus::UI::Label;
1567 1856
1568our @ISA = CFClient::UI::DrawBG::; 1857our @ISA = CFPlus::UI::DrawBG::;
1569 1858
1570use CFClient::OpenGL; 1859use CFPlus::OpenGL;
1571 1860
1572sub new { 1861sub new {
1573 my ($class, %arg) = @_; 1862 my ($class, %arg) = @_;
1574 1863
1575 my $self = $class->SUPER::new ( 1864 my $self = $class->SUPER::new (
… …
1578 #active_bg => none 1867 #active_bg => none
1579 #font => default_font 1868 #font => default_font
1580 #text => initial text 1869 #text => initial text
1581 #markup => initial narkup 1870 #markup => initial narkup
1582 #max_w => maximum pixel width 1871 #max_w => maximum pixel width
1872 #style => 0, # render flags
1583 ellipsise => 3, # end 1873 ellipsise => 3, # end
1584 layout => (new CFClient::Layout), 1874 layout => (new CFPlus::Layout),
1585 fontsize => 1, 1875 fontsize => 1,
1586 align => -1, 1876 align => -1,
1587 valign => -1, 1877 valign => -1,
1588 padding_x => 2, 1878 padding_x => 2,
1589 padding_y => 2, 1879 padding_y => 2,
1590 can_events => 0, 1880 can_events => 0,
1591 %arg 1881 %arg
1592 ); 1882 );
1593 1883
1594 if (exists $self->{template}) { 1884 if (exists $self->{template}) {
1595 my $layout = new CFClient::Layout; 1885 my $layout = new CFPlus::Layout;
1596 $layout->set_text (delete $self->{template}); 1886 $layout->set_text (delete $self->{template});
1597 $self->{template} = $layout; 1887 $self->{template} = $layout;
1598 } 1888 }
1599 1889
1600 if (exists $self->{markup}) { 1890 if (exists $self->{markup}) {
… …
1604 } 1894 }
1605 1895
1606 $self 1896 $self
1607} 1897}
1608 1898
1609sub escape($) {
1610 local $_ = $_[0];
1611
1612 s/&/&amp;/g;
1613 s/>/&gt;/g;
1614 s/</&lt;/g;
1615
1616 $_
1617}
1618
1619sub update { 1899sub update {
1620 my ($self) = @_; 1900 my ($self) = @_;
1621 1901
1622 delete $self->{texture}; 1902 delete $self->{texture};
1623 $self->SUPER::update; 1903 $self->SUPER::update;
… …
1626sub realloc { 1906sub realloc {
1627 my ($self) = @_; 1907 my ($self) = @_;
1628 1908
1629 delete $self->{ox}; 1909 delete $self->{ox};
1630 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1911}
1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1631} 1917}
1632 1918
1633sub set_text { 1919sub set_text {
1634 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1635 1921
… …
1743 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1744 2030
1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1747 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1748 }; 2036 };
1749 2037
1750 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
1751 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
1752 2040# CFPlus::OpenGL::glNewList $self->{list};
1753 $self->{layout}->render ($self->{ox}, $self->{oy}); 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList;
2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
2046
2047 $self->{layout}->draw;
1754} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
1755 2057
1756############################################################################# 2058#############################################################################
1757 2059
1758package CFClient::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1759 2061
1760our @ISA = CFClient::UI::Label::; 2062our @ISA = CFPlus::UI::Label::;
1761 2063
1762use CFClient::OpenGL; 2064use CFPlus::OpenGL;
1763 2065
1764sub new { 2066sub new {
1765 my $class = shift; 2067 my $class = shift;
1766 2068
1767 $class->SUPER::new ( 2069 $class->SUPER::new (
1768 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1769 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1770 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1771 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1772 can_hover => 1, 2076 can_hover => 1,
1773 can_focus => 1, 2077 can_focus => 1,
1774 valign => 0, 2078 valign => 0,
1775 can_events => 1, 2079 can_events => 1,
2080 ellipsise => 0,
1776 #text => ... 2081 #text => ...
1777 #hidden => "*", 2082 #hidden => "*",
1778 @_ 2083 @_
1779 ) 2084 )
1780} 2085}
… …
1825 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1826 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1827 2132
1828 my $text = $self->get_text; 2133 my $text = $self->get_text;
1829 2134
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2136
1830 if ($uni == 8) { 2137 if ($uni == 8) {
1831 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1833 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
1834 } elsif ($sym == CFClient::SDLK_LEFT) { 2141 } elsif ($sym == CFPlus::SDLK_LEFT) {
1835 --$self->{cursor} if $self->{cursor}; 2142 --$self->{cursor} if $self->{cursor};
1836 } elsif ($sym == CFClient::SDLK_RIGHT) { 2143 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1837 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2144 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1838 } elsif ($sym == CFClient::SDLK_HOME) { 2145 } elsif ($sym == CFPlus::SDLK_HOME) {
2146 # what a hack
2147 $self->{cursor} =
2148 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2149 ? length $1
2150 : 0;
2151 } elsif ($sym == CFPlus::SDLK_END) {
2152 # uh, again
2153 $self->{cursor} =
2154 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2155 ? $self->{cursor} + length $1
2156 : length $self->{text};
2157 } elsif ($uni == 21) { # ctrl-u
2158 $text = "";
1839 $self->{cursor} = 0; 2159 $self->{cursor} = 0;
1840 } elsif ($sym == CFClient::SDLK_END) {
1841 $self->{cursor} = length $text;
1842 } elsif ($uni == 27) { 2160 } elsif ($uni == 27) {
1843 $self->emit ('escape'); 2161 $self->emit ('escape');
1844 } elsif ($uni) { 2162 } elsif ($uni == 0x0d) {
2163 substr $text, $self->{cursor}++, 0, "\012";
2164 } elsif ($uni >= 0x20) {
1845 substr $text, $self->{cursor}++, 0, chr $uni; 2165 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else { 2166 } else {
1847 return 0; 2167 return 0;
1848 } 2168 }
1849 2169
1850 $self->_set_text ($text); 2170 $self->_set_text ($text);
1851 2171
1852 $self->realloc; 2172 $self->realloc;
2173 $self->update;
1853 2174
1854 1 2175 1
1855} 2176}
1856 2177
1857sub invoke_focus_in { 2178sub invoke_focus_in {
… …
1899 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
1900 } 2221 }
1901 2222
1902 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1904 glBegin GL_QUADS;
1905 glVertex 0 , 0;
1906 glVertex 0 , $self->{h};
1907 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
1908 glVertex $self->{w}, 0;
1909 glEnd;
1910 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
1911 2227
1912 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1913 2229
1914 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
1916 2232
1917 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
1918 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
1919 utf8::encode $text; 2235 utf8::encode $text;
1920 2236
1921 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1922 } 2238 }
1923 2239
1924 glColor @{$self->{fg}}; 2240 glColor_premultiply @{$self->{active_fg}};
1925 glBegin GL_LINES; 2241 glBegin GL_LINES;
1926 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928 glEnd; 2244 glEnd;
1929 }
1930}
1931 2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2259 glEnd;
2260 }
2261}
2262
2263#############################################################################
2264
1932package CFClient::UI::Entry; 2265package CFPlus::UI::Entry;
1933 2266
1934our @ISA = CFClient::UI::EntryBase::; 2267our @ISA = CFPlus::UI::EntryBase::;
1935 2268
1936use CFClient::OpenGL; 2269use CFPlus::OpenGL;
1937 2270
1938sub invoke_key_down { 2271sub invoke_key_down {
1939 my ($self, $ev) = @_; 2272 my ($self, $ev) = @_;
1940 2273
1941 my $sym = $ev->{sym}; 2274 my $sym = $ev->{sym};
1942 2275
1943 if ($sym == 13) { 2276 if ($ev->{uni} == 0x0d || $sym == 13) {
1944 unshift @{$self->{history}}, 2277 unshift @{$self->{history}},
1945 my $txt = $self->get_text; 2278 my $txt = $self->get_text;
1946 2279
1947 $self->{history_pointer} = -1; 2280 $self->{history_pointer} = -1;
1948 $self->{history_saveback} = ''; 2281 $self->{history_saveback} = '';
1949 $self->emit (activate => $txt); 2282 $self->emit (activate => $txt);
1950 $self->update; 2283 $self->update;
1951 2284
1952 } elsif ($sym == CFClient::SDLK_UP) { 2285 } elsif ($sym == CFPlus::SDLK_UP) {
1953 if ($self->{history_pointer} < 0) { 2286 if ($self->{history_pointer} < 0) {
1954 $self->{history_saveback} = $self->get_text; 2287 $self->{history_saveback} = $self->get_text;
1955 } 2288 }
1956 if (@{$self->{history} || []} > 0) { 2289 if (@{$self->{history} || []} > 0) {
1957 $self->{history_pointer}++; 2290 $self->{history_pointer}++;
… …
1959 $self->{history_pointer} = @{$self->{history} || []} - 1; 2292 $self->{history_pointer} = @{$self->{history} || []} - 1;
1960 } 2293 }
1961 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2294 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1962 } 2295 }
1963 2296
1964 } elsif ($sym == CFClient::SDLK_DOWN) { 2297 } elsif ($sym == CFPlus::SDLK_DOWN) {
1965 $self->{history_pointer}--; 2298 $self->{history_pointer}--;
1966 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2299 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967 2300
1968 if ($self->{history_pointer} >= 0) { 2301 if ($self->{history_pointer} >= 0) {
1969 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1978 1 2311 1
1979} 2312}
1980 2313
1981############################################################################# 2314#############################################################################
1982 2315
2316package CFPlus::UI::TextEdit;
2317
2318our @ISA = CFPlus::UI::EntryBase::;
2319
2320use CFPlus::OpenGL;
2321
2322sub move_cursor_ver {
2323 my ($self, $dy) = @_;
2324
2325 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2326
2327 $y += $dy;
2328
2329 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2330 $self->{cursor} = $index;
2331 delete $self->{cur_h};
2332 $self->update;
2333 return;
2334 }
2335}
2336
2337sub invoke_key_down {
2338 my ($self, $ev) = @_;
2339
2340 my $sym = $ev->{sym};
2341
2342 if ($sym == CFPlus::SDLK_UP) {
2343 $self->move_cursor_ver (-1);
2344 } elsif ($sym == CFPlus::SDLK_DOWN) {
2345 $self->move_cursor_ver (+1);
2346 } else {
2347 return $self->SUPER::invoke_key_down ($ev)
2348 }
2349
2350 1
2351}
2352
2353#############################################################################
2354
1983package CFClient::UI::Button; 2355package CFPlus::UI::ButtonBin;
1984 2356
1985our @ISA = CFClient::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
1986 2358
1987use CFClient::OpenGL; 2359use CFPlus::OpenGL;
1988 2360
1989my @tex = 2361my @tex =
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
1992 2364
1993sub new { 2365sub new {
1994 my $class = shift; 2366 my $class = shift;
1995 2367
1996 $class->SUPER::new ( 2368 $class->SUPER::new (
1997 padding_x => 4,
1998 padding_y => 4,
1999 fg => [1, 1, 1],
2000 active_fg => [0, 0, 1],
2001 can_hover => 1, 2369 can_hover => 1,
2002 align => 0, 2370 align => 0,
2003 valign => 0, 2371 valign => 0,
2004 can_events => 1, 2372 can_events => 1,
2005 @_ 2373 @_
… …
2017} 2385}
2018 2386
2019sub _draw { 2387sub _draw {
2020 my ($self) = @_; 2388 my ($self) = @_;
2021 2389
2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2023
2024 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
2027 2393
2394 my $tex = $tex[$GRAB == $self];
2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2029 2396
2030 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
2031 2398
2032 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
2033} 2400}
2034 2401
2035############################################################################# 2402#############################################################################
2036 2403
2404package CFPlus::UI::Button;
2405
2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
2409
2410my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png);
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 4,
2419 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1,
2423 align => 0,
2424 valign => 0,
2425 can_events => 1,
2426 @_
2427 )
2428}
2429
2430sub invoke_button_up {
2431 my ($self, $ev, $x, $y) = @_;
2432
2433 $self->emit ("activate")
2434 if $x >= 0 && $x < $self->{w}
2435 && $y >= 0 && $y < $self->{h};
2436
2437 1
2438}
2439
2440sub _draw {
2441 my ($self) = @_;
2442
2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2451
2452 glDisable GL_TEXTURE_2D;
2453
2454 $self->SUPER::_draw;
2455}
2456
2457#############################################################################
2458
2459package CFPlus::UI::CheckBox;
2460
2461our @ISA = CFPlus::UI::DrawBG::;
2462
2463my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2466
2467use CFPlus::OpenGL;
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2473 padding_x => 2,
2474 padding_y => 2,
2475 fg => [1, 1, 1],
2476 active_fg => [1, 1, 0],
2477 bg => [0, 0, 0, 0.2],
2478 active_bg => [1, 1, 1, 0.5],
2479 state => 0,
2480 can_hover => 1,
2481 @_
2482 )
2483}
2484
2485sub size_request {
2486 my ($self) = @_;
2487
2488 (6) x 2
2489}
2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
2499sub invoke_button_down {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2504 $self->toggle;
2505 } else {
2506 return 0
2507 }
2508
2509 1
2510}
2511
2512sub _draw {
2513 my ($self) = @_;
2514
2515 $self->SUPER::_draw;
2516
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2518
2519 my ($w, $h) = @$self{qw(w h)};
2520
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522
2523 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2524
2525 my $tex = $self->{state} ? $tex[1] : $tex[0];
2526
2527 glEnable GL_TEXTURE_2D;
2528 $tex->draw_quad_alpha (0, 0, $s, $s);
2529 glDisable GL_TEXTURE_2D;
2530}
2531
2532#############################################################################
2533
2534package CFPlus::UI::Image;
2535
2536our @ISA = CFPlus::UI::Base::;
2537
2538use CFPlus::OpenGL;
2539
2540our %texture_cache;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 scale => 1,
2548 @_,
2549 );
2550
2551 $self->{path} || $self->{tex}
2552 or Carp::croak "'path' or 'tex' attributes required";
2553
2554 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2555 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2556
2557 CFPlus::weaken $texture_cache{$self->{path}};
2558
2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2560
2561 $self
2562}
2563
2564sub STORABLE_freeze {
2565 my ($self, $cloning) = @_;
2566
2567 $self->{path}
2568 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2569
2570 $self->{path}
2571}
2572
2573sub STORABLE_attach {
2574 my ($self, $cloning, $path) = @_;
2575
2576 $self->new (path => $path)
2577}
2578
2579sub size_request {
2580 my ($self) = @_;
2581
2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2583}
2584
2585sub _draw {
2586 my ($self) = @_;
2587
2588 my $tex = $self->{tex};
2589
2590 my ($w, $h) = ($self->{w}, $self->{h});
2591
2592 if ($self->{rot90}) {
2593 glRotate 90, 0, 0, 1;
2594 glTranslate 0, -$self->{w}, 0;
2595
2596 ($w, $h) = ($h, $w);
2597 }
2598
2599 glEnable GL_TEXTURE_2D;
2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2601
2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2603
2604 glDisable GL_TEXTURE_2D;
2605}
2606
2607#############################################################################
2608
2037package CFClient::UI::ImageButton; 2609package CFPlus::UI::ImageButton;
2038 2610
2039our @ISA = CFClient::UI::Image::; 2611our @ISA = CFPlus::UI::Image::;
2040 2612
2041use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2042 2614
2043my %textures; 2615my %textures;
2044 2616
2045sub new { 2617sub new {
2046 my $class = shift; 2618 my $class = shift;
… …
2056 can_events => 1, 2628 can_events => 1,
2057 @_ 2629 @_
2058 ); 2630 );
2059} 2631}
2060 2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2637}
2638
2061sub invoke_button_up { 2639sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2063 2641
2064 $self->emit ("activate") 2642 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w} 2643 if $x >= 0 && $x < $self->{w}
… …
2068 1 2646 1
2069} 2647}
2070 2648
2071############################################################################# 2649#############################################################################
2072 2650
2073package CFClient::UI::CheckBox;
2074
2075our @ISA = CFClient::UI::DrawBG::;
2076
2077my @tex =
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081use CFClient::OpenGL;
2082
2083sub new {
2084 my $class = shift;
2085
2086 $class->SUPER::new (
2087 padding_x => 2,
2088 padding_y => 2,
2089 fg => [1, 1, 1],
2090 active_fg => [1, 1, 0],
2091 bg => [0, 0, 0, 0.2],
2092 active_bg => [1, 1, 1, 0.5],
2093 state => 0,
2094 can_hover => 1,
2095 @_
2096 )
2097}
2098
2099sub size_request {
2100 my ($self) = @_;
2101
2102 (6) x 2
2103}
2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2113sub invoke_button_down {
2114 my ($self, $ev, $x, $y) = @_;
2115
2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118 $self->toggle;
2119 } else {
2120 return 0
2121 }
2122
2123 1
2124}
2125
2126sub _draw {
2127 my ($self) = @_;
2128
2129 $self->SUPER::_draw;
2130
2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133 my ($w, $h) = @$self{qw(w h)};
2134
2135 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141 glEnable GL_TEXTURE_2D;
2142 $tex->draw_quad_alpha (0, 0, $s, $s);
2143 glDisable GL_TEXTURE_2D;
2144}
2145
2146#############################################################################
2147
2148package CFClient::UI::Image; 2651package CFPlus::UI::VGauge;
2149 2652
2150our @ISA = CFClient::UI::Base::; 2653our @ISA = CFPlus::UI::Base::;
2151
2152use CFClient::OpenGL;
2153
2154our %texture_cache;
2155
2156sub new {
2157 my $class = shift;
2158
2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2163
2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2166
2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174 $self
2175}
2176
2177sub size_request {
2178 my ($self) = @_;
2179
2180 ($self->{tex}{w}, $self->{tex}{h})
2181}
2182
2183sub _draw {
2184 my ($self) = @_;
2185
2186 my $tex = $self->{tex};
2187
2188 my ($w, $h) = ($self->{w}, $self->{h});
2189
2190 if ($self->{rot90}) {
2191 glRotate 90, 0, 0, 1;
2192 glTranslate 0, -$self->{w}, 0;
2193
2194 ($w, $h) = ($h, $w);
2195 }
2196
2197 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200 $tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::VGauge;
2208
2209our @ISA = CFClient::UI::Base::;
2210 2654
2211use List::Util qw(min max); 2655use List::Util qw(min max);
2212 2656
2213use CFClient::OpenGL; 2657use CFPlus::OpenGL;
2214 2658
2215my %tex = ( 2659my %tex = (
2216 food => [ 2660 food => [
2217 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2662 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219 ], 2663 ],
2220 grace => [ 2664 grace => [
2221 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2665 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2666 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223 ], 2667 ],
2224 hp => [ 2668 hp => [
2225 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2670 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227 ], 2671 ],
2228 mana => [ 2672 mana => [
2229 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2673 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2674 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231 ], 2675 ],
2232); 2676);
2233 2677
2234# eg. VGauge->new (gauge => 'food'), default gauge: food 2678# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2337 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2338} 2782}
2339 2783
2340############################################################################# 2784#############################################################################
2341 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 label => "%d%%",
2806 %arg,
2807 );
2808
2809 $self->set_value ($arg{value} || -1);
2810
2811 $self
2812}
2813
2814sub set_label {
2815 my ($self, $label) = @_;
2816
2817 return if $self->{label} eq $label;
2818 $self->{label} = $label;
2819
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2821}
2822
2823sub set_value {
2824 my ($self, $value) = @_;
2825
2826 if ($self->{value} ne $value) {
2827 $self->{value} = $value;
2828
2829 if ($value < 0) {
2830 $self->set_text ("-");
2831 } else {
2832 $self->set_text (sprintf $self->{label}, $value * 100);
2833 }
2834
2835 $self->update;
2836 }
2837}
2838
2839sub _draw {
2840 my ($self) = @_;
2841
2842 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844
2845 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value};
2847
2848 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2852 }
2853
2854 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2856
2857 glDisable GL_BLEND;
2858
2859 {
2860 local $self->{bg}; # do not draw background
2861 $self->SUPER::_draw;
2862 }
2863}
2864
2865#############################################################################
2866
2867package CFPlus::UI::ExperienceProgress;
2868
2869our @ISA = CFPlus::UI::Progress::;
2870
2871sub new {
2872 my ($class, %arg) = @_;
2873
2874 my $self = $class->SUPER::new (
2875 %arg
2876 );
2877
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN;
2880
2881 $self
2882}
2883
2884sub DESTROY {
2885 my ($self) = @_;
2886
2887 delete $::CONN->{on_exp_update}{$self+0}
2888 if $::CONN;
2889
2890 $self->SUPER::DESTROY;
2891}
2892
2893sub set_value {
2894 my ($self, $lvl, $exp) = @_;
2895
2896 my $v = -1;
2897
2898 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2899 my $l0 = $table->[$lvl - 1];
2900 my $l1 = $table->[$lvl];
2901
2902 $v = ($exp - $l0) / ($l1 - $l0);
2903 }
2904
2905 $self->SUPER::set_value ($v);
2906}
2907
2908#############################################################################
2909
2342package CFClient::UI::Gauge; 2910package CFPlus::UI::Gauge;
2343 2911
2344our @ISA = CFClient::UI::VBox::; 2912our @ISA = CFPlus::UI::VBox::;
2345 2913
2346sub new { 2914sub new {
2347 my ($class, %arg) = @_; 2915 my ($class, %arg) = @_;
2348 2916
2349 my $self = $class->SUPER::new ( 2917 my $self = $class->SUPER::new (
… …
2351 can_hover => 1, 2919 can_hover => 1,
2352 can_events => 1, 2920 can_events => 1,
2353 %arg, 2921 %arg,
2354 ); 2922 );
2355 2923
2356 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2924 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2925 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2926 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359 2927
2360 $self 2928 $self
2361} 2929}
2362 2930
2363sub set_fontsize { 2931sub set_fontsize {
… …
2384 $self->{value}->set_text ($val); 2952 $self->{value}->set_text ($val);
2385} 2953}
2386 2954
2387############################################################################# 2955#############################################################################
2388 2956
2389package CFClient::UI::Slider; 2957package CFPlus::UI::Slider;
2390 2958
2391use strict; 2959use strict;
2392 2960
2393use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2394 2962
2395our @ISA = CFClient::UI::DrawBG::; 2963our @ISA = CFPlus::UI::DrawBG::;
2396 2964
2397my @tex = 2965my @tex =
2398 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2966 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399 qw(s1_slider.png s1_slider_bg.png); 2967 qw(s1_slider.png s1_slider_bg.png);
2400 2968
2401sub new { 2969sub new {
2402 my $class = shift; 2970 my $class = shift;
2403 2971
… …
2471 3039
2472 $self->SUPER::invoke_button_down ($ev, $x, $y); 3040 $self->SUPER::invoke_button_down ($ev, $x, $y);
2473 3041
2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3042 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2475 3043
2476 $self->invoke_mouse_motion ($ev, $x, $y) 3044 $self->invoke_mouse_motion ($ev, $x, $y);
3045
3046 1
2477} 3047}
2478 3048
2479sub invoke_mouse_motion { 3049sub invoke_mouse_motion {
2480 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2481 3051
… …
2497sub invoke_mouse_wheel { 3067sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2499 3069
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3070 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501 3071
3072 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3073
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 3074 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503 3075
2504 ! ! $delta 3076 1
2505} 3077}
2506 3078
2507sub update { 3079sub update {
2508 my ($self) = @_; 3080 my ($self) = @_;
2509 3081
… …
2558 glDisable GL_TEXTURE_2D; 3130 glDisable GL_TEXTURE_2D;
2559} 3131}
2560 3132
2561############################################################################# 3133#############################################################################
2562 3134
2563package CFClient::UI::ValSlider; 3135package CFPlus::UI::ValSlider;
2564 3136
2565our @ISA = CFClient::UI::HBox::; 3137our @ISA = CFPlus::UI::HBox::;
2566 3138
2567sub new { 3139sub new {
2568 my ($class, %arg) = @_; 3140 my ($class, %arg) = @_;
2569 3141
2570 my $range = delete $arg{range}; 3142 my $range = delete $arg{range};
2571 3143
2572 my $self = $class->SUPER::new ( 3144 my $self = $class->SUPER::new (
2573 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3145 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3146 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575 to_value => sub { shift }, 3147 to_value => sub { shift },
2576 from_value => sub { shift }, 3148 from_value => sub { shift },
2577 %arg, 3149 %arg,
2578 ); 3150 );
2579 3151
… …
2599sub set_range { shift->{slider}->set_range (@_) } 3171sub set_range { shift->{slider}->set_range (@_) }
2600sub set_value { shift->{slider}->set_value (@_) } 3172sub set_value { shift->{slider}->set_value (@_) }
2601 3173
2602############################################################################# 3174#############################################################################
2603 3175
2604package CFClient::UI::TextScroller; 3176package CFPlus::UI::TextScroller;
2605 3177
2606our @ISA = CFClient::UI::HBox::; 3178our @ISA = CFPlus::UI::HBox::;
2607 3179
2608use CFClient::OpenGL; 3180use CFPlus::OpenGL;
2609 3181
2610sub new { 3182sub new {
2611 my $class = shift; 3183 my $class = shift;
2612 3184
2613 my $self = $class->SUPER::new ( 3185 my $self = $class->SUPER::new (
… …
2615 can_events => 1, 3187 can_events => 1,
2616 indent => 0, 3188 indent => 0,
2617 #font => default_font 3189 #font => default_font
2618 @_, 3190 @_,
2619 3191
2620 layout => (new CFClient::Layout), 3192 layout => (new CFPlus::Layout),
2621 par => [], 3193 par => [],
3194 max_par => 0,
2622 height => 0, 3195 height => 0,
2623 children => [ 3196 children => [
2624 (new CFClient::UI::Empty expand => 1), 3197 (new CFPlus::UI::Empty expand => 1),
2625 (new CFClient::UI::Slider vertical => 1), 3198 (new CFPlus::UI::Slider vertical => 1),
2626 ], 3199 ],
2627 ); 3200 );
2628 3201
2629 $self->{children}[1]->connect (changed => sub { $self->update }); 3202 $self->{children}[1]->connect (changed => sub { $self->update });
2630 3203
… …
2639} 3212}
2640 3213
2641sub size_request { 3214sub size_request {
2642 my ($self) = @_; 3215 my ($self) = @_;
2643 3216
2644 my ($empty, $slider) = @{ $self->{children} }; 3217 my ($empty, $slider) = $self->visible_children;
2645 3218
2646 local $self->{children} = [$empty, $slider]; 3219 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request 3220 $self->SUPER::size_request
2648} 3221}
2649 3222
… …
2707 3280
2708 # todo: base offset on lines or so, not on pixels 3281 # todo: base offset on lines or so, not on pixels
2709 $self->{children}[1]->set_value ($offset); 3282 $self->{children}[1]->set_value ($offset);
2710} 3283}
2711 3284
3285sub current_paragraph {
3286 my ($self) = @_;
3287
3288 $self->{top_paragraph} - 1
3289}
3290
3291sub scroll_to {
3292 my ($self, $para) = @_;
3293
3294 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3295
3296 $self->{scroll_to} = $para;
3297 $self->update;
3298}
3299
2712sub clear { 3300sub clear {
2713 my ($self) = @_; 3301 my ($self) = @_;
2714 3302
2715 my (undef, undef, @other) = @{ $self->{children} }; 3303 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other; 3304 $self->remove ($_) for @other;
… …
2719 $self->{height} = 0; 3307 $self->{height} = 0;
2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3308 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721} 3309}
2722 3310
2723sub add_paragraph { 3311sub add_paragraph {
2724 my ($self, $color, $para, $indent) = @_; 3312 my $self = shift;
2725 3313
2726 my ($text, @w) = ref $para ? @$para : $para; 3314 for my $para (@_) {
2727
2728 $para = { 3315 $para = {
3316 fg => [1, 1, 1, 1],
3317 indent => 0,
3318 markup => "",
3319 widget => [],
3320 ref $para ? %$para : (markup => $para),
2729 w => 1e10, 3321 w => 1e10,
2730 wrapped => 1, 3322 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2735 }; 3323 };
2736 3324
2737 $self->add (@w) if @w; 3325 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738 push @{$self->{par}}, $para; 3326 push @{$self->{par}}, $para;
3327 }
3328
3329 if (my $max = $self->{max_par}) {
3330 shift @{$self->{par}} while @{$self->{par}} > $max;
3331 }
2739 3332
2740 $self->{need_reflow}++; 3333 $self->{need_reflow}++;
2741 $self->update; 3334 $self->update;
2742} 3335}
2743 3336
2744sub scroll_to_bottom { 3337sub scroll_to_bottom {
2745 my ($self) = @_; 3338 my ($self) = @_;
2746 3339
2747 $self->{scroll_to_bottom} = 1; 3340 $self->{scroll_to} = $#{$self->{par}};
2748 $self->update; 3341 $self->update;
2749} 3342}
2750 3343
3344sub force_uptodate {
3345 my ($self) = @_;
3346
3347 if (delete $self->{need_reflow}) {
3348 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3349
3350 my $height = 0;
3351
3352 for my $para (@{$self->{par}}) {
3353 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3354 my $layout = $self->get_layout ($para);
3355 my ($w, $h) = $layout->size;
3356
3357 $para->{w} = $w + $para->{indent};
3358 $para->{h} = $h;
3359 $para->{wrapped} = $layout->has_wrapped;
3360 }
3361
3362 $para->{y} = $height;
3363 $height += $para->{h};
3364 }
3365
3366 $self->{height} = $height;
3367 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3368
3369 delete $self->{texture};
3370 }
3371
3372 if (my $paridx = delete $self->{scroll_to}) {
3373 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3374 }
3375}
3376
2751sub update { 3377sub update {
2752 my ($self) = @_; 3378 my ($self) = @_;
2753 3379
2754 $self->SUPER::update; 3380 $self->SUPER::update;
2755 3381
2756 return unless $self->{h} > 0; 3382 return unless $self->{h} > 0;
2757 3383
2758 delete $self->{texture}; 3384 delete $self->{texture};
2759 3385
2760 $ROOT->on_post_alloc ($self => sub { 3386 $ROOT->on_post_alloc ($self => sub {
3387 $self->force_uptodate;
3388
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3389 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762 3390
2763 if (delete $self->{need_reflow}) {
2764 my $height = 0;
2765
2766 for my $para (@{$self->{par}}) {
2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768 my $layout = $self->get_layout ($para);
2769 my ($w, $h) = $layout->size;
2770
2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2774 }
2775
2776 $height += $para->{h};
2777 }
2778
2779 $self->{height} = $height;
2780
2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3391 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791 glClearColor 0, 0, 0, 0; 3392 glClearColor 0, 0, 0, 0;
2792 glClear GL_COLOR_BUFFER_BIT; 3393 glClear GL_COLOR_BUFFER_BIT;
2793 3394
3395 package CFPlus::UI::Base;
3396 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3397 (0, 0, $self->{w}, $self->{h});
3398
3399 my $top = int $self->{children}[1]{range}[0];
3400
3401 my $paridx = 0;
3402 my $top_paragraph;
2794 my $top = int $self->{children}[1]{range}[0]; 3403 my $top = int $self->{children}[1]{range}[0];
2795 3404
2796 my $y0 = $top; 3405 my $y0 = $top;
2797 my $y1 = $top + $H; 3406 my $y1 = $top + $H;
2798 3407
2799 my $y = 0;
2800
2801 for my $para (@{$self->{par}}) { 3408 for my $para (@{$self->{par}}) {
2802 my $h = $para->{h}; 3409 my $h = $para->{h};
3410 my $y = $para->{y};
2803 3411
2804 if ($y0 < $y + $h && $y < $y1) { 3412 if ($y0 < $y + $h && $y < $y1) {
2805
2806 my $layout = $self->get_layout ($para); 3413 my $layout = $self->get_layout ($para);
2807 3414
2808 $layout->render ($para->{indent}, $y - $y0); 3415 $layout->render ($para->{indent}, $y - $y0);
3416 $layout->draw;
2809 3417
2810 if (my @w = @{ $para->{widget} }) { 3418 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes; 3419 my @s = $layout->get_shapes;
2812 3420
2813 for (@w) { 3421 for (@w) {
… …
2819 $_->draw; 3427 $_->draw;
2820 } 3428 }
2821 } 3429 }
2822 } 3430 }
2823 3431
2824 $y += $h; 3432 $paridx++;
3433 $top_paragraph ||= $paridx if $y >= $top;
2825 } 3434 }
3435
3436 $self->{top_paragraph} = $top_paragraph;
2826 }; 3437 };
2827 }); 3438 });
2828} 3439}
2829 3440
2830sub reconfigure { 3441sub reconfigure {
… …
2848 $self->{children}[1]->draw; 3459 $self->{children}[1]->draw;
2849} 3460}
2850 3461
2851############################################################################# 3462#############################################################################
2852 3463
2853package CFClient::UI::Animator; 3464package CFPlus::UI::Animator;
2854 3465
2855use CFClient::OpenGL; 3466use CFPlus::OpenGL;
2856 3467
2857our @ISA = CFClient::UI::Bin::; 3468our @ISA = CFPlus::UI::Bin::;
2858 3469
2859sub moveto { 3470sub moveto {
2860 my ($self, $x, $y) = @_; 3471 my ($self, $x, $y) = @_;
2861 3472
2862 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3473 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2890 glPopMatrix; 3501 glPopMatrix;
2891} 3502}
2892 3503
2893############################################################################# 3504#############################################################################
2894 3505
2895package CFClient::UI::Flopper; 3506package CFPlus::UI::Flopper;
2896 3507
2897our @ISA = CFClient::UI::Button::; 3508our @ISA = CFPlus::UI::Button::;
2898 3509
2899sub new { 3510sub new {
2900 my $class = shift; 3511 my $class = shift;
2901 3512
2902 my $self = $class->SUPER::new ( 3513 my $self = $class->SUPER::new (
… …
2914 $self->{other}->toggle_visibility; 3525 $self->{other}->toggle_visibility;
2915} 3526}
2916 3527
2917############################################################################# 3528#############################################################################
2918 3529
2919package CFClient::UI::Tooltip; 3530package CFPlus::UI::Tooltip;
2920 3531
2921our @ISA = CFClient::UI::Bin::; 3532our @ISA = CFPlus::UI::Bin::;
2922 3533
2923use CFClient::OpenGL; 3534use CFPlus::OpenGL;
2924 3535
2925sub new { 3536sub new {
2926 my $class = shift; 3537 my $class = shift;
2927 3538
2928 $class->SUPER::new ( 3539 $class->SUPER::new (
… …
2931 ) 3542 )
2932} 3543}
2933 3544
2934sub set_tooltip_from { 3545sub set_tooltip_from {
2935 my ($self, $widget) = @_; 3546 my ($self, $widget) = @_;
3547
3548 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3549 if $widget->{tooltip} =~ /^#(.*)$/;
2936 3550
2937 my $tooltip = $widget->{tooltip}; 3551 my $tooltip = $widget->{tooltip};
2938 3552
2939 if ($ENV{CFPLUS_DEBUG} & 2) { 3553 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n" 3554 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2944 } 3558 }
2945 3559
2946 $tooltip =~ s/^\n+//; 3560 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//; 3561 $tooltip =~ s/\n+$//;
2948 3562
2949 $self->add (new CFClient::UI::Label 3563 $self->add (new CFPlus::UI::Label
2950 markup => $tooltip, 3564 markup => $tooltip,
2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3565 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952 fontsize => 0.8, 3566 fontsize => 0.8,
2953 fg => [0, 0, 0, 1], 3567 style => 1, # FLAG_INVERSE
2954 ellipsise => 0, 3568 ellipsise => 0,
2955 font => ($widget->{tooltip_font} || $::FONT_PROP), 3569 font => ($widget->{tooltip_font} || $::FONT_PROP),
2956 ); 3570 );
2957} 3571}
2958 3572
… …
2977 3591
2978 $self->{root}->on_post_alloc ("move_$self" => sub { 3592 $self->{root}->on_post_alloc ("move_$self" => sub {
2979 my $widget = $self->{owner} 3593 my $widget = $self->{owner}
2980 or return; 3594 or return;
2981 3595
3596 if ($widget->{visible}) {
2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3597 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983 3598
2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3599 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985 if $x + $self->{w} > $self->{root}{w}; 3600 if $x + $self->{w} > $self->{root}{w};
2986 3601
2987 $self->move_abs ($x, $y); 3602 $self->move_abs ($x, $y);
3603 } else {
3604 $self->hide;
3605 }
2988 }); 3606 });
2989} 3607}
2990 3608
2991sub _draw { 3609sub _draw {
2992 my ($self) = @_; 3610 my ($self) = @_;
… …
2994 glTranslate 0.375, 0.375; 3612 glTranslate 0.375, 0.375;
2995 3613
2996 my ($w, $h) = @$self{qw(w h)}; 3614 my ($w, $h) = @$self{qw(w h)};
2997 3615
2998 glColor 1, 0.8, 0.4; 3616 glColor 1, 0.8, 0.4;
2999 glBegin GL_QUADS; 3617 glRect 0, 0, $w, $h;
3000 glVertex 0 , 0;
3001 glVertex 0 , $h;
3002 glVertex $w, $h;
3003 glVertex $w, 0;
3004 glEnd;
3005 3618
3006 glColor 0, 0, 0; 3619 glColor 0, 0, 0;
3007 glBegin GL_LINE_LOOP; 3620 glRect_lineloop 0, 0, $w, $h;
3008 glVertex 0 , 0;
3009 glVertex 0 , $h;
3010 glVertex $w, $h;
3011 glVertex $w, 0;
3012 glEnd;
3013 3621
3014 glTranslate 2 - 0.375, 2 - 0.375; 3622 glTranslate 2 - 0.375, 2 - 0.375;
3015 3623
3016 $self->SUPER::_draw; 3624 $self->SUPER::_draw;
3017} 3625}
3018 3626
3019############################################################################# 3627#############################################################################
3020 3628
3021package CFClient::UI::Face; 3629package CFPlus::UI::Face;
3022 3630
3023our @ISA = CFClient::UI::Base::; 3631our @ISA = CFPlus::UI::DrawBG::;
3024 3632
3025use CFClient::OpenGL; 3633use CFPlus::OpenGL;
3026 3634
3027sub new { 3635sub new {
3028 my $class = shift; 3636 my $class = shift;
3029 3637
3030 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
3639 size_w => 32,
3640 size_h => 8,
3031 aspect => 1, 3641 aspect => 1,
3032 can_events => 0, 3642 can_events => 0,
3033 @_, 3643 @_,
3034 ); 3644 );
3035 3645
3036 if ($self->{anim} && $self->{animspeed}) { 3646 if ($self->{anim} && $self->{animspeed}) {
3037 Scalar::Util::weaken (my $widget = $self); 3647 CFPlus::weaken (my $widget = $self);
3038 3648
3649 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3650 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3039 $self->{timer} = Event->timer ( 3651 $self->{timer} = Event->timer (
3040 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041 hard => 1, 3652 parked => 1,
3042 interval => $self->{animspeed},
3043 cb => sub { 3653 cb => sub {
3654 return unless $::CONN;
3655
3656 my $w = $widget
3657 or return;
3658
3044 ++$widget->{frame}; 3659 ++$w->{frame};
3660 $w->update_face;
3661
3662 # somehow, $widget can go away
3045 $widget->update; 3663 $w->update;
3664 $w->update_timer;
3046 }, 3665 },
3047 ); 3666 );
3667
3668 $self->update_face;
3669 $self->update_timer;
3048 } 3670 }
3049 3671
3050 $self 3672 $self
3051} 3673}
3052 3674
3675sub update_timer {
3676 my ($self) = @_;
3677
3678 return unless $self->{timer};
3679
3680 if ($self->{visible}) {
3681 $self->{timer}->at (
3682 $self->{anim_start}
3683 + $self->{animspeed}
3684 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3685 );
3686 $self->{timer}->start;
3687 } else {
3688 $self->{timer}->stop;
3689 }
3690}
3691
3692sub update_face {
3693 my ($self) = @_;
3694
3695 if ($::CONN) {
3696 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3697 if ($anim && @$anim) {
3698 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3699 delete $self->{face_change_cb};
3700
3701 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3702 unless ($tex->{name} || $tex->{loading}) {
3703 $tex->upload (sub { $self->reconfigure });
3704 }
3705 }
3706 }
3707 }
3708 }
3709}
3710
3053sub size_request { 3711sub size_request {
3054 (32, 8) 3712 my ($self) = @_;
3713
3714 if ($::CONN) {
3715 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3716 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3717 if ($tex->{name}) {
3718 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3719 } elsif (!$tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723
3724 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3725 }
3726 }
3727
3728 ($self->{size_w} || 8, $self->{size_h} || 8)
3055} 3729}
3056 3730
3057sub update { 3731sub update {
3058 my ($self) = @_; 3732 my ($self) = @_;
3059 3733
3060 return unless $self->{visible}; 3734 return unless $self->{visible};
3061 3735
3062 $self->SUPER::update; 3736 $self->SUPER::update;
3063} 3737}
3064 3738
3739sub invoke_visibility_change {
3740 my ($self) = @_;
3741
3742 $self->update_timer;
3743
3744 0
3745}
3746
3065sub _draw { 3747sub _draw {
3066 my ($self) = @_; 3748 my ($self) = @_;
3067 3749
3068 return unless $::CONN; 3750 $self->SUPER::_draw;
3069 3751
3070 my $face; 3752 if (my $tex = $self->{tex}) {
3071
3072 if ($self->{frame}) {
3073 my $anim = $::CONN->{anim}[$self->{anim}];
3074
3075 $face = $anim->[ $self->{frame} % @$anim ]
3076 if $anim && @$anim;
3077 }
3078
3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3080
3081 if ($tex) {
3082 glEnable GL_TEXTURE_2D; 3753 glEnable GL_TEXTURE_2D;
3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084 glColor 0, 0, 0, 1; 3755 glColor 0, 0, 0, 1;
3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3756 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3086 glDisable GL_TEXTURE_2D; 3757 glDisable GL_TEXTURE_2D;
… …
3088} 3759}
3089 3760
3090sub destroy { 3761sub destroy {
3091 my ($self) = @_; 3762 my ($self) = @_;
3092 3763
3093 $self->{timer}->cancel 3764 (delete $self->{timer})->cancel
3094 if $self->{timer}; 3765 if $self->{timer};
3095 3766
3096 $self->SUPER::destroy; 3767 $self->SUPER::destroy;
3097} 3768}
3098 3769
3099############################################################################# 3770#############################################################################
3100 3771
3101package CFClient::UI::Buttonbar; 3772package CFPlus::UI::Buttonbar;
3102 3773
3103our @ISA = CFClient::UI::HBox::; 3774our @ISA = CFPlus::UI::HBox::;
3104 3775
3105# TODO: should actualyl wrap buttons and other goodies. 3776# TODO: should actually wrap buttons and other goodies.
3106 3777
3107############################################################################# 3778#############################################################################
3108 3779
3109package CFClient::UI::Menu; 3780package CFPlus::UI::Menu;
3110 3781
3111our @ISA = CFClient::UI::FancyFrame::; 3782our @ISA = CFPlus::UI::Toplevel::;
3112 3783
3113use CFClient::OpenGL; 3784use CFPlus::OpenGL;
3114 3785
3115sub new { 3786sub new {
3116 my $class = shift; 3787 my $class = shift;
3117 3788
3118 my $self = $class->SUPER::new ( 3789 my $self = $class->SUPER::new (
3119 items => [], 3790 items => [],
3120 z => 100, 3791 z => 100,
3121 @_, 3792 @_,
3122 ); 3793 );
3123 3794
3124 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3795 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125 3796
3126 for my $item (@{ $self->{items} }) { 3797 for my $item (@{ $self->{items} }) {
3127 my ($widget, $cb, $tooltip) = @$item; 3798 my ($widget, $cb, $tooltip) = @$item;
3128 3799
3129 # handle various types of items, only text for now 3800 # handle various types of items, only text for now
3130 if (!ref $widget) { 3801 if (!ref $widget) {
3131 if ($widget =~ /\t/) { 3802 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2; 3803 my ($left, $right) = split /\t/, $widget, 2;
3133 3804
3134 $widget = new CFClient::UI::HBox 3805 $widget = new CFPlus::UI::HBox
3135 can_hover => 1, 3806 can_hover => 1,
3136 can_events => 1, 3807 can_events => 1,
3137 tooltip => $tooltip, 3808 tooltip => $tooltip,
3138 children => [ 3809 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1), 3810 (new CFPlus::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1), 3811 (new CFPlus::UI::Label markup => $right, align => +1),
3141 ], 3812 ],
3142 ; 3813 ;
3143 3814
3144 } else { 3815 } else {
3145 $widget = new CFClient::UI::Label 3816 $widget = new CFPlus::UI::Label
3146 can_hover => 1, 3817 can_hover => 1,
3147 can_events => 1, 3818 can_events => 1,
3148 markup => $widget, 3819 markup => $widget,
3149 tooltip => $tooltip; 3820 tooltip => $tooltip;
3150 } 3821 }
… …
3198 1 3869 1
3199} 3870}
3200 3871
3201############################################################################# 3872#############################################################################
3202 3873
3203package CFClient::UI::Multiplexer; 3874package CFPlus::UI::Multiplexer;
3204 3875
3205our @ISA = CFClient::UI::Container::; 3876our @ISA = CFPlus::UI::Container::;
3206 3877
3207sub new { 3878sub new {
3208 my $class = shift; 3879 my $class = shift;
3209 3880
3210 my $self = $class->SUPER::new ( 3881 my $self = $class->SUPER::new (
… …
3271 $self->{current}->draw; 3942 $self->{current}->draw;
3272} 3943}
3273 3944
3274############################################################################# 3945#############################################################################
3275 3946
3276package CFClient::UI::Notebook; 3947package CFPlus::UI::Notebook;
3277 3948
3949use CFPlus::OpenGL;
3950
3278our @ISA = CFClient::UI::VBox::; 3951our @ISA = CFPlus::UI::VBox::;
3279 3952
3280sub new { 3953sub new {
3281 my $class = shift; 3954 my $class = shift;
3282 3955
3283 my $self = $class->SUPER::new ( 3956 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar), 3957 buttonbar => (new CFPlus::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0],
3286 # filter => # will be put between multiplexer and $self 3960 # filter => # will be put between multiplexer and $self
3287 @_, 3961 @_,
3288 ); 3962 );
3289 3963
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3291 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3965 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3292 3966
3967 {
3968 Scalar::Util::weaken (my $wself = $self);
3969
3970 $self->{multiplexer}->connect (c_add => sub {
3971 my ($mplex, $widgets) = @_;
3972
3973 for my $child (@$widgets) {
3974 Scalar::Util::weaken $child;
3975 $child->{c_tab_} ||= do {
3976 my $tab =
3977 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3978 ? $child->{c_tab}
3979 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3980
3981 $tab->connect (activate => sub {
3982 $wself->set_current_page ($child);
3983 });
3984
3985 $tab
3986 };
3987
3988 $self->{buttonbar}->add ($child->{c_tab_});
3989 }
3990 });
3991
3992 $self->{multiplexer}->connect (c_remove => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 $wself->{buttonbar}->remove ($child->{c_tab_});
3997 }
3998 });
3999 }
4000
3293 $self 4001 $self
3294} 4002}
3295 4003
3296sub add { 4004sub add {
4005 my ($self, @widgets) = @_;
4006
4007 $self->{multiplexer}->add (@widgets)
4008}
4009
4010sub remove {
4011 my ($self, @widgets) = @_;
4012
4013 $self->{multiplexer}->remove (@widgets)
4014}
4015
4016sub pages {
4017 my ($self) = @_;
4018 $self->{multiplexer}->children
4019}
4020
4021sub add_tab {
3297 my ($self, $title, $widget, $tooltip) = @_; 4022 my ($self, $title, $widget, $tooltip) = @_;
3298 4023
3299 Scalar::Util::weaken $self; 4024 $title = [$title, $tooltip] unless ref $title;
4025 $widget->{c_tab} = $title;
3300 4026
3301 $self->{buttonbar}->add (new CFClient::UI::Button
3302 markup => $title,
3303 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) },
3305 );
3306
3307 $self->{multiplexer}->add ($widget); 4027 $self->add ($widget);
3308} 4028}
3309 4029
3310sub get_current_page { 4030sub get_current_page {
3311 my ($self) = @_; 4031 my ($self) = @_;
3312 4032
… …
3318 4038
3319 $self->{multiplexer}->set_current_page ($page); 4039 $self->{multiplexer}->set_current_page ($page);
3320 $self->emit (page_changed => $self->{multiplexer}{current}); 4040 $self->emit (page_changed => $self->{multiplexer}{current});
3321} 4041}
3322 4042
4043sub _draw {
4044 my ($self) = @_;
4045
4046 $self->SUPER::_draw ();
4047
4048 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y};
4051 glLineWidth 3;
4052 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4054 glLineWidth 1;
4055 }
4056 }
4057}
4058
3323############################################################################# 4059#############################################################################
3324 4060
3325package CFClient::UI::Combobox; 4061package CFPlus::UI::Selector;
3326 4062
3327use utf8; 4063use utf8;
3328 4064
3329our @ISA = CFClient::UI::Button::; 4065our @ISA = CFPlus::UI::Button::;
3330 4066
3331sub new { 4067sub new {
3332 my $class = shift; 4068 my $class = shift;
3333 4069
3334 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
… …
3351 my ($value, $title, $tooltip) = @$_; 4087 my ($value, $title, $tooltip) = @$_;
3352 4088
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4089 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 } 4090 }
3355 4091
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4092 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357} 4093}
3358 4094
3359sub _set_value { 4095sub _set_value {
3360 my ($self, $value) = @_; 4096 my ($self, $value) = @_;
3361 4097
… …
3376 $self->emit (changed => $value); 4112 $self->emit (changed => $value);
3377} 4113}
3378 4114
3379############################################################################# 4115#############################################################################
3380 4116
3381package CFClient::UI::Statusbox; 4117package CFPlus::UI::Statusbox;
3382 4118
3383our @ISA = CFClient::UI::VBox::; 4119our @ISA = CFPlus::UI::VBox::;
3384 4120
3385sub new { 4121sub new {
3386 my $class = shift; 4122 my $class = shift;
3387 4123
3388 my $self = $class->SUPER::new ( 4124 my $self = $class->SUPER::new (
3389 fontsize => 0.8, 4125 fontsize => 0.8,
3390 @_, 4126 @_,
3391 ); 4127 );
3392 4128
3393 Scalar::Util::weaken (my $this = $self); 4129 CFPlus::weaken (my $this = $self);
3394 4130
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4131 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396 4132
3397 $self 4133 $self
3398} 4134}
… …
3400sub reorder { 4136sub reorder {
3401 my ($self) = @_; 4137 my ($self) = @_;
3402 my $NOW = Time::HiRes::time; 4138 my $NOW = Time::HiRes::time;
3403 4139
3404 # freeze display when hovering over any label 4140 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner} 4141 return if $CFPlus::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4142 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} }; 4143 values %{ $self->{item} };
3408 4144
3409 while (my ($k, $v) = each %{ $self->{item} }) { 4145 while (my ($k, $v) = each %{ $self->{item} }) {
3410 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4146 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411 } 4147 }
… …
3432 for ($short) { 4168 for ($short) {
3433 s/^\s+//; 4169 s/^\s+//;
3434 s/\s+/ /g; 4170 s/\s+/ /g;
3435 } 4171 }
3436 4172
3437 new CFClient::UI::Label 4173 new CFPlus::UI::Label
3438 markup => $short, 4174 markup => $short,
3439 tooltip => $item->{tooltip}, 4175 tooltip => $item->{tooltip},
3440 tooltip_font => $::FONT_PROP, 4176 tooltip_font => $::FONT_PROP,
3441 tooltip_width => 0.67, 4177 tooltip_width => 0.67,
3442 fontsize => $item->{fontsize} || $self->{fontsize}, 4178 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3521 $self->SUPER::destroy; 4257 $self->SUPER::destroy;
3522} 4258}
3523 4259
3524############################################################################# 4260#############################################################################
3525 4261
3526package CFClient::UI::Inventory;
3527
3528our @ISA = CFClient::UI::Table::;
3529
3530sub new {
3531 my $class = shift;
3532
3533 my $self = $class->SUPER::new (
3534 col_expand => [0, 1, 0],
3535 @_,
3536 );
3537
3538 $self
3539}
3540
3541sub set_items {
3542 my ($self, $items) = @_;
3543
3544 $self->clear;
3545 return unless $items;
3546
3547 my @items = sort {
3548 ($a->{type} <=> $b->{type})
3549 or ($a->{name} cmp $b->{name})
3550 } values %$items;
3551
3552 $self->{real_items} = \@items;
3553
3554 my $row = 0;
3555 for my $item (@items) {
3556 CFClient::Item::update_widgets $item;
3557
3558 $self->add (0, $row, $item->{face_widget});
3559 $self->add (1, $row, $item->{desc_widget});
3560 $self->add (2, $row, $item->{weight_widget});
3561
3562 $row++;
3563 }
3564}
3565
3566#############################################################################
3567
3568package CFClient::UI::SpellList;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
3578 @_,
3579 )
3580}
3581
3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3667sub add_spell {
3668 my ($self, $spell) = @_;
3669
3670 $self->{spell}->{$spell->{name}} = $spell;
3671 $self->rebuild_spell_list;
3672}
3673
3674sub remove_spell {
3675 my ($self, $spell) = @_;
3676
3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3688#############################################################################
3689
3690package CFClient::UI::Root; 4262package CFPlus::UI::Root;
3691 4263
3692our @ISA = CFClient::UI::Container::; 4264our @ISA = CFPlus::UI::Container::;
3693 4265
3694use List::Util qw(min max); 4266use List::Util qw(min max);
3695 4267
3696use CFClient::OpenGL; 4268use CFPlus::OpenGL;
3697 4269
3698sub new { 4270sub new {
3699 my $class = shift; 4271 my $class = shift;
3700 4272
3701 my $self = $class->SUPER::new ( 4273 my $self = $class->SUPER::new (
3702 visible => 1, 4274 visible => 1,
3703 @_, 4275 @_,
3704 ); 4276 );
3705 4277
3706 Scalar::Util::weaken ($self->{root} = $self); 4278 CFPlus::weaken ($self->{root} = $self);
3707 4279
3708 $self 4280 $self
3709} 4281}
3710 4282
3711sub size_request { 4283sub size_request {
… …
3759} 4331}
3760 4332
3761sub update { 4333sub update {
3762 my ($self) = @_; 4334 my ($self) = @_;
3763 4335
3764 $::WANT_REFRESH++; 4336 $::WANT_REFRESH->start;
3765} 4337}
3766 4338
3767sub add { 4339sub add {
3768 my ($self, @children) = @_; 4340 my ($self, @children) = @_;
3769 4341
… …
3806 while ($self->{refresh_hook}) { 4378 while ($self->{refresh_hook}) {
3807 $_->() 4379 $_->()
3808 for values %{delete $self->{refresh_hook}}; 4380 for values %{delete $self->{refresh_hook}};
3809 } 4381 }
3810 4382
3811 if ($self->{realloc}) { 4383 while ($self->{realloc}) {
3812 my %queue; 4384 my %queue;
3813 my @queue; 4385 my @queue;
3814 my $widget; 4386 my $widget;
3815 4387
3816 outer: 4388 outer:
… …
3863 } 4435 }
3864 } 4436 }
3865 4437
3866 delete $self->{realloc}{$widget+0}; 4438 delete $self->{realloc}{$widget+0};
3867 } 4439 }
3868 }
3869 4440
3870 while (my $size_alloc = delete $self->{size_alloc}) { 4441 while (my $size_alloc = delete $self->{size_alloc}) {
3871 my @queue = sort { $b->{visible} <=> $a->{visible} } 4442 my @queue = sort { $a->{visible} <=> $b->{visible} }
3872 values %$size_alloc; 4443 values %$size_alloc;
3873 4444
3874 while () { 4445 while () {
3875 my $widget = pop @queue || last; 4446 my $widget = pop @queue || last;
3876 4447
3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4448 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3878 4449
3879 $w = 0 if $w < 0;
3880 $h = 0 if $h < 0;
3881
3882 $w = max $widget->{min_w}, $w; 4450 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h; 4451 $h = max $widget->{min_h}, $h;
3884 4452
4453# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4454# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4455
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4456 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4457 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887 4458
3888 $w = int $w + 0.5; 4459 $w = int $w + 0.5;
3889 $h = int $h + 0.5; 4460 $h = int $h + 0.5;
3890 4461
3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4462 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3892 $widget->{old_w} = $widget->{w}; 4463 $widget->{old_w} = $widget->{w};
3893 $widget->{old_h} = $widget->{h}; 4464 $widget->{old_h} = $widget->{h};
3894 4465
3895 $widget->{w} = $w; 4466 $widget->{w} = $w;
3896 $widget->{h} = $h; 4467 $widget->{h} = $h;
3897 4468
3898 $widget->emit (size_allocate => $w, $h); 4469 $widget->emit (size_allocate => $w, $h);
4470 }
3899 } 4471 }
3900 } 4472 }
3901 } 4473 }
3902 4474
3903 while ($self->{post_alloc_hook}) { 4475 while ($self->{post_alloc_hook}) {
3904 $_->() 4476 $_->()
3905 for values %{delete $self->{post_alloc_hook}}; 4477 for values %{delete $self->{post_alloc_hook}};
3906 } 4478 }
3907
3908 4479
3909 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4480 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4481 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3911 glClear GL_COLOR_BUFFER_BIT; 4482 glClear GL_COLOR_BUFFER_BIT;
3912 4483
… …
3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4486 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916 glMatrixMode GL_MODELVIEW; 4487 glMatrixMode GL_MODELVIEW;
3917 glLoadIdentity; 4488 glLoadIdentity;
3918 4489
3919 { 4490 {
3920 package CFClient::UI::Base; 4491 package CFPlus::UI::Base;
3921 4492
3922 ($draw_x, $draw_y, $draw_w, $draw_h) = 4493 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h}); 4494 (0, 0, $self->{w}, $self->{h});
3924 }
3925 4495
3926 $self->_draw; 4496 $self->_draw;
4497 }
3927} 4498}
3928 4499
3929############################################################################# 4500#############################################################################
3930 4501
3931package CFClient::UI; 4502package CFPlus::UI;
3932 4503
3933$ROOT = new CFClient::UI::Root; 4504$ROOT = new CFPlus::UI::Root;
3934$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4505$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935 4506
39361 45071
3937 4508

Diff Legend

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