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.439 by root, Sun Sep 16 13:04:36 2007 UTC

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

Diff Legend

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