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.382 by root, Thu Jul 19 19:58:56 2007 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 UTC

1package CFPlus::UI; 1package dc::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use dc;
10use CFPlus::Pod; 9use dc::Pod;
11use CFPlus::Texture; 10use dc::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & dc::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
… …
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
… …
210 reconfigure_widgets; 211 reconfigure_widgets;
211} 212}
212 213
213############################################################################# 214#############################################################################
214 215
215package CFPlus::UI::Event; 216package dc::UI::Event;
216 217
217sub xy { 218sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 220}
220 221
221############################################################################# 222#############################################################################
222 223
223package CFPlus::UI::Base; 224package dc::UI::Base;
224 225
225use strict; 226use strict;
226 227
227use CFPlus::OpenGL; 228use dc::OpenGL;
228 229
229sub new { 230sub new {
230 my $class = shift; 231 my $class = shift;
231 232
232 my $self = bless { 233 my $self = bless {
… …
237 h => undef, 238 h => undef,
238 can_events => 1, 239 can_events => 1,
239 @_ 240 @_
240 }, $class; 241 }, $class;
241 242
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 dc::weaken ($dc::UI::WIDGET{$self+0} = $self);
243 244
244 for (keys %$self) { 245 for (keys %$self) {
245 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
247 } 248 }
248 } 249 }
249 250
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $dc::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $dc::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $dc::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $dc::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $dc::UI::ROOT->{alloc_h} if exists $layout->{h};
255 256
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 259
259 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
280 return if $self->{parent}; 281 return if $self->{parent};
281 282
282 $CFPlus::UI::ROOT->add ($self); 283 $dc::UI::ROOT->add ($self);
283} 284}
284 285
285sub set_visible { 286sub set_visible {
286 my ($self) = @_; 287 my ($self) = @_;
287 288
… …
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $dc::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
… …
337sub hide { 338sub hide {
338 my ($self) = @_; 339 my ($self) = @_;
339 340
340 $self->set_invisible; 341 $self->set_invisible;
341 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 346 $parent->remove ($self);
343 if $self->{parent}; 347 }
344} 348}
345 349
346sub move_abs { 350sub move_abs {
347 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
348 352
… …
360 $self->{force_h} = $h; 364 $self->{force_h} = $h;
361 365
362 $self->realloc; 366 $self->realloc;
363} 367}
364 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
377}
378
365sub size_request { 379sub size_request {
366 require Carp; 380 require Carp;
367 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
368} 382}
369 383
… …
375 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
376 390
377 if ($self->{aspect}) { 391 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
379 393
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 394 $w = List::Util::min $w, dc::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 395 $h = List::Util::min $h, dc::ceil $w / $self->{aspect};
382 396
383 # use alignment to adjust x, y 397 # use alignment to adjust x, y
384 398
385 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
… …
427 441
428 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
429 443
430 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
431 445
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($dc::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $dc::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $dc::UI::TOOLTIP_WATCHER->invoke;
435 } 449 }
436} 450}
437 451
438# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
439sub coord2local { 453sub coord2local {
440 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
441 455
442 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
443 457
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 459}
446 460
447# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
448sub coord2global { 462sub coord2global {
449 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
450 464
451 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
452 466
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 468}
455 469
456sub invoke_focus_in { 470sub invoke_focus_in {
… …
505sub connect { 519sub connect {
506 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
507 521
508 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
509 523
510 defined wantarray and CFPlus::guard { 524 defined wantarray and dc::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 526 @{ $self->{signal_cb}{$signal} };
513 } 527 }
514} 528}
515 529
… …
547 561
548 # parent 562 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 563 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 564}
551 565
552sub find_widget { 566#sub find_widget {
553 my ($self, $x, $y) = @_; 567# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 568
564sub set_parent { 569sub set_parent {
565 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
566 571
567 CFPlus::weaken ($self->{parent} = $parent); 572 dc::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
569} 574}
570 575
571sub realloc { 576sub realloc {
572 my ($self) = @_; 577 my ($self) = @_;
… …
598 603
599# using global variables seems a bit hacky, but passing through all drawing 604# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 605# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 606our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 607
603sub draw { 608#sub draw {
604 my ($self) = @_; 609#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 610
650sub _draw { 611sub _draw {
651 my ($self) = @_; 612 my ($self) = @_;
652 613
653 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
654} 615}
655 616
656my $cntx;#d#
657sub DESTROY { 617sub DESTROY {
658 my ($self) = @_; 618 my ($self) = @_;
659 619
660 return if CFPlus::in_destruct; 620 return if dc::in_destruct;
661 621
622 local $@;
662 eval { $self->destroy }; 623 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 625
665 delete $WIDGET{$self+0}; 626 delete $WIDGET{$self+0};
666} 627}
667 628
668############################################################################# 629#############################################################################
669 630
670package CFPlus::UI::DrawBG; 631package dc::UI::DrawBG;
671 632
672our @ISA = CFPlus::UI::Base::; 633our @ISA = dc::UI::Base::;
673 634
674use strict; 635use strict;
675use CFPlus::OpenGL; 636use dc::OpenGL;
676 637
677sub new { 638sub new {
678 my $class = shift; 639 my $class = shift;
679
680 # range [value, low, high, page]
681 640
682 $class->SUPER::new ( 641 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
685 @_ 644 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
698 657
699 glEnable GL_BLEND; 658 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 660 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 662 glDisable GL_BLEND;
711 } 663 }
712} 664}
713 665
714############################################################################# 666#############################################################################
715 667
716package CFPlus::UI::Empty; 668package dc::UI::Empty;
717 669
718our @ISA = CFPlus::UI::Base::; 670our @ISA = dc::UI::Base::;
719 671
720sub new { 672sub new {
721 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
723} 675}
… …
730 682
731sub draw { } 683sub draw { }
732 684
733############################################################################# 685#############################################################################
734 686
735package CFPlus::UI::Container; 687package dc::UI::Container;
736 688
737our @ISA = CFPlus::UI::Base::; 689our @ISA = dc::UI::Base::;
738 690
739sub new { 691sub new {
740 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
741 693
742 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
… …
746 can_events => 0, 698 can_events => 0,
747 %arg, 699 %arg,
748 ); 700 );
749 701
750 $self->add (@$children) 702 $self->add (@$children)
751 if $children; 703 if $children && @$children;
752 704
753 $self 705 $self
754} 706}
755 707
756sub realloc { 708sub realloc {
… …
765 my ($self, @widgets) = @_; 717 my ($self, @widgets) = @_;
766 718
767 $_->set_parent ($self) 719 $_->set_parent ($self)
768 for @widgets; 720 for @widgets;
769 721
722 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 723 use sort 'stable';
771 724
772 $self->{children} = [ 725 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
775 ]; 728 ];
776 729
777 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
778} 735}
779 736
780sub children { 737sub children {
781 @{ $_[0]{children} } 738 @{ $_[0]{children} }
782} 739}
783 740
784sub remove { 741sub remove {
785 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
786 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
787 delete $child->{parent}; 747 delete $child->{parent};
788 $child->hide; 748 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
791 751
792 $self->realloc; 752 $self->realloc;
793} 753}
794 754
795sub clear { 755sub clear {
796 my ($self) = @_; 756 my ($self) = @_;
797 757
798 my $children = delete $self->{children}; 758 my $children = $self->{children};
799 $self->{children} = []; 759 $self->{children} = [];
800 760
801 for (@$children) { 761 for (@$children) {
802 delete $_->{parent}; 762 delete $_->{parent};
803 $_->hide; 763 $_->hide;
… …
823} 783}
824 784
825sub _draw { 785sub _draw {
826 my ($self) = @_; 786 my ($self) = @_;
827 787
828 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
829} 789}
830 790
831############################################################################# 791#############################################################################
832 792
833package CFPlus::UI::Bin; 793package dc::UI::Bin;
834 794
835our @ISA = CFPlus::UI::Container::; 795our @ISA = dc::UI::Container::;
836 796
837sub new { 797sub new {
838 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
839 799
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 800 my $child = (delete $arg{child}) || new dc::UI::Empty::;
841 801
842 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
843} 803}
844 804
845sub add { 805sub add {
846 my ($self, $child) = @_; 806 my ($self, $child) = @_;
847 807
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
849 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
850} 810}
851 811
852sub remove { 812sub remove {
853 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
854 814
855 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
856 816
857 $self->{children} = [new CFPlus::UI::Empty] 817 $self->{children} = [new dc::UI::Empty]
858 unless @{$self->{children}}; 818 unless @{$self->{children}};
859} 819}
860 820
861sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
862 822
… …
871 831
872 1 832 1
873} 833}
874 834
875############################################################################# 835#############################################################################
876
877# back-buffered drawing area 836# back-buffered drawing area
878 837
879package CFPlus::UI::Window; 838package dc::UI::Window;
880 839
881our @ISA = CFPlus::UI::Bin::; 840our @ISA = dc::UI::Bin::;
882 841
883use CFPlus::OpenGL; 842use dc::OpenGL;
884 843
885sub new { 844sub new {
886 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
887 846
888 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
… …
910} 869}
911 870
912sub render_child { 871sub render_child {
913 my ($self) = @_; 872 my ($self) = @_;
914 873
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 874 $self->{texture} = new_from_opengl dc::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
918 877
919 { 878 {
920 package CFPlus::UI::Base; 879 package dc::UI::Base;
921 880
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
924 883
925 $self->_render; 884 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
943} 902}
944 903
945############################################################################# 904#############################################################################
946 905
947package CFPlus::UI::ViewPort; 906package dc::UI::ViewPort;
948 907
949use List::Util qw(min max); 908use List::Util qw(min max);
950 909
951our @ISA = CFPlus::UI::Window::; 910our @ISA = dc::UI::Window::;
952 911
953sub new { 912sub new {
954 my $class = shift; 913 my $class = shift;
955 914
956 $class->SUPER::new ( 915 $class->SUPER::new (
… …
963sub size_request { 922sub size_request {
964 my ($self) = @_; 923 my ($self) = @_;
965 924
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 926
968 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
970 929
971 ($w, $h) 930 ($w, $h)
972} 931}
973 932
974sub invoke_size_allocate { 933sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 957 $self->emit (changed => $x, $y);
999 $self->update; 958 $self->update;
1000 } 959 }
1001} 960}
1002 961
962sub set_center {
963 my ($self, $x, $y) = @_;
964
965 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
966}
967
968sub make_visible {
969 my ($self, $x, $y, $border) = @_;
970
971 if ( $x < $self->{view_x} + $self->{w} * $border
972 || $x > $self->{view_x} + $self->{w} * (1 - $border)
973 || $y < $self->{view_y} + $self->{h} * $border
974 || $y > $self->{view_y} + $self->{h} * (1 - $border)
975 ) {
976 $self->set_center ($x, $y);
977 }
978}
979
1003# hmm, this does not work for topleft of $self... but we should not ask for that 980# hmm, this does not work for topleft of $self... but we should not ask for that
1004sub coord2local { 981sub coord2local {
1005 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
1006 983
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 984 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
1021 998
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1001 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1003 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->dc::UI::Base::find_widget ($x, $y)
1028 } 1005 }
1029} 1006}
1030 1007
1031sub _render { 1008sub _render {
1032 my ($self) = @_; 1009 my ($self) = @_;
1033 1010
1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1011 local $dc::UI::Base::draw_x = $dc::UI::Base::draw_x - $self->{view_x};
1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1012 local $dc::UI::Base::draw_y = $dc::UI::Base::draw_y - $self->{view_y};
1036 1013
1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1038 1015
1039 $self->SUPER::_render; 1016 $self->SUPER::_render;
1040} 1017}
1041 1018
1042############################################################################# 1019#############################################################################
1043 1020
1044package CFPlus::UI::ScrolledWindow; 1021package dc::UI::ScrolledWindow;
1045 1022
1046our @ISA = CFPlus::UI::Table::; 1023our @ISA = dc::UI::Table::;
1047 1024
1048sub new { 1025sub new {
1049 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1050 1027
1051 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1052 1029
1053 my $self; 1030 my $self;
1054 1031
1055 my $hslider = new CFPlus::UI::Slider 1032 my $hslider = new dc::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1056 vertical => 0, 1035 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1036 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1037 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1038 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1040 },
1062 ; 1041 ;
1063 1042
1064 my $vslider = new CFPlus::UI::Slider 1043 my $vslider = new dc::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
1065 vertical => 1, 1046 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1048 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1049 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1079 col_expand => [1, 0], 1060 col_expand => [1, 0],
1080 row_expand => [1, 0], 1061 row_expand => [1, 0],
1081 %arg, 1062 %arg,
1082 ); 1063 );
1083 1064
1084 $self->{vp} = new CFPlus::UI::ViewPort 1065 $self->{vp} = new dc::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1085 expand => 1, 1068 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1069 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1070 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1071 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1072 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1074 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1075 $vp->{parent}{vslider}->set_value ($y);
1093 1076
1094 0 1077 0
1095 }, 1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1096 ; 1084 ;
1097 1085
1098 $self->SUPER::add (0, 0, $self->{vp}); 1086 $self->SUPER::add ($self->{vp});
1099 1087
1100 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1101 1089
1102 $self 1090 $self
1103} 1091}
1104
1105#TODO# update range on size_allocate depending on child
1106 1092
1107sub add { 1093sub add {
1108 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1109 1095
1110 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1111} 1097}
1112 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1113sub update_slider { 1103sub update_slider {
1114 my ($self) = @_; 1104 my ($self) = @_;
1115 1105
1116 my $child = ($self->{vp} or return)->child; 1106 my $child = ($self->{vp} or return)->child;
1117 1107
1108 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1111
1121 my $visible = $w1 > $w2; 1112 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1115 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1125 } 1118 }
1126 1119
1120 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1123
1130 my $visible = $h1 > $h2; 1124 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1127 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
1134 my ($self, $ev) = @_;
1135
1136 $self->grab_focus;
1137
1138 my $ox = $self->{vp}{view_x};
1139 my $oy = $self->{vp}{view_y};
1140
1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1134 } 1148 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1149}
1143 1150
1144sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1146 1153
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1156
1151 1 1157 1
1152} 1158}
1153 1159
1154sub invoke_button_down { 1160sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1156 1162
1157 if ($ev->{button} == 2) { 1163 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1164 $self->start_dragging ($ev);
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1; 1165 return 1;
1171 } 1166 }
1172 1167
1173 0 1168 0
1174} 1169}
… …
1201 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1202} 1197}
1203 1198
1204############################################################################# 1199#############################################################################
1205 1200
1206package CFPlus::UI::Frame; 1201package dc::UI::Frame;
1207 1202
1208our @ISA = CFPlus::UI::Bin::; 1203our @ISA = dc::UI::Bin::;
1209 1204
1210use CFPlus::OpenGL; 1205use dc::OpenGL;
1211 1206
1212sub new { 1207sub new {
1213 my $class = shift; 1208 my $class = shift;
1214 1209
1215 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1225 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1226 1221
1227 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1230
1231 glBegin GL_QUADS;
1232 glVertex 0 , 0;
1233 glVertex 0 , $h;
1234 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1235 glVertex $w, 0;
1236 glEnd;
1237
1238 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1239 } 1227 }
1240 1228
1241 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1242} 1230}
1243 1231
1244############################################################################# 1232#############################################################################
1245 1233
1246package CFPlus::UI::FancyFrame; 1234package dc::UI::FancyFrame;
1247 1235
1248our @ISA = CFPlus::UI::Bin::; 1236our @ISA = dc::UI::Bin::;
1249 1237
1250use CFPlus::OpenGL; 1238use dc::OpenGL;
1251 1239
1252sub new { 1240sub new {
1253 my ($class, %arg) = @_; 1241 my ($class, %arg) = @_;
1254 1242
1255 if ((exists $arg{label}) && !ref $arg{label}) { 1243 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label 1244 $arg{label} = new dc::UI::Label
1257 align => 1, 1245 align => 1,
1258 valign => 0, 1246 valign => 0,
1259 text => $arg{label}, 1247 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75; 1248 fontsize => ($arg{border} || 0.8) * 0.75;
1261 } 1249 }
… …
1273 1261
1274sub add { 1262sub add {
1275 my ($self, @widgets) = @_; 1263 my ($self, @widgets) = @_;
1276 1264
1277 $self->SUPER::add (@widgets); 1265 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1266 $self->dc::UI::Container::add ($self->{label}) if $self->{label};
1279} 1267}
1280 1268
1281sub border { 1269sub border {
1282 int $_[0]{border} * $::FONTSIZE 1270 int $_[0]{border} * $::FONTSIZE
1283} 1271}
… …
1341 } 1329 }
1342} 1330}
1343 1331
1344############################################################################# 1332#############################################################################
1345 1333
1346package CFPlus::UI::Toplevel; 1334package dc::UI::Toplevel;
1347 1335
1348our @ISA = CFPlus::UI::Bin::; 1336our @ISA = dc::UI::Bin::;
1349 1337
1350use CFPlus::OpenGL; 1338use dc::OpenGL;
1351 1339
1352my $bg = 1340my $bg =
1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1354 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1355 1343
1356my @border = 1344my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359 1347
1360my @icon = 1348my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1349 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png); 1350 qw(x1_move.png x1_resize.png);
1363 1351
1364sub new { 1352sub new {
1365 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1366 1354
… …
1372 min_w => 64, 1360 min_w => 64,
1373 min_h => 32, 1361 min_h => 32,
1374 %arg, 1362 %arg,
1375 ); 1363 );
1376 1364
1377 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new dc::UI::Label
1378 align => 0, 1366 align => 0,
1379 valign => 1, 1367 valign => 1,
1380 text => $self->{title}, 1368 text => $self->{title},
1381 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1382 if exists $self->{title}; 1370 if exists $self->{title};
1383 1371
1384 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1385 $self->{close_button} = 1373 $self->{close_button} =
1386 new CFPlus::UI::ImageButton 1374 new dc::UI::ImageButton
1387 path => 'x1_close.png', 1375 path => 'x1_close.png',
1388 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1389 1377
1390 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->dc::UI::Container::add ($self->{close_button});
1391 } 1379 }
1392 1380
1393 $self 1381 $self
1394} 1382}
1395 1383
1396sub add { 1384sub add {
1397 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1398 1386
1399 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1400 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1388 $self->dc::UI::Container::add ($self->{close_button}) if $self->{close_button};
1401 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1389 $self->dc::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1402} 1390}
1403 1391
1404sub border { 1392sub border {
1405 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1394}
1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1406} 1403}
1407 1404
1408sub size_request { 1405sub size_request {
1409 my ($self) = @_; 1406 my ($self) = @_;
1410 1407
… …
1582 if $self->{close_button}; 1579 if $self->{close_button};
1583} 1580}
1584 1581
1585############################################################################# 1582#############################################################################
1586 1583
1587package CFPlus::UI::Table; 1584package dc::UI::Table;
1588 1585
1589our @ISA = CFPlus::UI::Base::; 1586our @ISA = dc::UI::Container::;
1590 1587
1591use List::Util qw(max sum); 1588use List::Util qw(max sum);
1592 1589
1593use CFPlus::OpenGL; 1590use dc::OpenGL;
1594 1591
1595sub new { 1592sub new {
1596 my $class = shift; 1593 my $class = shift;
1597 1594
1598 $class->SUPER::new ( 1595 $class->SUPER::new (
1599 children => [],
1600 col_expand => [], 1596 col_expand => [],
1601 row_expand => [], 1597 row_expand => [],
1602 @_, 1598 @_,
1603 ) 1599 )
1604} 1600}
1605 1601
1606sub children {
1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1608}
1609
1610# TODO: store row/col info in child widget and use standard add/del
1611sub add { 1602sub add {
1603 my ($self, @widgets) = @_;
1604
1605 for my $child (@widgets) {
1606 $child->{c_rowspan} ||= 1;
1607 $child->{c_colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1611}
1612
1613sub add_at {
1612 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1613 1617
1614 while (@_) { 1618 while (@_) {
1615 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1616 $child->set_parent ($self);
1617 $self->{children}[$y][$x] = $child;
1618 }
1619 1620
1620 $self->{force_realloc} = 1; 1621 $child->{c_row} = $row;
1621 $self->{force_size_alloc} = 1; 1622 $child->{c_col} = $col;
1622 $self->realloc;
1623}
1624 1623
1625sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1626 my ($self, $child) = @_; 1631 my ($self) = @_;
1627 1632
1628 for (@{ $self->{children} }) { 1633 my (@w, @h);
1629 for (@{ $_ || [] }) { 1634
1630 $_ = undef if $_ == $child; 1635 my @children = $self->children;
1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1631 } 1645 }
1632 } 1646 }
1633}
1634 1647
1635# TODO: move to container class maybe? send children a signal on removal? 1648 # second pass, rows
1636sub clear { 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1637 my ($self) = @_;
1638
1639 my @children = $self->children;
1640 delete $self->{children};
1641
1642 for (@children) {
1643 delete $_->{parent};
1644 $_->hide;
1645 }
1646
1647 $self->realloc;
1648}
1649
1650sub get_wh {
1651 my ($self) = @_;
1652
1653 my (@w, @h);
1654
1655 for my $y (0 .. $#{$self->{children}}) {
1656 my $row = $self->{children}[$y]
1657 or next;
1658
1659 for my $x (0 .. $#$row) {
1660 my $widget = $row->[$x]
1661 or next;
1662 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1663 1651
1664 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1665 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1666 } 1656 }
1667 } 1657 }
1668 1658
1669 (\@w, \@h) 1659 (\@w, \@h)
1670} 1660}
… …
1686 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1687 1677
1688 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1689 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1690 1680
1691 # TODO: nicer code 1681 # now linearly scale the rows/columns to the allocated size
1692 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1693 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1694 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1695 1685
1696 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1697 1687
1698 CFPlus::UI::harmonize $ws; 1688 dc::UI::harmonize $ws;
1699 1689
1700 my @row_expand = @{$self->{row_expand}}; 1690 my @row_expand = @{$self->{row_expand}};
1701 @row_expand = (1) x @$ws unless @row_expand; 1691 @row_expand = (1) x @$ws unless @row_expand;
1702 my $row_expand = (sum @row_expand) || 1; 1692 my $row_expand = (sum @row_expand) || 1;
1703 1693
1704 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1705 1695
1706 CFPlus::UI::harmonize $hs; 1696 dc::UI::harmonize $hs;
1707 1697
1708 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1709 1700
1710 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1711 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1712 or next;
1713 1703
1714 my $x = 0; 1704 $widget->configure (
1715 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1716 1707 );
1717 for my $c (0 .. $#$row) {
1718 my $col_w = $ws->[$c];
1719
1720 if (my $widget = $row->[$c]) {
1721 $widget->configure ($x, $y, $col_w, $row_h);
1722 }
1723
1724 $x += $col_w;
1725 }
1726
1727 $y += $row_h;
1728 } 1708 }
1729 1709
1730 1 1710 1
1731} 1711}
1732 1712
1733sub find_widget {
1734 my ($self, $x, $y) = @_;
1735
1736 $x -= $self->{x};
1737 $y -= $self->{y};
1738
1739 my $res;
1740
1741 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1742 $res = $_->find_widget ($x, $y)
1743 and return $res;
1744 }
1745
1746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1747}
1748
1749sub _draw {
1750 my ($self) = @_;
1751
1752 for (grep $_, @{$self->{children}}) {
1753 $_->draw for grep $_, @$_;
1754 }
1755}
1756
1757############################################################################# 1713#############################################################################
1758 1714
1759package CFPlus::UI::Fixed; 1715package dc::UI::Fixed;
1760 1716
1761use List::Util qw(min max); 1717use List::Util qw(min max);
1762 1718
1763our @ISA = CFPlus::UI::Container::; 1719our @ISA = dc::UI::Container::;
1764
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771 1720
1772sub _scale($$$) { 1721sub _scale($$$) {
1773 my ($mode, $val, $max) = @_; 1722 my ($rel, $val, $max) = @_;
1774 1723
1775 $mode eq "abs" ? $val 1724 $rel ? $val * $max : $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778} 1725}
1779 1726
1780sub size_request { 1727sub size_request {
1781 my ($self) = @_; 1728 my ($self) = @_;
1782 1729
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784 1731
1785 # determine overall size by querying abs widgets 1732 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) { 1733 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1788 1737
1789 if ($pos eq "abs") {
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1795 } 1740 }
1796 } 1741 }
1797 1742
1798 my $W = $x2 - $x1; 1743 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1; 1744 my $H = $y2 - $y1;
1800 1745
1801 # now layout remaining widgets 1746 # now layout remaining widgets
1802 for my $child ($self->visible_children) { 1747 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1748 if ($child->{c_rel}) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1804 1751
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1813 } 1754 }
1814 } 1755 }
1815 1756
1816 my $W = $x2 - $x1; 1757 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1; 1758 my $H = $y2 - $y1;
… …
1821 1762
1822sub invoke_size_allocate { 1763sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_; 1764 my ($self, $W, $H) = @_;
1824 1765
1825 for my $child ($self->visible_children) { 1766 for my $child ($self->visible_children) {
1826 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1827 1769
1828 $x = _scale $pos, $x, $W; 1770 $x += $child->{c_halign} * $child->{req_w};
1829 $y = _scale $pos, $x, $H; 1771 $y += $child->{c_valign} * $child->{req_h};
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832 1772
1833 $child->configure ($x, $y, $w, $h); 1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1834 } 1774 }
1835 1775
1836 1 1776 1
1837} 1777}
1838 1778
1839############################################################################# 1779#############################################################################
1840 1780
1841package CFPlus::UI::Box; 1781package dc::UI::Box;
1842 1782
1843our @ISA = CFPlus::UI::Container::; 1783our @ISA = dc::UI::Container::;
1844 1784
1845sub size_request { 1785sub size_request {
1846 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1847 1789
1848 $self->{vertical} 1790 $self->{vertical}
1849 ? ( 1791 ? (
1850 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1851 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1852 ) 1794 )
1853 : ( 1795 : (
1854 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1855 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1856 ) 1798 )
1857} 1799}
1858 1800
1859sub invoke_size_allocate { 1801sub invoke_size_allocate {
1860 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1881 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1882 for 0 .. $#children; 1824 for 0 .. $#children;
1883 } 1825 }
1884 } 1826 }
1885 1827
1886 CFPlus::UI::harmonize \@req; 1828 dc::UI::harmonize \@req;
1887 1829
1888 my $pos = 0; 1830 my $pos = 0;
1889 for (0 .. $#children) { 1831 for (0 .. $#children) {
1890 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1891 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1896 1 1838 1
1897} 1839}
1898 1840
1899############################################################################# 1841#############################################################################
1900 1842
1901package CFPlus::UI::HBox; 1843package dc::UI::HBox;
1902 1844
1903our @ISA = CFPlus::UI::Box::; 1845our @ISA = dc::UI::Box::;
1904 1846
1905sub new { 1847sub new {
1906 my $class = shift; 1848 my $class = shift;
1907 1849
1908 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1911 ) 1853 )
1912} 1854}
1913 1855
1914############################################################################# 1856#############################################################################
1915 1857
1916package CFPlus::UI::VBox; 1858package dc::UI::VBox;
1917 1859
1918our @ISA = CFPlus::UI::Box::; 1860our @ISA = dc::UI::Box::;
1919 1861
1920sub new { 1862sub new {
1921 my $class = shift; 1863 my $class = shift;
1922 1864
1923 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1926 ) 1868 )
1927} 1869}
1928 1870
1929############################################################################# 1871#############################################################################
1930 1872
1931package CFPlus::UI::Label; 1873package dc::UI::Label;
1932 1874
1933our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = dc::UI::DrawBG::;
1934 1876
1935use CFPlus::OpenGL; 1877use dc::OpenGL;
1936 1878
1937sub new { 1879sub new {
1938 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1939 1881
1940 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1945 #text => initial text 1887 #text => initial text
1946 #markup => initial narkup 1888 #markup => initial narkup
1947 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1948 #style => 0, # render flags 1890 #style => 0, # render flags
1949 ellipsise => 3, # end 1891 ellipsise => 3, # end
1950 layout => (new CFPlus::Layout), 1892 layout => (new dc::Layout),
1951 fontsize => 1, 1893 fontsize => 1,
1952 align => -1, 1894 align => -1,
1953 valign => -1, 1895 valign => -1,
1954 padding_x => 2, 1896 padding_x => 2,
1955 padding_y => 2, 1897 padding_y => 2,
1956 can_events => 0, 1898 can_events => 0,
1957 %arg 1899 %arg
1958 ); 1900 );
1959 1901
1960 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1961 my $layout = new CFPlus::Layout; 1903 my $layout = new dc::Layout;
1962 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1963 $self->{template} = $layout; 1905 $self->{template} = $layout;
1964 } 1906 }
1965 1907
1966 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1984 1926
1985 delete $self->{ox}; 1927 delete $self->{ox};
1986 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1987} 1929}
1988 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1989sub set_text { 1937sub set_text {
1990 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1991 1939
1992 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1993 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
2016 1964
2017sub size_request { 1965sub size_request {
2018 my ($self) = @_; 1966 my ($self) = @_;
2019 1967
2020 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
2021 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
2022 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
2023 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
2024 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2025 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2026 1976
2027 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
2099 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
2100 2050
2101 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2102 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2103 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2104 }; 2056 };
2105 2057
2106 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
2107 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = dc::OpenGL::glGenList;
2108 2060# dc::OpenGL::glNewList $self->{list};
2109 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062# dc::OpenGL::glEndList;
2063# }
2064#
2065# dc::OpenGL::glCallList $self->{list};
2066
2067 $self->{layout}->draw;
2110} 2068}
2069
2070#sub destroy {
2071# my ($self) = @_;
2072#
2073# dc::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074#
2075# $self->SUPER::destroy;
2076#}
2111 2077
2112############################################################################# 2078#############################################################################
2113 2079
2114package CFPlus::UI::EntryBase; 2080package dc::UI::EntryBase;
2115 2081
2116our @ISA = CFPlus::UI::Label::; 2082our @ISA = dc::UI::Label::;
2117 2083
2118use CFPlus::OpenGL; 2084use dc::OpenGL;
2119 2085
2120sub new { 2086sub new {
2121 my $class = shift; 2087 my $class = shift;
2122 2088
2123 $class->SUPER::new ( 2089 $class->SUPER::new (
2124 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
2125 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
2126 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
2127 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
2128 can_hover => 1, 2096 can_hover => 1,
2129 can_focus => 1, 2097 can_focus => 1,
2130 valign => 0, 2098 valign => 0,
2131 can_events => 1, 2099 can_events => 1,
2132 ellipsise => 0, 2100 ellipsise => 0,
… …
2188 2156
2189 if ($uni == 8) { 2157 if ($uni == 8) {
2190 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2191 } elsif ($uni == 127) { 2159 } elsif ($uni == 127) {
2192 substr $text, $self->{cursor}, 1, ""; 2160 substr $text, $self->{cursor}, 1, "";
2193 } elsif ($sym == CFPlus::SDLK_LEFT) { 2161 } elsif ($sym == dc::SDLK_LEFT) {
2194 --$self->{cursor} if $self->{cursor}; 2162 --$self->{cursor} if $self->{cursor};
2195 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2163 } elsif ($sym == dc::SDLK_RIGHT) {
2196 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2164 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2197 } elsif ($sym == CFPlus::SDLK_HOME) { 2165 } elsif ($sym == dc::SDLK_HOME) {
2198 # what a hack 2166 # what a hack
2199 $self->{cursor} = 2167 $self->{cursor} =
2200 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2201 ? length $1 2169 ? length $1
2202 : 0; 2170 : 0;
2203 } elsif ($sym == CFPlus::SDLK_END) { 2171 } elsif ($sym == dc::SDLK_END) {
2204 # uh, again 2172 # uh, again
2205 $self->{cursor} = 2173 $self->{cursor} =
2206 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2207 ? $self->{cursor} + length $1 2175 ? $self->{cursor} + length $1
2208 : length $self->{text}; 2176 : length $self->{text};
… …
2272 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
2273 } 2241 }
2274 2242
2275 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2276 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2277 glBegin GL_QUADS;
2278 glVertex 0 , 0;
2279 glVertex 0 , $self->{h};
2280 glVertex $self->{w}, $self->{h}; 2245 glRect 0, 0, $self->{w}, $self->{h};
2281 glVertex $self->{w}, 0;
2282 glEnd;
2283 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
2284 2247
2285 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
2286 2249
2287 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
… …
2289 2252
2290 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2291 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2292 utf8::encode $text; 2255 utf8::encode $text;
2293 2256
2294 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2295 } 2258 }
2296 2259
2260 glColor_premultiply @{$self->{active_fg}};
2297 glBegin GL_LINES; 2261 glBegin GL_LINES;
2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2299 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2300 glEnd; 2264 glEnd;
2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2269 glLineWidth 1;
2270
2271 } else {
2272 glColor @{$self->{outline}};
2273 glBegin GL_LINE_STRIP;
2274 glVertex .5, $self->{h} * .5;
2275 glVertex .5, $self->{h} - 2.5;
2276 glVertex $self->{w} - .5, $self->{h} - 2.5;
2277 glVertex $self->{w} - .5, $self->{h} * .5;
2278 glEnd;
2301 } 2279 }
2302} 2280}
2303 2281
2304############################################################################# 2282#############################################################################
2305 2283
2306package CFPlus::UI::Entry; 2284package dc::UI::Entry;
2307 2285
2308our @ISA = CFPlus::UI::EntryBase::; 2286our @ISA = dc::UI::EntryBase::;
2309 2287
2310use CFPlus::OpenGL; 2288use dc::OpenGL;
2311 2289
2312sub invoke_key_down { 2290sub invoke_key_down {
2313 my ($self, $ev) = @_; 2291 my ($self, $ev) = @_;
2314 2292
2315 my $sym = $ev->{sym}; 2293 my $sym = $ev->{sym};
… …
2321 $self->{history_pointer} = -1; 2299 $self->{history_pointer} = -1;
2322 $self->{history_saveback} = ''; 2300 $self->{history_saveback} = '';
2323 $self->emit (activate => $txt); 2301 $self->emit (activate => $txt);
2324 $self->update; 2302 $self->update;
2325 2303
2326 } elsif ($sym == CFPlus::SDLK_UP) { 2304 } elsif ($sym == dc::SDLK_UP) {
2327 if ($self->{history_pointer} < 0) { 2305 if ($self->{history_pointer} < 0) {
2328 $self->{history_saveback} = $self->get_text; 2306 $self->{history_saveback} = $self->get_text;
2329 } 2307 }
2330 if (@{$self->{history} || []} > 0) { 2308 if (@{$self->{history} || []} > 0) {
2331 $self->{history_pointer}++; 2309 $self->{history_pointer}++;
… …
2333 $self->{history_pointer} = @{$self->{history} || []} - 1; 2311 $self->{history_pointer} = @{$self->{history} || []} - 1;
2334 } 2312 }
2335 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2336 } 2314 }
2337 2315
2338 } elsif ($sym == CFPlus::SDLK_DOWN) { 2316 } elsif ($sym == dc::SDLK_DOWN) {
2339 $self->{history_pointer}--; 2317 $self->{history_pointer}--;
2340 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2341 2319
2342 if ($self->{history_pointer} >= 0) { 2320 if ($self->{history_pointer} >= 0) {
2343 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2321 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2352 1 2330 1
2353} 2331}
2354 2332
2355############################################################################# 2333#############################################################################
2356 2334
2357package CFPlus::UI::TextEdit; 2335package dc::UI::TextEdit;
2358 2336
2359our @ISA = CFPlus::UI::EntryBase::; 2337our @ISA = dc::UI::EntryBase::;
2360 2338
2361use CFPlus::OpenGL; 2339use dc::OpenGL;
2362 2340
2363sub move_cursor_ver { 2341sub move_cursor_ver {
2364 my ($self, $dy) = @_; 2342 my ($self, $dy) = @_;
2365 2343
2366 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
… …
2378sub invoke_key_down { 2356sub invoke_key_down {
2379 my ($self, $ev) = @_; 2357 my ($self, $ev) = @_;
2380 2358
2381 my $sym = $ev->{sym}; 2359 my $sym = $ev->{sym};
2382 2360
2383 if ($sym == CFPlus::SDLK_UP) { 2361 if ($sym == dc::SDLK_UP) {
2384 $self->move_cursor_ver (-1); 2362 $self->move_cursor_ver (-1);
2385 } elsif ($sym == CFPlus::SDLK_DOWN) { 2363 } elsif ($sym == dc::SDLK_DOWN) {
2386 $self->move_cursor_ver (+1); 2364 $self->move_cursor_ver (+1);
2387 } else { 2365 } else {
2388 return $self->SUPER::invoke_key_down ($ev) 2366 return $self->SUPER::invoke_key_down ($ev)
2389 } 2367 }
2390 2368
2391 1 2369 1
2392} 2370}
2393 2371
2394############################################################################# 2372#############################################################################
2395 2373
2396package CFPlus::UI::Button; 2374package dc::UI::ButtonBin;
2397 2375
2398our @ISA = CFPlus::UI::Label::; 2376our @ISA = dc::UI::Bin::;
2399 2377
2400use CFPlus::OpenGL; 2378use dc::OpenGL;
2401 2379
2402my @tex = 2380my @tex =
2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2381 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2382 qw(b1_button_inactive.png b1_button_active.png);
2383
2384sub new {
2385 my $class = shift;
2386
2387 $class->SUPER::new (
2388 can_hover => 1,
2389 align => 0,
2390 valign => 0,
2391 can_events => 1,
2392 @_
2393 )
2394}
2395
2396sub invoke_button_up {
2397 my ($self, $ev, $x, $y) = @_;
2398
2399 $self->emit ("activate")
2400 if $x >= 0 && $x < $self->{w}
2401 && $y >= 0 && $y < $self->{h};
2402
2403 1
2404}
2405
2406sub _draw {
2407 my ($self) = @_;
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411 glColor 0, 0, 0, 1;
2412
2413 my $tex = $tex[$GRAB == $self];
2414 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2415
2416 glDisable GL_TEXTURE_2D;
2417
2418 $self->SUPER::_draw;
2419}
2420
2421#############################################################################
2422
2423package dc::UI::Button;
2424
2425our @ISA = dc::UI::Label::;
2426
2427use dc::OpenGL;
2428
2429my @tex =
2430 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2404 qw(b1_button_inactive.png b1_button_active.png); 2431 qw(b1_button_inactive.png b1_button_active.png);
2405 2432
2406sub new { 2433sub new {
2407 my $class = shift; 2434 my $class = shift;
2408 2435
… …
2446 $self->SUPER::_draw; 2473 $self->SUPER::_draw;
2447} 2474}
2448 2475
2449############################################################################# 2476#############################################################################
2450 2477
2451package CFPlus::UI::CheckBox; 2478package dc::UI::CheckBox;
2452 2479
2453our @ISA = CFPlus::UI::DrawBG::; 2480our @ISA = dc::UI::DrawBG::;
2454 2481
2455my @tex = 2482my @tex =
2456 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2483 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2457 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2484 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2458 2485
2459use CFPlus::OpenGL; 2486use dc::OpenGL;
2460 2487
2461sub new { 2488sub new {
2462 my $class = shift; 2489 my $class = shift;
2463 2490
2464 $class->SUPER::new ( 2491 $class->SUPER::new (
… …
2504sub _draw { 2531sub _draw {
2505 my ($self) = @_; 2532 my ($self) = @_;
2506 2533
2507 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2508 2535
2509 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2510 2537
2511 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2512 2539
2513 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2540 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2514 2541
… …
2521 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2522} 2549}
2523 2550
2524############################################################################# 2551#############################################################################
2525 2552
2526package CFPlus::UI::Image; 2553package dc::UI::Image;
2527 2554
2528our @ISA = CFPlus::UI::Base::; 2555our @ISA = dc::UI::Base::;
2529 2556
2530use CFPlus::OpenGL; 2557use dc::OpenGL;
2531 2558
2532our %texture_cache; 2559our %texture_cache;
2533 2560
2534sub new { 2561sub new {
2535 my $class = shift; 2562 my $class = shift;
2536 2563
2537 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2538 can_events => 0, 2565 can_events => 0,
2566 scale => 1,
2539 @_, 2567 @_,
2540 ); 2568 );
2541 2569
2542 $self->{path} || $self->{tex} 2570 $self->{path} || $self->{tex}
2543 or Carp::croak "'path' or 'tex' attributes required"; 2571 or Carp::croak "'path' or 'tex' attributes required";
2544 2572
2545 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2573 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2546 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2574 new_from_file dc::Texture dc::find_rcfile $self->{path}, mipmap => 1;
2547 2575
2548 CFPlus::weaken $texture_cache{$self->{path}}; 2576 dc::weaken $texture_cache{$self->{path}};
2549 2577
2550 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2551 2579
2552 $self 2580 $self
2553} 2581}
2554 2582
2555sub STORABLE_freeze { 2583sub STORABLE_freeze {
2556 my ($self, $cloning) = @_; 2584 my ($self, $cloning) = @_;
2557 2585
2558 $self->{path} 2586 $self->{path}
2559 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2587 or die "cannot serialise dc::UI::Image on non-loadable images\n";
2560 2588
2561 $self->{path} 2589 $self->{path}
2562} 2590}
2563 2591
2564sub STORABLE_attach { 2592sub STORABLE_attach {
… …
2568} 2596}
2569 2597
2570sub size_request { 2598sub size_request {
2571 my ($self) = @_; 2599 my ($self) = @_;
2572 2600
2573 ($self->{tex}{w}, $self->{tex}{h}) 2601 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2574} 2602}
2575 2603
2576sub _draw { 2604sub _draw {
2577 my ($self) = @_; 2605 my ($self) = @_;
2578 2606
… …
2588 } 2616 }
2589 2617
2590 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2592 2620
2593 $tex->draw_quad (0, 0, $w, $h); 2621 $tex->draw_quad_alpha (0, 0, $w, $h);
2594 2622
2595 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2596} 2624}
2597 2625
2598############################################################################# 2626#############################################################################
2599 2627
2600package CFPlus::UI::ImageButton; 2628package dc::UI::ImageButton;
2601 2629
2602our @ISA = CFPlus::UI::Image::; 2630our @ISA = dc::UI::Image::;
2603 2631
2604use CFPlus::OpenGL; 2632use dc::OpenGL;
2605 2633
2606my %textures; 2634my %textures;
2607 2635
2608sub new { 2636sub new {
2609 my $class = shift; 2637 my $class = shift;
… …
2619 can_events => 1, 2647 can_events => 1,
2620 @_ 2648 @_
2621 ); 2649 );
2622} 2650}
2623 2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2656}
2657
2624sub invoke_button_up { 2658sub invoke_button_up {
2625 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2626 2660
2627 $self->emit ("activate") 2661 $self->emit ("activate")
2628 if $x >= 0 && $x < $self->{w} 2662 if $x >= 0 && $x < $self->{w}
… …
2631 1 2665 1
2632} 2666}
2633 2667
2634############################################################################# 2668#############################################################################
2635 2669
2636package CFPlus::UI::VGauge; 2670package dc::UI::VGauge;
2637 2671
2638our @ISA = CFPlus::UI::Base::; 2672our @ISA = dc::UI::Base::;
2639 2673
2640use List::Util qw(min max); 2674use List::Util qw(min max);
2641 2675
2642use CFPlus::OpenGL; 2676use dc::OpenGL;
2643 2677
2644my %tex = ( 2678my %tex = (
2645 food => [ 2679 food => [
2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2647 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2648 ], 2682 ],
2649 grace => [ 2683 grace => [
2650 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2651 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2685 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2652 ], 2686 ],
2653 hp => [ 2687 hp => [
2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2655 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2656 ], 2690 ],
2657 mana => [ 2691 mana => [
2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2659 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2693 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2660 ], 2694 ],
2661); 2695);
2662 2696
2663# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2766 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2767} 2801}
2768 2802
2769############################################################################# 2803#############################################################################
2770 2804
2805package dc::UI::Progress;
2806
2807our @ISA = dc::UI::Label::;
2808
2809use dc::OpenGL;
2810
2811sub new {
2812 my ($class, %arg) = @_;
2813
2814 my $self = $class->SUPER::new (
2815 fg => [1, 1, 1],
2816 bg => [0, 0, 1, 0.2],
2817 bar => [0.7, 0.5, 0.1, 0.8],
2818 outline => [0.4, 0.3, 0],
2819 fontsize => 0.9,
2820 valign => 0,
2821 align => 0,
2822 can_events => 1,
2823 ellipsise => 1,
2824 label => "%d%%",
2825 %arg,
2826 );
2827
2828 $self->set_value ($arg{value} || -1);
2829
2830 $self
2831}
2832
2833sub set_label {
2834 my ($self, $label) = @_;
2835
2836 return if $self->{label} eq $label;
2837 $self->{label} = $label;
2838
2839 $self->dc::UI::Progress::set_value (0 + delete $self->{value});
2840}
2841
2842sub set_value {
2843 my ($self, $value) = @_;
2844
2845 if ($self->{value} ne $value) {
2846 $self->{value} = $value;
2847
2848 if ($value < 0) {
2849 $self->set_text ("-");
2850 } else {
2851 $self->set_text (sprintf $self->{label}, $value * 100);
2852 }
2853
2854 $self->update;
2855 }
2856}
2857
2858sub _draw {
2859 my ($self) = @_;
2860
2861 glEnable GL_BLEND;
2862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2863
2864 if ($self->{value} >= 0) {
2865 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2866
2867 glColor_premultiply @{$self->{bar}};
2868 glRect 2, 2, $s, $self->{h} - 2;
2869 glColor_premultiply @{$self->{bg}};
2870 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2871 }
2872
2873 glColor_premultiply @{$self->{outline}};
2874 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2875
2876 glDisable GL_BLEND;
2877
2878 {
2879 local $self->{bg}; # do not draw background
2880 $self->SUPER::_draw;
2881 }
2882}
2883
2884#############################################################################
2885
2886package dc::UI::ExperienceProgress;
2887
2888our @ISA = dc::UI::Progress::;
2889
2890sub new {
2891 my ($class, %arg) = @_;
2892
2893 my $self = $class->SUPER::new (
2894 tooltip => sub {
2895 my ($self) = @_;
2896
2897 sprintf "level %d\n%s points\n%s next level\n%s to go",
2898 $self->{lvl},
2899 ::formsep ($self->{exp}),
2900 ::formsep ($self->{nxt}),
2901 ::formsep ($self->{nxt} - $self->{exp}),
2902 },
2903 %arg
2904 );
2905
2906 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2907 if $::CONN;
2908
2909 $self
2910}
2911
2912sub DESTROY {
2913 my ($self) = @_;
2914
2915 delete $::CONN->{on_exp_update}{$self+0}
2916 if $::CONN;
2917
2918 $self->SUPER::DESTROY;
2919}
2920
2921sub set_value {
2922 my ($self, $lvl, $exp) = @_;
2923
2924 $self->{lvl} = $lvl;
2925 $self->{exp} = $exp;
2926
2927 my $v = -1;
2928
2929 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2930 my $l0 = $table->[$lvl - 1];
2931 my $l1 = $table->[$lvl];
2932
2933 $self->{nxt} = $l1;
2934
2935 $v = ($exp - $l0) / ($l1 - $l0);
2936 }
2937
2938 $self->SUPER::set_value ($v);
2939}
2940
2941#############################################################################
2942
2771package CFPlus::UI::Gauge; 2943package dc::UI::Gauge;
2772 2944
2773our @ISA = CFPlus::UI::VBox::; 2945our @ISA = dc::UI::VBox::;
2774 2946
2775sub new { 2947sub new {
2776 my ($class, %arg) = @_; 2948 my ($class, %arg) = @_;
2777 2949
2778 my $self = $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
… …
2780 can_hover => 1, 2952 can_hover => 1,
2781 can_events => 1, 2953 can_events => 1,
2782 %arg, 2954 %arg,
2783 ); 2955 );
2784 2956
2785 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2957 $self->add ($self->{value} = new dc::UI::Label valign => +1, align => 0, template => "999");
2786 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2958 $self->add ($self->{gauge} = new dc::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2787 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2959 $self->add ($self->{max} = new dc::UI::Label valign => -1, align => 0, template => "999");
2788 2960
2789 $self 2961 $self
2790} 2962}
2791 2963
2792sub set_fontsize { 2964sub set_fontsize {
… …
2813 $self->{value}->set_text ($val); 2985 $self->{value}->set_text ($val);
2814} 2986}
2815 2987
2816############################################################################# 2988#############################################################################
2817 2989
2818package CFPlus::UI::Slider; 2990package dc::UI::Slider;
2819 2991
2820use strict; 2992use strict;
2821 2993
2822use CFPlus::OpenGL; 2994use dc::OpenGL;
2823 2995
2824our @ISA = CFPlus::UI::DrawBG::; 2996our @ISA = dc::UI::DrawBG::;
2825 2997
2826my @tex = 2998my @tex =
2827 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 2999 map { new_from_file dc::Texture dc::find_rcfile $_ }
2828 qw(s1_slider.png s1_slider_bg.png); 3000 qw(s1_slider.png s1_slider_bg.png);
2829 3001
2830sub new { 3002sub new {
2831 my $class = shift; 3003 my $class = shift;
2832 3004
… …
2900 3072
2901 $self->SUPER::invoke_button_down ($ev, $x, $y); 3073 $self->SUPER::invoke_button_down ($ev, $x, $y);
2902 3074
2903 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3075 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2904 3076
2905 $self->invoke_mouse_motion ($ev, $x, $y) 3077 $self->invoke_mouse_motion ($ev, $x, $y);
3078
3079 1
2906} 3080}
2907 3081
2908sub invoke_mouse_motion { 3082sub invoke_mouse_motion {
2909 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2910 3084
… …
2926sub invoke_mouse_wheel { 3100sub invoke_mouse_wheel {
2927 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2928 3102
2929 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2930 3104
2931 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3105 my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
2932 3106
2933 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2934 3108
2935 ! ! $delta 3109 1
2936} 3110}
2937 3111
2938sub update { 3112sub update {
2939 my ($self) = @_; 3113 my ($self) = @_;
2940 3114
… …
2989 glDisable GL_TEXTURE_2D; 3163 glDisable GL_TEXTURE_2D;
2990} 3164}
2991 3165
2992############################################################################# 3166#############################################################################
2993 3167
2994package CFPlus::UI::ValSlider; 3168package dc::UI::ValSlider;
2995 3169
2996our @ISA = CFPlus::UI::HBox::; 3170our @ISA = dc::UI::HBox::;
2997 3171
2998sub new { 3172sub new {
2999 my ($class, %arg) = @_; 3173 my ($class, %arg) = @_;
3000 3174
3001 my $range = delete $arg{range}; 3175 my $range = delete $arg{range};
3002 3176
3003 my $self = $class->SUPER::new ( 3177 my $self = $class->SUPER::new (
3004 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3178 slider => (new dc::UI::Slider expand => 1, range => $range),
3005 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3179 entry => (new dc::UI::Label text => "", template => delete $arg{template}),
3006 to_value => sub { shift }, 3180 to_value => sub { shift },
3007 from_value => sub { shift }, 3181 from_value => sub { shift },
3008 %arg, 3182 %arg,
3009 ); 3183 );
3010 3184
… …
3030sub set_range { shift->{slider}->set_range (@_) } 3204sub set_range { shift->{slider}->set_range (@_) }
3031sub set_value { shift->{slider}->set_value (@_) } 3205sub set_value { shift->{slider}->set_value (@_) }
3032 3206
3033############################################################################# 3207#############################################################################
3034 3208
3035package CFPlus::UI::TextScroller; 3209package dc::UI::TextScroller;
3036 3210
3037our @ISA = CFPlus::UI::HBox::; 3211our @ISA = dc::UI::HBox::;
3038 3212
3039use CFPlus::OpenGL; 3213use dc::OpenGL;
3040 3214
3041sub new { 3215sub new {
3042 my $class = shift; 3216 my $class = shift;
3043 3217
3044 my $self = $class->SUPER::new ( 3218 my $self = $class->SUPER::new (
… …
3046 can_events => 1, 3220 can_events => 1,
3047 indent => 0, 3221 indent => 0,
3048 #font => default_font 3222 #font => default_font
3049 @_, 3223 @_,
3050 3224
3051 layout => (new CFPlus::Layout), 3225 layout => (new dc::Layout),
3052 par => [], 3226 par => [],
3053 max_par => 0, 3227 max_par => 0,
3054 height => 0, 3228 height => 0,
3055 children => [ 3229 children => [
3056 (new CFPlus::UI::Empty expand => 1), 3230 (new dc::UI::Empty expand => 1),
3057 (new CFPlus::UI::Slider vertical => 1), 3231 (new dc::UI::Slider vertical => 1),
3058 ], 3232 ],
3059 ); 3233 );
3060 3234
3061 $self->{children}[1]->connect (changed => sub { $self->update }); 3235 $self->{children}[1]->connect (changed => sub { $self->update });
3062 3236
… …
3071} 3245}
3072 3246
3073sub size_request { 3247sub size_request {
3074 my ($self) = @_; 3248 my ($self) = @_;
3075 3249
3076 my ($empty, $slider) = @{ $self->{children} }; 3250 my ($empty, $slider) = $self->visible_children;
3077 3251
3078 local $self->{children} = [$empty, $slider]; 3252 local $self->{children} = [$empty, $slider];
3079 $self->SUPER::size_request 3253 $self->SUPER::size_request
3080} 3254}
3081 3255
… …
3245 $ROOT->on_post_alloc ($self => sub { 3419 $ROOT->on_post_alloc ($self => sub {
3246 $self->force_uptodate; 3420 $self->force_uptodate;
3247 3421
3248 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3249 3423
3250 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3424 $self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
3251 glClearColor 0, 0, 0, 0; 3425 glClearColor 0, 0, 0, 0;
3252 glClear GL_COLOR_BUFFER_BIT; 3426 glClear GL_COLOR_BUFFER_BIT;
3253 3427
3254 package CFPlus::UI::Base; 3428 package dc::UI::Base;
3255 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3429 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3256 (0, 0, $self->{w}, $self->{h}); 3430 (0, 0, $self->{w}, $self->{h});
3257 3431
3258 my $top = int $self->{children}[1]{range}[0]; 3432 my $top = int $self->{children}[1]{range}[0];
3259 3433
… …
3270 3444
3271 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
3272 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
3273 3447
3274 $layout->render ($para->{indent}, $y - $y0); 3448 $layout->render ($para->{indent}, $y - $y0);
3449 $layout->draw;
3275 3450
3276 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
3277 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
3278 3453
3279 for (@w) { 3454 for (@w) {
… …
3317 $self->{children}[1]->draw; 3492 $self->{children}[1]->draw;
3318} 3493}
3319 3494
3320############################################################################# 3495#############################################################################
3321 3496
3322package CFPlus::UI::Animator; 3497package dc::UI::Animator;
3323 3498
3324use CFPlus::OpenGL; 3499use dc::OpenGL;
3325 3500
3326our @ISA = CFPlus::UI::Bin::; 3501our @ISA = dc::UI::Bin::;
3327 3502
3328sub moveto { 3503sub moveto {
3329 my ($self, $x, $y) = @_; 3504 my ($self, $x, $y) = @_;
3330 3505
3331 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3359 glPopMatrix; 3534 glPopMatrix;
3360} 3535}
3361 3536
3362############################################################################# 3537#############################################################################
3363 3538
3364package CFPlus::UI::Flopper; 3539package dc::UI::Flopper;
3365 3540
3366our @ISA = CFPlus::UI::Button::; 3541our @ISA = dc::UI::Button::;
3367 3542
3368sub new { 3543sub new {
3369 my $class = shift; 3544 my $class = shift;
3370 3545
3371 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
… …
3383 $self->{other}->toggle_visibility; 3558 $self->{other}->toggle_visibility;
3384} 3559}
3385 3560
3386############################################################################# 3561#############################################################################
3387 3562
3388package CFPlus::UI::Tooltip; 3563package dc::UI::Tooltip;
3389 3564
3390our @ISA = CFPlus::UI::Bin::; 3565our @ISA = dc::UI::Bin::;
3391 3566
3392use CFPlus::OpenGL; 3567use dc::OpenGL;
3393 3568
3394sub new { 3569sub new {
3395 my $class = shift; 3570 my $class = shift;
3396 3571
3397 $class->SUPER::new ( 3572 $class->SUPER::new (
… …
3401} 3576}
3402 3577
3403sub set_tooltip_from { 3578sub set_tooltip_from {
3404 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
3405 3580
3406 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3407 if $widget->{tooltip} =~ /^#(.*)$/;
3408
3409 my $tooltip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583
3584 $tip = dc::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/;
3410 3586
3411 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
3412 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
3413 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3414 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
3415 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
3416 } 3592 }
3417 3593
3418 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
3419 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
3420 3596
3421 $self->add (new CFPlus::UI::Label 3597 $self->add (new dc::UI::Label
3422 markup => $tooltip, 3598 markup => $tip,
3423 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3424 fontsize => 0.8, 3600 fontsize => 0.8,
3425 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3426 ellipsise => 0, 3602 ellipsise => 0,
3427 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3465} 3641}
3466 3642
3467sub _draw { 3643sub _draw {
3468 my ($self) = @_; 3644 my ($self) = @_;
3469 3645
3470 glTranslate 0.375, 0.375;
3471
3472 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3473 3647
3474 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3475 glBegin GL_QUADS; 3649 glRect 0, 0, $w, $h;
3476 glVertex 0 , 0;
3477 glVertex 0 , $h;
3478 glVertex $w, $h;
3479 glVertex $w, 0;
3480 glEnd;
3481 3650
3482 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3483 glBegin GL_LINE_LOOP; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3484 glVertex 0 , 0;
3485 glVertex 0 , $h;
3486 glVertex $w, $h;
3487 glVertex $w, 0;
3488 glEnd;
3489 3653
3490 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3491 3655
3492 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3493} 3657}
3494 3658
3495############################################################################# 3659#############################################################################
3496 3660
3497package CFPlus::UI::Face; 3661package dc::UI::Face;
3498 3662
3499our @ISA = CFPlus::UI::DrawBG::; 3663our @ISA = dc::UI::DrawBG::;
3500 3664
3501use CFPlus::OpenGL; 3665use dc::OpenGL;
3502 3666
3503sub new { 3667sub new {
3504 my $class = shift; 3668 my $class = shift;
3505 3669
3506 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
… …
3510 can_events => 0, 3674 can_events => 0,
3511 @_, 3675 @_,
3512 ); 3676 );
3513 3677
3514 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3515 CFPlus::weaken (my $widget = $self); 3679 dc::weaken (my $widget = $self);
3516 3680
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3519 $self->{timer} = Event->timer (
3520 parked => 1,
3521 cb => sub {
3522 return unless $::CONN && $widget; 3683 return unless $::CONN;
3523 3684
3685 my $w = $widget
3686 or return;
3687
3524 ++$widget->{frame}; 3688 ++$w->{frame};
3525 $widget->update_face; 3689 $w->update_face;
3690
3691 # somehow, $widget can go away
3526 $widget->update; 3692 $w->update;
3527
3528 $widget->update_timer; 3693 $w->update_timer;
3529 },
3530 ); 3694 };
3531 3695
3532 $self->update_face; 3696 $self->update_face;
3533 $self->update_timer; 3697 $self->update_timer;
3534 } 3698 }
3535 3699
… …
3540 my ($self) = @_; 3704 my ($self) = @_;
3541 3705
3542 return unless $self->{timer}; 3706 return unless $self->{timer};
3543 3707
3544 if ($self->{visible}) { 3708 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start; 3709 $self->{timer}->start;
3551 } else { 3710 } else {
3552 $self->{timer}->stop; 3711 $self->{timer}->stop;
3553 } 3712 }
3554} 3713}
3555 3714
3556sub update_face { 3715sub update_face {
3557 my ($self) = @_; 3716 my ($self) = @_;
3558 3717
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
3569sub size_request {
3570 my ($self) = @_;
3571
3572 if ($::CONN) { 3718 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) { 3720 if ($anim && @$anim) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3576 } else { 3722 delete $self->{face_change_cb};
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3723
3578 $self->realloc; 3724 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3725 unless ($tex->{name} || $tex->{loading}) {
3726 $tex->upload (sub { $self->reconfigure });
3727 }
3579 }); 3728 }
3580 } 3729 }
3581 } 3730 }
3582 } 3731 }
3732}
3733
3734sub size_request {
3735 my ($self) = @_;
3736
3737 if ($::CONN) {
3738 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3739 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3740 if ($tex->{name}) {
3741 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3742 } elsif (!$tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746
3747 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3748 }
3749 }
3583 3750
3584 ($self->{size_w} || 8, $self->{size_h} || 8) 3751 ($self->{size_w} || 8, $self->{size_h} || 8)
3585} 3752}
3586 3753
3587sub update { 3754sub update {
… …
3601} 3768}
3602 3769
3603sub _draw { 3770sub _draw {
3604 my ($self) = @_; 3771 my ($self) = @_;
3605 3772
3606 return unless $::CONN;
3607
3608 $self->SUPER::_draw; 3773 $self->SUPER::_draw;
3609 3774
3610 my $faceid = $::CONN->{faceid}[$self->{face}] 3775 if (my $tex = $self->{tex}) {
3611 or return;
3612
3613 my $tex = $::CONN->{texture}[$faceid];
3614
3615 if ($tex) {
3616 glEnable GL_TEXTURE_2D; 3776 glEnable GL_TEXTURE_2D;
3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3618 glColor 0, 0, 0, 1; 3778 glColor 0, 0, 0, 1;
3619 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3779 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3620 glDisable GL_TEXTURE_2D; 3780 glDisable GL_TEXTURE_2D;
… …
3630 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3631} 3791}
3632 3792
3633############################################################################# 3793#############################################################################
3634 3794
3635package CFPlus::UI::Buttonbar; 3795package dc::UI::Buttonbar;
3636 3796
3637our @ISA = CFPlus::UI::HBox::; 3797our @ISA = dc::UI::HBox::;
3638 3798
3639# TODO: should actually wrap buttons and other goodies. 3799# TODO: should actually wrap buttons and other goodies.
3640 3800
3641############################################################################# 3801#############################################################################
3642 3802
3643package CFPlus::UI::Menu; 3803package dc::UI::Menu;
3644 3804
3645our @ISA = CFPlus::UI::Toplevel::; 3805our @ISA = dc::UI::Toplevel::;
3646 3806
3647use CFPlus::OpenGL; 3807use dc::OpenGL;
3648 3808
3649sub new { 3809sub new {
3650 my $class = shift; 3810 my $class = shift;
3651 3811
3652 my $self = $class->SUPER::new ( 3812 my $self = $class->SUPER::new (
3653 items => [], 3813 items => [],
3654 z => 100, 3814 z => 100,
3655 @_, 3815 @_,
3656 ); 3816 );
3657 3817
3658 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3818 $self->add ($self->{vbox} = new dc::UI::VBox);
3659 3819
3660 for my $item (@{ $self->{items} }) { 3820 for my $item (@{ $self->{items} }) {
3661 my ($widget, $cb, $tooltip) = @$item; 3821 my ($widget, $cb, $tooltip) = @$item;
3662 3822
3663 # handle various types of items, only text for now 3823 # handle various types of items, only text for now
3664 if (!ref $widget) { 3824 if (!ref $widget) {
3665 if ($widget =~ /\t/) { 3825 if ($widget =~ /\t/) {
3666 my ($left, $right) = split /\t/, $widget, 2; 3826 my ($left, $right) = split /\t/, $widget, 2;
3667 3827
3668 $widget = new CFPlus::UI::HBox 3828 $widget = new dc::UI::HBox
3669 can_hover => 1, 3829 can_hover => 1,
3670 can_events => 1, 3830 can_events => 1,
3671 tooltip => $tooltip, 3831 tooltip => $tooltip,
3672 children => [ 3832 children => [
3673 (new CFPlus::UI::Label markup => $left, expand => 1), 3833 (new dc::UI::Label markup => $left, expand => 1),
3674 (new CFPlus::UI::Label markup => $right, align => +1), 3834 (new dc::UI::Label markup => $right, align => +1),
3675 ], 3835 ],
3676 ; 3836 ;
3677 3837
3678 } else { 3838 } else {
3679 $widget = new CFPlus::UI::Label 3839 $widget = new dc::UI::Label
3680 can_hover => 1, 3840 can_hover => 1,
3681 can_events => 1, 3841 can_events => 1,
3682 markup => $widget, 3842 markup => $widget,
3683 tooltip => $tooltip; 3843 tooltip => $tooltip;
3684 } 3844 }
… …
3732 1 3892 1
3733} 3893}
3734 3894
3735############################################################################# 3895#############################################################################
3736 3896
3737package CFPlus::UI::Multiplexer; 3897package dc::UI::Multiplexer;
3738 3898
3739our @ISA = CFPlus::UI::Container::; 3899our @ISA = dc::UI::Container::;
3740 3900
3741sub new { 3901sub new {
3742 my $class = shift; 3902 my $class = shift;
3743 3903
3744 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
… …
3805 $self->{current}->draw; 3965 $self->{current}->draw;
3806} 3966}
3807 3967
3808############################################################################# 3968#############################################################################
3809 3969
3810package CFPlus::UI::Notebook; 3970package dc::UI::Notebook;
3811 3971
3972use dc::OpenGL;
3973
3812our @ISA = CFPlus::UI::VBox::; 3974our @ISA = dc::UI::VBox::;
3813 3975
3814sub new { 3976sub new {
3815 my $class = shift; 3977 my $class = shift;
3816 3978
3817 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3818 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new dc::UI::Buttonbar),
3819 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new dc::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3820 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3821 @_, 3984 @_,
3822 ); 3985 );
3823 3986
3824 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3825 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3988 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3826 3989
3990 {
3991 Scalar::Util::weaken (my $wself = $self);
3992
3993 $self->{multiplexer}->connect (c_add => sub {
3994 my ($mplex, $widgets) = @_;
3995
3996 for my $child (@$widgets) {
3997 Scalar::Util::weaken $child;
3998 $child->{c_tab_} ||= do {
3999 my $tab =
4000 (UNIVERSAL::isa $child->{c_tab}, "dc::UI::Base")
4001 ? $child->{c_tab}
4002 : new dc::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4003
4004 $tab->connect (activate => sub {
4005 $wself->set_current_page ($child);
4006 });
4007
4008 $tab
4009 };
4010
4011 $self->{buttonbar}->add ($child->{c_tab_});
4012 }
4013 });
4014
4015 $self->{multiplexer}->connect (c_remove => sub {
4016 my ($mplex, $widgets) = @_;
4017
4018 for my $child (@$widgets) {
4019 $wself->{buttonbar}->remove ($child->{c_tab_});
4020 }
4021 });
4022 }
4023
3827 $self 4024 $self
3828} 4025}
3829 4026
3830sub add { 4027sub add {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->add (@widgets)
4031}
4032
4033sub remove {
4034 my ($self, @widgets) = @_;
4035
4036 $self->{multiplexer}->remove (@widgets)
4037}
4038
4039sub pages {
4040 my ($self) = @_;
4041 $self->{multiplexer}->children
4042}
4043
4044sub add_tab {
3831 my ($self, $title, $widget, $tooltip) = @_; 4045 my ($self, $title, $widget, $tooltip) = @_;
3832 4046
3833 CFPlus::weaken $self; 4047 $title = [$title, $tooltip] unless ref $title;
4048 $widget->{c_tab} = $title;
3834 4049
3835 $self->{buttonbar}->add (new CFPlus::UI::Button
3836 markup => $title,
3837 tooltip => $tooltip,
3838 on_activate => sub { $self->set_current_page ($widget) },
3839 );
3840
3841 $self->{multiplexer}->add ($widget); 4050 $self->add ($widget);
3842} 4051}
3843 4052
3844sub get_current_page { 4053sub get_current_page {
3845 my ($self) = @_; 4054 my ($self) = @_;
3846 4055
… …
3852 4061
3853 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3854 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
3855} 4064}
3856 4065
4066sub _draw {
4067 my ($self) = @_;
4068
4069 $self->SUPER::_draw ();
4070
4071 if (my $cur = $self->{multiplexer}{current}) {
4072 if ($cur = $cur->{c_tab_}) {
4073 glTranslate $self->{buttonbar}{x} + $cur->{x},
4074 $self->{buttonbar}{y} + $cur->{y};
4075 glLineWidth 3;
4076 #glEnable GL_BLEND;
4077 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4078 glColor @{$self->{active_outline}};
4079 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4080 glLineWidth 1;
4081 #glDisable GL_BLEND;
4082 }
4083 }
4084}
4085
3857############################################################################# 4086#############################################################################
3858 4087
3859package CFPlus::UI::Selector; 4088package dc::UI::Selector;
3860 4089
3861use utf8; 4090use utf8;
3862 4091
3863our @ISA = CFPlus::UI::Button::; 4092our @ISA = dc::UI::Button::;
3864 4093
3865sub new { 4094sub new {
3866 my $class = shift; 4095 my $class = shift;
3867 4096
3868 my $self = $class->SUPER::new ( 4097 my $self = $class->SUPER::new (
… …
3885 my ($value, $title, $tooltip) = @$_; 4114 my ($value, $title, $tooltip) = @$_;
3886 4115
3887 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3888 } 4117 }
3889 4118
3890 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4119 dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
3891} 4120}
3892 4121
3893sub _set_value { 4122sub _set_value {
3894 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3895 4124
3896 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3897 or return; 4127 or return;
3898 4128
3899 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3900 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3901 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3902} 4132}
3903 4133
3904sub set_value { 4134sub set_value {
3905 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3906 4136
… …
3908 4138
3909 $self->_set_value ($value); 4139 $self->_set_value ($value);
3910 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
3911} 4141}
3912 4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
4148}
4149
3913############################################################################# 4150#############################################################################
3914 4151
3915package CFPlus::UI::Statusbox; 4152package dc::UI::Statusbox;
3916 4153
3917our @ISA = CFPlus::UI::VBox::; 4154our @ISA = dc::UI::VBox::;
3918 4155
3919sub new { 4156sub new {
3920 my $class = shift; 4157 my $class = shift;
3921 4158
3922 my $self = $class->SUPER::new ( 4159 my $self = $class->SUPER::new (
3923 fontsize => 0.8, 4160 fontsize => 0.8,
3924 @_, 4161 @_,
3925 ); 4162 );
3926 4163
3927 CFPlus::weaken (my $this = $self); 4164 dc::weaken (my $this = $self);
3928 4165
3929 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3930 4167
3931 $self 4168 $self
3932} 4169}
3933 4170
3934sub reorder { 4171sub reorder {
3935 my ($self) = @_; 4172 my ($self) = @_;
3936 my $NOW = Time::HiRes::time; 4173 my $NOW = Time::HiRes::time;
3937 4174
3938 # freeze display when hovering over any label 4175 # freeze display when hovering over any label
3939 return if $CFPlus::UI::TOOLTIP->{owner} 4176 return if $dc::UI::TOOLTIP->{owner}
3940 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4177 && grep $dc::UI::TOOLTIP->{owner} == $_->{label},
3941 values %{ $self->{item} }; 4178 values %{ $self->{item} };
3942 4179
3943 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
3944 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3945 } 4182 }
4183
4184 $self->{timer}->set (1, 1);
3946 4185
3947 my @widgets; 4186 my @widgets;
3948 4187
3949 my @items = sort { 4188 my @items = sort {
3950 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3951 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3952 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3953
3954 $self->{timer}->interval (1);
3955 4192
3956 my $count = 10 + 1; 4193 my $count = 10 + 1;
3957 for my $item (@items) { 4194 for my $item (@items) {
3958 last unless --$count; 4195 last unless --$count;
3959 4196
… …
3966 for ($short) { 4203 for ($short) {
3967 s/^\s+//; 4204 s/^\s+//;
3968 s/\s+/ /g; 4205 s/\s+/ /g;
3969 } 4206 }
3970 4207
3971 new CFPlus::UI::Label 4208 new dc::UI::Label
3972 markup => $short, 4209 markup => $short,
3973 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
3974 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
3975 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
3976 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3983 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3984 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3985 $label->update; 4222 $label->update;
3986 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3987 if $diff < 1; 4224 if $diff < 1;
3988 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3989 } else { 4226 } else {
3990 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3991 } 4228 }
3992 4229
3993 push @widgets, $label; 4230 push @widgets, $label;
… …
4055 $self->SUPER::destroy; 4292 $self->SUPER::destroy;
4056} 4293}
4057 4294
4058############################################################################# 4295#############################################################################
4059 4296
4060package CFPlus::UI::Root; 4297package dc::UI::Root;
4061 4298
4062our @ISA = CFPlus::UI::Container::; 4299our @ISA = dc::UI::Container::;
4063 4300
4064use List::Util qw(min max); 4301use List::Util qw(min max);
4065 4302
4066use CFPlus::OpenGL; 4303use dc::OpenGL;
4067 4304
4068sub new { 4305sub new {
4069 my $class = shift; 4306 my $class = shift;
4070 4307
4071 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
4072 visible => 1, 4309 visible => 1,
4073 @_, 4310 @_,
4074 ); 4311 );
4075 4312
4076 CFPlus::weaken ($self->{root} = $self); 4313 dc::weaken ($self->{root} = $self);
4077 4314
4078 $self 4315 $self
4079} 4316}
4080 4317
4081sub size_request { 4318sub size_request {
… …
4129} 4366}
4130 4367
4131sub update { 4368sub update {
4132 my ($self) = @_; 4369 my ($self) = @_;
4133 4370
4134 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
4135} 4372}
4136 4373
4137sub add { 4374sub add {
4138 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
4139 4376
… …
4176 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
4177 $_->() 4414 $_->()
4178 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
4179 } 4416 }
4180 4417
4181 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
4182 my %queue; 4419 my %queue;
4183 my @queue; 4420 my @queue;
4184 my $widget; 4421 my $widget;
4185 4422
4186 outer: 4423 outer:
… …
4233 } 4470 }
4234 } 4471 }
4235 4472
4236 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
4237 } 4474 }
4238 }
4239 4475
4240 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
4241 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
4242 values %$size_alloc; 4478 values %$size_alloc;
4243 4479
4244 while () { 4480 while () {
4245 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
4246 4482
4247 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4248 4484
4249 $w = 0 if $w < 0;
4250 $h = 0 if $h < 0;
4251
4252 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
4253 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
4254 4487
4255# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4256# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4257 4490
4258 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4259 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4260 4493
4261 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
4262 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
4263 4496
4264 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4497 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4265 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
4266 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
4267 4500
4268 $widget->{w} = $w; 4501 $widget->{w} = $w;
4269 $widget->{h} = $h; 4502 $widget->{h} = $h;
4270 4503
4271 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
4272 } 4506 }
4273 } 4507 }
4274 } 4508 }
4275 4509
4276 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
… …
4287 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4288 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
4289 glLoadIdentity; 4523 glLoadIdentity;
4290 4524
4291 { 4525 {
4292 package CFPlus::UI::Base; 4526 package dc::UI::Base;
4293 4527
4294 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4295 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
4296 4530
4297 $self->_draw; 4531 $self->_draw;
4298 } 4532 }
4299} 4533}
4300 4534
4301############################################################################# 4535#############################################################################
4302 4536
4303package CFPlus::UI; 4537package dc::UI;
4304 4538
4305$ROOT = new CFPlus::UI::Root; 4539$ROOT = new dc::UI::Root;
4306$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4540$TOOLTIP = new dc::UI::Tooltip z => 900;
4307 4541
43081 45421
4309 4543

Diff Legend

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