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

Diff Legend

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