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

Diff Legend

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