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.391 by root, Sat Jul 21 13:33:10 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 my $delta = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 116 my $shift = $ev->{mod} & dc::KMOD_SHIFT;
120 117
121 $ev->{dx} = $shift ? $delta : 0; 118 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 119 $ev->{dy} = $shift ? 0 : $delta;
123 120
124 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
… …
142 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 140 $grab->update if $grab;
144 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
145 142
146 check_hover $widget; 143 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
148 } 145 }
149} 146}
150 147
151sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
152 my ($ev) = @_; 149 my ($ev) = @_;
… …
214 reconfigure_widgets; 211 reconfigure_widgets;
215} 212}
216 213
217############################################################################# 214#############################################################################
218 215
219package CFPlus::UI::Event; 216package dc::UI::Event;
220 217
221sub xy { 218sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 220}
224 221
225############################################################################# 222#############################################################################
226 223
227package CFPlus::UI::Base; 224package dc::UI::Base;
228 225
229use strict; 226use strict;
230 227
231use CFPlus::OpenGL; 228use dc::OpenGL;
232 229
233sub new { 230sub new {
234 my $class = shift; 231 my $class = shift;
235 232
236 my $self = bless { 233 my $self = bless {
… …
241 h => undef, 238 h => undef,
242 can_events => 1, 239 can_events => 1,
243 @_ 240 @_
244 }, $class; 241 }, $class;
245 242
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 dc::weaken ($dc::UI::WIDGET{$self+0} = $self);
247 244
248 for (keys %$self) { 245 for (keys %$self) {
249 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
251 } 248 }
252 } 249 }
253 250
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $dc::UI::LAYOUT->{$self->{name}}) {
255 $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};
256 $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};
257 $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};
258 $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};
259 256
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 259
263 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
273 $self->emit ("destroy"); 270 $self->emit ("destroy");
274 %$self = (); 271 %$self = ();
275} 272}
276 273
277sub TO_JSON { 274sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
279} 276}
280 277
281sub show { 278sub show {
282 my ($self) = @_; 279 my ($self) = @_;
283 280
284 return if $self->{parent}; 281 return if $self->{parent};
285 282
286 $CFPlus::UI::ROOT->add ($self); 283 $dc::UI::ROOT->add ($self);
287} 284}
288 285
289sub set_visible { 286sub set_visible {
290 my ($self) = @_; 287 my ($self) = @_;
291 288
… …
312 delete $self->{root}; 309 delete $self->{root};
313 310
314 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
316 313
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $dc::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
319 316
320 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
322} 319}
… …
341sub hide { 338sub hide {
342 my ($self) = @_; 339 my ($self) = @_;
343 340
344 $self->set_invisible; 341 $self->set_invisible;
345 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 346 $parent->remove ($self);
347 if $self->{parent}; 347 }
348} 348}
349 349
350sub move_abs { 350sub move_abs {
351 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
352 352
… …
364 $self->{force_h} = $h; 364 $self->{force_h} = $h;
365 365
366 $self->realloc; 366 $self->realloc;
367} 367}
368 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
369sub size_request { 379sub size_request {
370 require Carp; 380 require Carp;
371 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
372} 382}
373 383
… …
379 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
380 390
381 if ($self->{aspect}) { 391 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
383 393
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 394 $w = List::Util::min $w, dc::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 395 $h = List::Util::min $h, dc::ceil $w / $self->{aspect};
386 396
387 # use alignment to adjust x, y 397 # use alignment to adjust x, y
388 398
389 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
… …
431 441
432 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
433 443
434 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
435 445
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($dc::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $dc::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $dc::UI::TOOLTIP_WATCHER->invoke;
439 } 449 }
440} 450}
441 451
442# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
443sub coord2local { 453sub coord2local {
444 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
445 455
446 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
447 457
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 459}
450 460
451# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
452sub coord2global { 462sub coord2global {
453 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
454 464
455 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
456 466
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 468}
459 469
460sub invoke_focus_in { 470sub invoke_focus_in {
… …
509sub connect { 519sub connect {
510 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
511 521
512 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
513 523
514 defined wantarray and CFPlus::guard { 524 defined wantarray and dc::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 526 @{ $self->{signal_cb}{$signal} };
517 } 527 }
518} 528}
519 529
… …
557# in .xs 567# in .xs
558 568
559sub set_parent { 569sub set_parent {
560 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
561 571
562 CFPlus::weaken ($self->{parent} = $parent); 572 dc::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
564} 574}
565 575
566sub realloc { 576sub realloc {
567 my ($self) = @_; 577 my ($self) = @_;
… …
593 603
594# 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
595# functions seems pointless. 605# functions seems pointless.
596our ($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
597 607
598sub draw { 608#sub draw {
599 my ($self) = @_; 609#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 610
645sub _draw { 611sub _draw {
646 my ($self) = @_; 612 my ($self) = @_;
647 613
648 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
649} 615}
650 616
651my $cntx;#d#
652sub DESTROY { 617sub DESTROY {
653 my ($self) = @_; 618 my ($self) = @_;
654 619
655 return if CFPlus::in_destruct; 620 return if dc::in_destruct;
656 621
622 local $@;
657 eval { $self->destroy }; 623 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 625
660 delete $WIDGET{$self+0}; 626 delete $WIDGET{$self+0};
661} 627}
662 628
663############################################################################# 629#############################################################################
664 630
665package CFPlus::UI::DrawBG; 631package dc::UI::DrawBG;
666 632
667our @ISA = CFPlus::UI::Base::; 633our @ISA = dc::UI::Base::;
668 634
669use strict; 635use strict;
670use CFPlus::OpenGL; 636use dc::OpenGL;
671 637
672sub new { 638sub new {
673 my $class = shift; 639 my $class = shift;
674
675 # range [value, low, high, page]
676 640
677 $class->SUPER::new ( 641 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
680 @_ 644 @_
… …
692 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
693 657
694 glEnable GL_BLEND; 658 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 660 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 662 glDisable GL_BLEND;
706 } 663 }
707} 664}
708 665
709############################################################################# 666#############################################################################
710 667
711package CFPlus::UI::Empty; 668package dc::UI::Empty;
712 669
713our @ISA = CFPlus::UI::Base::; 670our @ISA = dc::UI::Base::;
714 671
715sub new { 672sub new {
716 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
717 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
718} 675}
… …
725 682
726sub draw { } 683sub draw { }
727 684
728############################################################################# 685#############################################################################
729 686
730package CFPlus::UI::Container; 687package dc::UI::Container;
731 688
732our @ISA = CFPlus::UI::Base::; 689our @ISA = dc::UI::Base::;
733 690
734sub new { 691sub new {
735 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
736 693
737 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
… …
769 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
771 ]; 728 ];
772 729
773 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
774} 735}
775 736
776sub children { 737sub children {
777 @{ $_[0]{children} } 738 @{ $_[0]{children} }
778} 739}
779 740
780sub remove { 741sub remove {
781 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
782 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
783 delete $child->{parent}; 747 delete $child->{parent};
784 $child->hide; 748 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
787 751
788 $self->realloc; 752 $self->realloc;
789} 753}
790 754
791sub clear { 755sub clear {
792 my ($self) = @_; 756 my ($self) = @_;
793 757
794 my $children = delete $self->{children}; 758 my $children = $self->{children};
795 $self->{children} = []; 759 $self->{children} = [];
796 760
797 for (@$children) { 761 for (@$children) {
798 delete $_->{parent}; 762 delete $_->{parent};
799 $_->hide; 763 $_->hide;
… …
819} 783}
820 784
821sub _draw { 785sub _draw {
822 my ($self) = @_; 786 my ($self) = @_;
823 787
824 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
825} 789}
826 790
827############################################################################# 791#############################################################################
828 792
829package CFPlus::UI::Bin; 793package dc::UI::Bin;
830 794
831our @ISA = CFPlus::UI::Container::; 795our @ISA = dc::UI::Container::;
832 796
833sub new { 797sub new {
834 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
835 799
836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 800 my $child = (delete $arg{child}) || new dc::UI::Empty::;
837 801
838 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
839} 803}
840 804
841sub add { 805sub add {
842 my ($self, $child) = @_; 806 my ($self, $child) = @_;
843 807
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
845 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
846} 810}
847 811
848sub remove { 812sub remove {
849 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
850 814
851 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
852 816
853 $self->{children} = [new CFPlus::UI::Empty] 817 $self->{children} = [new dc::UI::Empty]
854 unless @{$self->{children}}; 818 unless @{$self->{children}};
855} 819}
856 820
857sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
858 822
… …
867 831
868 1 832 1
869} 833}
870 834
871############################################################################# 835#############################################################################
872
873# back-buffered drawing area 836# back-buffered drawing area
874 837
875package CFPlus::UI::Window; 838package dc::UI::Window;
876 839
877our @ISA = CFPlus::UI::Bin::; 840our @ISA = dc::UI::Bin::;
878 841
879use CFPlus::OpenGL; 842use dc::OpenGL;
880 843
881sub new { 844sub new {
882 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
883 846
884 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
… …
906} 869}
907 870
908sub render_child { 871sub render_child {
909 my ($self) = @_; 872 my ($self) = @_;
910 873
911 $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 {
912 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
913 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
914 877
915 { 878 {
916 package CFPlus::UI::Base; 879 package dc::UI::Base;
917 880
918 local ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
919 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
920 883
921 $self->_render; 884 $self->_render;
… …
938 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
939} 902}
940 903
941############################################################################# 904#############################################################################
942 905
943package CFPlus::UI::ViewPort; 906package dc::UI::ViewPort;
944 907
945use List::Util qw(min max); 908use List::Util qw(min max);
946 909
947our @ISA = CFPlus::UI::Window::; 910our @ISA = dc::UI::Window::;
948 911
949sub new { 912sub new {
950 my $class = shift; 913 my $class = shift;
951 914
952 $class->SUPER::new ( 915 $class->SUPER::new (
… …
994 $self->emit (changed => $x, $y); 957 $self->emit (changed => $x, $y);
995 $self->update; 958 $self->update;
996 } 959 }
997} 960}
998 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
999# 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
1000sub coord2local { 981sub coord2local {
1001 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
1002 983
1003 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 984 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1020 ) { 1001 ) {
1021 $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})
1022 } else { 1003 } else {
1023 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->dc::UI::Base::find_widget ($x, $y)
1024 } 1005 }
1025} 1006}
1026 1007
1027sub _render { 1008sub _render {
1028 my ($self) = @_; 1009 my ($self) = @_;
1029 1010
1030 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};
1031 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};
1032 1013
1033 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1034 1015
1035 $self->SUPER::_render; 1016 $self->SUPER::_render;
1036} 1017}
1037 1018
1038############################################################################# 1019#############################################################################
1039 1020
1040package CFPlus::UI::ScrolledWindow; 1021package dc::UI::ScrolledWindow;
1041 1022
1042our @ISA = CFPlus::UI::Table::; 1023our @ISA = dc::UI::Table::;
1043 1024
1044sub new { 1025sub new {
1045 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1046 1027
1047 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1048 1029
1049 my $self; 1030 my $self;
1050 1031
1051 my $hslider = new CFPlus::UI::Slider 1032 my $hslider = new dc::UI::Slider
1052 col => 0, 1033 c_col => 0,
1053 row => 1, 1034 c_row => 1,
1054 vertical => 0, 1035 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1036 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1037 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1038 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1040 },
1060 ; 1041 ;
1061 1042
1062 my $vslider = new CFPlus::UI::Slider 1043 my $vslider = new dc::UI::Slider
1063 col => 1, 1044 c_col => 1,
1064 row => 0, 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
1085 col => 0, 1066 c_col => 0,
1086 row => 0, 1067 c_row => 0,
1087 expand => 1, 1068 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1069 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1070 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1071 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1072 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1074 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1075 $vp->{parent}{vslider}->set_value ($y);
1095 1076
1096 0 1077 0
1097 }, 1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1098 ; 1084 ;
1099 1085
1100 $self->SUPER::add ($self->{vp}); 1086 $self->SUPER::add ($self->{vp});
1101 1087
1102 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1103 1089
1104 $self 1090 $self
1105} 1091}
1106
1107#TODO# update range on size_allocate depending on child?
1108 1092
1109sub add { 1093sub add {
1110 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1111 1095
1112 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1113} 1097}
1114 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1115sub update_slider { 1103sub update_slider {
1116 my ($self) = @_; 1104 my ($self) = @_;
1117 1105
1118 my $child = ($self->{vp} or return)->child; 1106 my $child = ($self->{vp} or return)->child;
1119 1107
1108 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $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]);
1122 1111
1123 my $visible = $w1 > $w2; 1112 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) { 1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1115 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1127 } 1118 }
1128 1119
1120 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $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]);
1131 1123
1132 my $visible = $h1 > $h2; 1124 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) { 1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1127 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 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);
1136 } 1148 };
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144} 1149}
1145 1150
1146sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1148 1153
1149 $self->{vslider}->emit (mouse_wheel => $ev) 1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev) 1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153 if $ev->{dx};
1154 1156
1155 1 1157 1
1156} 1158}
1157 1159
1158sub invoke_button_down { 1160sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1160 1162
1161 if ($ev->{button} == 2) { 1163 if ($ev->{button} == 2) {
1162 $self->grab_focus; 1164 $self->start_dragging ($ev);
1163
1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1169
1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1173
1174 return 1; 1165 return 1;
1175 } 1166 }
1176 1167
1177 0 1168 0
1178} 1169}
… …
1205 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1206} 1197}
1207 1198
1208############################################################################# 1199#############################################################################
1209 1200
1210package CFPlus::UI::Frame; 1201package dc::UI::Frame;
1211 1202
1212our @ISA = CFPlus::UI::Bin::; 1203our @ISA = dc::UI::Bin::;
1213 1204
1214use CFPlus::OpenGL; 1205use dc::OpenGL;
1215 1206
1216sub new { 1207sub new {
1217 my $class = shift; 1208 my $class = shift;
1218 1209
1219 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1229 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1230 1221
1231 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1232 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1233 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1234
1235 glBegin GL_QUADS;
1236 glVertex 0 , 0;
1237 glVertex 0 , $h;
1238 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1239 glVertex $w, 0;
1240 glEnd;
1241
1242 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1243 } 1227 }
1244 1228
1245 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1246} 1230}
1247 1231
1248############################################################################# 1232#############################################################################
1249 1233
1250package CFPlus::UI::FancyFrame; 1234package dc::UI::FancyFrame;
1251 1235
1252our @ISA = CFPlus::UI::Bin::; 1236our @ISA = dc::UI::Bin::;
1253 1237
1254use CFPlus::OpenGL; 1238use dc::OpenGL;
1255 1239
1256sub new { 1240sub new {
1257 my ($class, %arg) = @_; 1241 my ($class, %arg) = @_;
1258 1242
1259 if ((exists $arg{label}) && !ref $arg{label}) { 1243 if ((exists $arg{label}) && !ref $arg{label}) {
1260 $arg{label} = new CFPlus::UI::Label 1244 $arg{label} = new dc::UI::Label
1261 align => 1, 1245 align => 1,
1262 valign => 0, 1246 valign => 0,
1263 text => $arg{label}, 1247 text => $arg{label},
1264 fontsize => ($arg{border} || 0.8) * 0.75; 1248 fontsize => ($arg{border} || 0.8) * 0.75;
1265 } 1249 }
… …
1277 1261
1278sub add { 1262sub add {
1279 my ($self, @widgets) = @_; 1263 my ($self, @widgets) = @_;
1280 1264
1281 $self->SUPER::add (@widgets); 1265 $self->SUPER::add (@widgets);
1282 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1266 $self->dc::UI::Container::add ($self->{label}) if $self->{label};
1283} 1267}
1284 1268
1285sub border { 1269sub border {
1286 int $_[0]{border} * $::FONTSIZE 1270 int $_[0]{border} * $::FONTSIZE
1287} 1271}
… …
1345 } 1329 }
1346} 1330}
1347 1331
1348############################################################################# 1332#############################################################################
1349 1333
1350package CFPlus::UI::Toplevel; 1334package dc::UI::Toplevel;
1351 1335
1352our @ISA = CFPlus::UI::Bin::; 1336our @ISA = dc::UI::Bin::;
1353 1337
1354use CFPlus::OpenGL; 1338use dc::OpenGL;
1355 1339
1356my $bg = 1340my $bg =
1357 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1358 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1359 1343
1360my @border = 1344my @border =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1362 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);
1363 1347
1364my @icon = 1348my @icon =
1365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1349 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1366 qw(x1_move.png x1_resize.png); 1350 qw(x1_move.png x1_resize.png);
1367 1351
1368sub new { 1352sub new {
1369 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1370 1354
… …
1376 min_w => 64, 1360 min_w => 64,
1377 min_h => 32, 1361 min_h => 32,
1378 %arg, 1362 %arg,
1379 ); 1363 );
1380 1364
1381 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new dc::UI::Label
1382 align => 0, 1366 align => 0,
1383 valign => 1, 1367 valign => 1,
1384 text => $self->{title}, 1368 text => $self->{title},
1385 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1386 if exists $self->{title}; 1370 if exists $self->{title};
1387 1371
1388 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1389 $self->{close_button} = 1373 $self->{close_button} =
1390 new CFPlus::UI::ImageButton 1374 new dc::UI::ImageButton
1391 path => 'x1_close.png', 1375 path => 'x1_close.png',
1392 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1393 1377
1394 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->dc::UI::Container::add ($self->{close_button});
1395 } 1379 }
1396 1380
1397 $self 1381 $self
1398} 1382}
1399 1383
1400sub add { 1384sub add {
1401 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1402 1386
1403 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1404 $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};
1405 $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};
1406} 1390}
1407 1391
1408sub border { 1392sub border {
1409 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
1410} 1403}
1411 1404
1412sub size_request { 1405sub size_request {
1413 my ($self) = @_; 1406 my ($self) = @_;
1414 1407
… …
1586 if $self->{close_button}; 1579 if $self->{close_button};
1587} 1580}
1588 1581
1589############################################################################# 1582#############################################################################
1590 1583
1591package CFPlus::UI::Table; 1584package dc::UI::Table;
1592 1585
1593our @ISA = CFPlus::UI::Container::; 1586our @ISA = dc::UI::Container::;
1594 1587
1595use List::Util qw(max sum); 1588use List::Util qw(max sum);
1596 1589
1597use CFPlus::OpenGL; 1590use dc::OpenGL;
1598 1591
1599sub new { 1592sub new {
1600 my $class = shift; 1593 my $class = shift;
1601 1594
1602 $class->SUPER::new ( 1595 $class->SUPER::new (
… …
1608 1601
1609sub add { 1602sub add {
1610 my ($self, @widgets) = @_; 1603 my ($self, @widgets) = @_;
1611 1604
1612 for my $child (@widgets) { 1605 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1; 1606 $child->{c_rowspan} ||= 1;
1614 $child->{colspan} ||= 1; 1607 $child->{c_colspan} ||= 1;
1615 } 1608 }
1616 1609
1617 $self->SUPER::add (@widgets); 1610 $self->SUPER::add (@widgets);
1618} 1611}
1619 1612
… …
1623 my @widgets; 1616 my @widgets;
1624 1617
1625 while (@_) { 1618 while (@_) {
1626 my ($col, $row, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1627 1620
1628 $child->{row} = $row; 1621 $child->{c_row} = $row;
1629 $child->{col} = $col; 1622 $child->{c_col} = $col;
1630 1623
1631 push @widgets, $child; 1624 push @widgets, $child;
1632 } 1625 }
1633 1626
1634 $self->add (@widgets); 1627 $self->add (@widgets);
… …
1640 my (@w, @h); 1633 my (@w, @h);
1641 1634
1642 my @children = $self->children; 1635 my @children = $self->children;
1643 1636
1644 # first pass, columns 1637 # first pass, columns
1645 for my $widget (sort { $b->{colspan} <=> $a->{colspan} } @children) { 1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1647 1640
1648 my $sw = sum @w[$c .. $c + $cs - 1]; 1641 my $sw = sum @w[$c .. $c + $cs - 1];
1649 1642
1650 if ($w > $sw) { 1643 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; 1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 } 1645 }
1653 } 1646 }
1654 1647
1655 # second pass, rows 1648 # second pass, rows
1656 for my $widget (sort { $b->{rowspan} <=> $a->{rowspan} } @children) { 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1658 1651
1659 my $sh = sum @h[$r .. $r + $rs - 1]; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1660 1653
1661 if ($h > $sh) { 1654 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1663 } 1656 }
1664 } 1657 }
1665 1658
1666 (\@w, \@h) 1659 (\@w, \@h)
1667} 1660}
… …
1690 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1691 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1692 1685
1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1694 1687
1695 CFPlus::UI::harmonize $ws; 1688 dc::UI::harmonize $ws;
1696 1689
1697 my @row_expand = @{$self->{row_expand}}; 1690 my @row_expand = @{$self->{row_expand}};
1698 @row_expand = (1) x @$ws unless @row_expand; 1691 @row_expand = (1) x @$ws unless @row_expand;
1699 my $row_expand = (sum @row_expand) || 1; 1692 my $row_expand = (sum @row_expand) || 1;
1700 1693
1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1702 1695
1703 CFPlus::UI::harmonize $hs; 1696 dc::UI::harmonize $hs;
1704 1697
1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1707 1700
1708 for my $widget ($self->children) { 1701 for my $widget ($self->children) {
1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1710 1703
1711 $widget->configure ( 1704 $widget->configure (
1712 $x[$c], $y[$r], 1705 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1714 ); 1707 );
… …
1717 1 1710 1
1718} 1711}
1719 1712
1720############################################################################# 1713#############################################################################
1721 1714
1722package CFPlus::UI::Fixed; 1715package dc::UI::Fixed;
1723 1716
1724use List::Util qw(min max); 1717use List::Util qw(min max);
1725 1718
1726our @ISA = CFPlus::UI::Container::; 1719our @ISA = dc::UI::Container::;
1727
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734 1720
1735sub _scale($$$) { 1721sub _scale($$$) {
1736 my ($mode, $val, $max) = @_; 1722 my ($rel, $val, $max) = @_;
1737 1723
1738 $mode eq "abs" ? $val 1724 $rel ? $val * $max : $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741} 1725}
1742 1726
1743sub size_request { 1727sub size_request {
1744 my ($self) = @_; 1728 my ($self) = @_;
1745 1729
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747 1731
1748 # determine overall size by querying abs widgets 1732 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) { 1733 for my $child ($self->visible_children) {
1750 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};
1751 1737
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1758 } 1740 }
1759 } 1741 }
1760 1742
1761 my $W = $x2 - $x1; 1743 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1; 1744 my $H = $y2 - $y1;
1763 1745
1764 # now layout remaining widgets 1746 # now layout remaining widgets
1765 for my $child ($self->visible_children) { 1747 for my $child ($self->visible_children) {
1766 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;
1767 1751
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1776 } 1754 }
1777 } 1755 }
1778 1756
1779 my $W = $x2 - $x1; 1757 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1; 1758 my $H = $y2 - $y1;
… …
1784 1762
1785sub invoke_size_allocate { 1763sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_; 1764 my ($self, $W, $H) = @_;
1787 1765
1788 for my $child ($self->visible_children) { 1766 for my $child ($self->visible_children) {
1789 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;
1790 1769
1791 $x = _scale $pos, $x, $W; 1770 $x += $child->{c_halign} * $child->{req_w};
1792 $y = _scale $pos, $x, $H; 1771 $y += $child->{c_valign} * $child->{req_h};
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795 1772
1796 $child->configure ($x, $y, $w, $h); 1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1797 } 1774 }
1798 1775
1799 1 1776 1
1800} 1777}
1801 1778
1802############################################################################# 1779#############################################################################
1803 1780
1804package CFPlus::UI::Box; 1781package dc::UI::Box;
1805 1782
1806our @ISA = CFPlus::UI::Container::; 1783our @ISA = dc::UI::Container::;
1807 1784
1808sub size_request { 1785sub size_request {
1809 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1810 1789
1811 $self->{vertical} 1790 $self->{vertical}
1812 ? ( 1791 ? (
1813 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1814 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1815 ) 1794 )
1816 : ( 1795 : (
1817 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1818 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1819 ) 1798 )
1820} 1799}
1821 1800
1822sub invoke_size_allocate { 1801sub invoke_size_allocate {
1823 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1844 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1845 for 0 .. $#children; 1824 for 0 .. $#children;
1846 } 1825 }
1847 } 1826 }
1848 1827
1849 CFPlus::UI::harmonize \@req; 1828 dc::UI::harmonize \@req;
1850 1829
1851 my $pos = 0; 1830 my $pos = 0;
1852 for (0 .. $#children) { 1831 for (0 .. $#children) {
1853 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1854 $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));
… …
1859 1 1838 1
1860} 1839}
1861 1840
1862############################################################################# 1841#############################################################################
1863 1842
1864package CFPlus::UI::HBox; 1843package dc::UI::HBox;
1865 1844
1866our @ISA = CFPlus::UI::Box::; 1845our @ISA = dc::UI::Box::;
1867 1846
1868sub new { 1847sub new {
1869 my $class = shift; 1848 my $class = shift;
1870 1849
1871 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1874 ) 1853 )
1875} 1854}
1876 1855
1877############################################################################# 1856#############################################################################
1878 1857
1879package CFPlus::UI::VBox; 1858package dc::UI::VBox;
1880 1859
1881our @ISA = CFPlus::UI::Box::; 1860our @ISA = dc::UI::Box::;
1882 1861
1883sub new { 1862sub new {
1884 my $class = shift; 1863 my $class = shift;
1885 1864
1886 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1889 ) 1868 )
1890} 1869}
1891 1870
1892############################################################################# 1871#############################################################################
1893 1872
1894package CFPlus::UI::Label; 1873package dc::UI::Label;
1895 1874
1896our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = dc::UI::DrawBG::;
1897 1876
1898use CFPlus::OpenGL; 1877use dc::OpenGL;
1899 1878
1900sub new { 1879sub new {
1901 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1902 1881
1903 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1908 #text => initial text 1887 #text => initial text
1909 #markup => initial narkup 1888 #markup => initial narkup
1910 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1911 #style => 0, # render flags 1890 #style => 0, # render flags
1912 ellipsise => 3, # end 1891 ellipsise => 3, # end
1913 layout => (new CFPlus::Layout), 1892 layout => (new dc::Layout),
1914 fontsize => 1, 1893 fontsize => 1,
1915 align => -1, 1894 align => -1,
1916 valign => -1, 1895 valign => -1,
1917 padding_x => 2, 1896 padding_x => 2,
1918 padding_y => 2, 1897 padding_y => 2,
1919 can_events => 0, 1898 can_events => 0,
1920 %arg 1899 %arg
1921 ); 1900 );
1922 1901
1923 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1924 my $layout = new CFPlus::Layout; 1903 my $layout = new dc::Layout;
1925 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1926 $self->{template} = $layout; 1905 $self->{template} = $layout;
1927 } 1906 }
1928 1907
1929 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1947 1926
1948 delete $self->{ox}; 1927 delete $self->{ox};
1949 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1950} 1929}
1951 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1952sub set_text { 1937sub set_text {
1953 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1954 1939
1955 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1956 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
1979 1964
1980sub size_request { 1965sub size_request {
1981 my ($self) = @_; 1966 my ($self) = @_;
1982 1967
1983 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1984 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1985 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1986 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1987 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1988 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1989 1976
1990 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
2062 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
2063 2050
2064 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2065 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2066 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2067 }; 2056 };
2068 2057
2069 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
2070 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = dc::OpenGL::glGenList;
2071 2060# dc::OpenGL::glNewList $self->{list};
2072 $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;
2073} 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#}
2074 2077
2075############################################################################# 2078#############################################################################
2076 2079
2077package CFPlus::UI::EntryBase; 2080package dc::UI::EntryBase;
2078 2081
2079our @ISA = CFPlus::UI::Label::; 2082our @ISA = dc::UI::Label::;
2080 2083
2081use CFPlus::OpenGL; 2084use dc::OpenGL;
2082 2085
2083sub new { 2086sub new {
2084 my $class = shift; 2087 my $class = shift;
2085 2088
2086 $class->SUPER::new ( 2089 $class->SUPER::new (
2087 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
2088 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
2089 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
2090 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
2091 can_hover => 1, 2096 can_hover => 1,
2092 can_focus => 1, 2097 can_focus => 1,
2093 valign => 0, 2098 valign => 0,
2094 can_events => 1, 2099 can_events => 1,
2095 ellipsise => 0, 2100 ellipsise => 0,
… …
2151 2156
2152 if ($uni == 8) { 2157 if ($uni == 8) {
2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2154 } elsif ($uni == 127) { 2159 } elsif ($uni == 127) {
2155 substr $text, $self->{cursor}, 1, ""; 2160 substr $text, $self->{cursor}, 1, "";
2156 } elsif ($sym == CFPlus::SDLK_LEFT) { 2161 } elsif ($sym == dc::SDLK_LEFT) {
2157 --$self->{cursor} if $self->{cursor}; 2162 --$self->{cursor} if $self->{cursor};
2158 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2163 } elsif ($sym == dc::SDLK_RIGHT) {
2159 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2164 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2160 } elsif ($sym == CFPlus::SDLK_HOME) { 2165 } elsif ($sym == dc::SDLK_HOME) {
2161 # what a hack 2166 # what a hack
2162 $self->{cursor} = 2167 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1 2169 ? length $1
2165 : 0; 2170 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) { 2171 } elsif ($sym == dc::SDLK_END) {
2167 # uh, again 2172 # uh, again
2168 $self->{cursor} = 2173 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1 2175 ? $self->{cursor} + length $1
2171 : length $self->{text}; 2176 : length $self->{text};
… …
2235 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
2236 } 2241 }
2237 2242
2238 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2240 glBegin GL_QUADS;
2241 glVertex 0 , 0;
2242 glVertex 0 , $self->{h};
2243 glVertex $self->{w}, $self->{h}; 2245 glRect 0, 0, $self->{w}, $self->{h};
2244 glVertex $self->{w}, 0;
2245 glEnd;
2246 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
2247 2247
2248 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
2249 2249
2250 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
… …
2252 2252
2253 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2254 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2255 utf8::encode $text; 2255 utf8::encode $text;
2256 2256
2257 @$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);
2258 } 2258 }
2259 2259
2260 glColor_premultiply @{$self->{active_fg}};
2260 glBegin GL_LINES; 2261 glBegin GL_LINES;
2261 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};
2262 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};
2263 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;
2264 } 2279 }
2265} 2280}
2266 2281
2267############################################################################# 2282#############################################################################
2268 2283
2269package CFPlus::UI::Entry; 2284package dc::UI::Entry;
2270 2285
2271our @ISA = CFPlus::UI::EntryBase::; 2286our @ISA = dc::UI::EntryBase::;
2272 2287
2273use CFPlus::OpenGL; 2288use dc::OpenGL;
2274 2289
2275sub invoke_key_down { 2290sub invoke_key_down {
2276 my ($self, $ev) = @_; 2291 my ($self, $ev) = @_;
2277 2292
2278 my $sym = $ev->{sym}; 2293 my $sym = $ev->{sym};
… …
2284 $self->{history_pointer} = -1; 2299 $self->{history_pointer} = -1;
2285 $self->{history_saveback} = ''; 2300 $self->{history_saveback} = '';
2286 $self->emit (activate => $txt); 2301 $self->emit (activate => $txt);
2287 $self->update; 2302 $self->update;
2288 2303
2289 } elsif ($sym == CFPlus::SDLK_UP) { 2304 } elsif ($sym == dc::SDLK_UP) {
2290 if ($self->{history_pointer} < 0) { 2305 if ($self->{history_pointer} < 0) {
2291 $self->{history_saveback} = $self->get_text; 2306 $self->{history_saveback} = $self->get_text;
2292 } 2307 }
2293 if (@{$self->{history} || []} > 0) { 2308 if (@{$self->{history} || []} > 0) {
2294 $self->{history_pointer}++; 2309 $self->{history_pointer}++;
… …
2296 $self->{history_pointer} = @{$self->{history} || []} - 1; 2311 $self->{history_pointer} = @{$self->{history} || []} - 1;
2297 } 2312 }
2298 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2299 } 2314 }
2300 2315
2301 } elsif ($sym == CFPlus::SDLK_DOWN) { 2316 } elsif ($sym == dc::SDLK_DOWN) {
2302 $self->{history_pointer}--; 2317 $self->{history_pointer}--;
2303 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2304 2319
2305 if ($self->{history_pointer} >= 0) { 2320 if ($self->{history_pointer} >= 0) {
2306 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2321 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2315 1 2330 1
2316} 2331}
2317 2332
2318############################################################################# 2333#############################################################################
2319 2334
2320package CFPlus::UI::TextEdit; 2335package dc::UI::TextEdit;
2321 2336
2322our @ISA = CFPlus::UI::EntryBase::; 2337our @ISA = dc::UI::EntryBase::;
2323 2338
2324use CFPlus::OpenGL; 2339use dc::OpenGL;
2325 2340
2326sub move_cursor_ver { 2341sub move_cursor_ver {
2327 my ($self, $dy) = @_; 2342 my ($self, $dy) = @_;
2328 2343
2329 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
… …
2341sub invoke_key_down { 2356sub invoke_key_down {
2342 my ($self, $ev) = @_; 2357 my ($self, $ev) = @_;
2343 2358
2344 my $sym = $ev->{sym}; 2359 my $sym = $ev->{sym};
2345 2360
2346 if ($sym == CFPlus::SDLK_UP) { 2361 if ($sym == dc::SDLK_UP) {
2347 $self->move_cursor_ver (-1); 2362 $self->move_cursor_ver (-1);
2348 } elsif ($sym == CFPlus::SDLK_DOWN) { 2363 } elsif ($sym == dc::SDLK_DOWN) {
2349 $self->move_cursor_ver (+1); 2364 $self->move_cursor_ver (+1);
2350 } else { 2365 } else {
2351 return $self->SUPER::invoke_key_down ($ev) 2366 return $self->SUPER::invoke_key_down ($ev)
2352 } 2367 }
2353 2368
2354 1 2369 1
2355} 2370}
2356 2371
2357############################################################################# 2372#############################################################################
2358 2373
2359package CFPlus::UI::Button; 2374package dc::UI::ButtonBin;
2360 2375
2361our @ISA = CFPlus::UI::Label::; 2376our @ISA = dc::UI::Bin::;
2362 2377
2363use CFPlus::OpenGL; 2378use dc::OpenGL;
2364 2379
2365my @tex = 2380my @tex =
2366 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 }
2367 qw(b1_button_inactive.png b1_button_active.png); 2431 qw(b1_button_inactive.png b1_button_active.png);
2368 2432
2369sub new { 2433sub new {
2370 my $class = shift; 2434 my $class = shift;
2371 2435
… …
2409 $self->SUPER::_draw; 2473 $self->SUPER::_draw;
2410} 2474}
2411 2475
2412############################################################################# 2476#############################################################################
2413 2477
2414package CFPlus::UI::CheckBox; 2478package dc::UI::CheckBox;
2415 2479
2416our @ISA = CFPlus::UI::DrawBG::; 2480our @ISA = dc::UI::DrawBG::;
2417 2481
2418my @tex = 2482my @tex =
2419 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2483 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2420 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2484 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2421 2485
2422use CFPlus::OpenGL; 2486use dc::OpenGL;
2423 2487
2424sub new { 2488sub new {
2425 my $class = shift; 2489 my $class = shift;
2426 2490
2427 $class->SUPER::new ( 2491 $class->SUPER::new (
… …
2467sub _draw { 2531sub _draw {
2468 my ($self) = @_; 2532 my ($self) = @_;
2469 2533
2470 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2471 2535
2472 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2473 2537
2474 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2475 2539
2476 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;
2477 2541
… …
2484 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2485} 2549}
2486 2550
2487############################################################################# 2551#############################################################################
2488 2552
2489package CFPlus::UI::Image; 2553package dc::UI::Image;
2490 2554
2491our @ISA = CFPlus::UI::Base::; 2555our @ISA = dc::UI::Base::;
2492 2556
2493use CFPlus::OpenGL; 2557use dc::OpenGL;
2494 2558
2495our %texture_cache; 2559our %texture_cache;
2496 2560
2497sub new { 2561sub new {
2498 my $class = shift; 2562 my $class = shift;
2499 2563
2500 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2501 can_events => 0, 2565 can_events => 0,
2566 scale => 1,
2502 @_, 2567 @_,
2503 ); 2568 );
2504 2569
2505 $self->{path} || $self->{tex} 2570 $self->{path} || $self->{tex}
2506 or Carp::croak "'path' or 'tex' attributes required"; 2571 or Carp::croak "'path' or 'tex' attributes required";
2507 2572
2508 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2573 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2509 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;
2510 2575
2511 CFPlus::weaken $texture_cache{$self->{path}}; 2576 dc::weaken $texture_cache{$self->{path}};
2512 2577
2513 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2514 2579
2515 $self 2580 $self
2516} 2581}
2517 2582
2518sub STORABLE_freeze { 2583sub STORABLE_freeze {
2519 my ($self, $cloning) = @_; 2584 my ($self, $cloning) = @_;
2520 2585
2521 $self->{path} 2586 $self->{path}
2522 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";
2523 2588
2524 $self->{path} 2589 $self->{path}
2525} 2590}
2526 2591
2527sub STORABLE_attach { 2592sub STORABLE_attach {
… …
2531} 2596}
2532 2597
2533sub size_request { 2598sub size_request {
2534 my ($self) = @_; 2599 my ($self) = @_;
2535 2600
2536 ($self->{tex}{w}, $self->{tex}{h}) 2601 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2537} 2602}
2538 2603
2539sub _draw { 2604sub _draw {
2540 my ($self) = @_; 2605 my ($self) = @_;
2541 2606
… …
2551 } 2616 }
2552 2617
2553 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2555 2620
2556 $tex->draw_quad (0, 0, $w, $h); 2621 $tex->draw_quad_alpha (0, 0, $w, $h);
2557 2622
2558 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2559} 2624}
2560 2625
2561############################################################################# 2626#############################################################################
2562 2627
2563package CFPlus::UI::ImageButton; 2628package dc::UI::ImageButton;
2564 2629
2565our @ISA = CFPlus::UI::Image::; 2630our @ISA = dc::UI::Image::;
2566 2631
2567use CFPlus::OpenGL; 2632use dc::OpenGL;
2568 2633
2569my %textures; 2634my %textures;
2570 2635
2571sub new { 2636sub new {
2572 my $class = shift; 2637 my $class = shift;
… …
2582 can_events => 1, 2647 can_events => 1,
2583 @_ 2648 @_
2584 ); 2649 );
2585} 2650}
2586 2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2656}
2657
2587sub invoke_button_up { 2658sub invoke_button_up {
2588 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2589 2660
2590 $self->emit ("activate") 2661 $self->emit ("activate")
2591 if $x >= 0 && $x < $self->{w} 2662 if $x >= 0 && $x < $self->{w}
… …
2594 1 2665 1
2595} 2666}
2596 2667
2597############################################################################# 2668#############################################################################
2598 2669
2599package CFPlus::UI::VGauge; 2670package dc::UI::VGauge;
2600 2671
2601our @ISA = CFPlus::UI::Base::; 2672our @ISA = dc::UI::Base::;
2602 2673
2603use List::Util qw(min max); 2674use List::Util qw(min max);
2604 2675
2605use CFPlus::OpenGL; 2676use dc::OpenGL;
2606 2677
2607my %tex = ( 2678my %tex = (
2608 food => [ 2679 food => [
2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2611 ], 2682 ],
2612 grace => [ 2683 grace => [
2613 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2614 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/
2615 ], 2686 ],
2616 hp => [ 2687 hp => [
2617 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2619 ], 2690 ],
2620 mana => [ 2691 mana => [
2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2622 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/
2623 ], 2694 ],
2624); 2695);
2625 2696
2626# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2729 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2730} 2801}
2731 2802
2732############################################################################# 2803#############################################################################
2733 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
2734package CFPlus::UI::Gauge; 2943package dc::UI::Gauge;
2735 2944
2736our @ISA = CFPlus::UI::VBox::; 2945our @ISA = dc::UI::VBox::;
2737 2946
2738sub new { 2947sub new {
2739 my ($class, %arg) = @_; 2948 my ($class, %arg) = @_;
2740 2949
2741 my $self = $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
… …
2743 can_hover => 1, 2952 can_hover => 1,
2744 can_events => 1, 2953 can_events => 1,
2745 %arg, 2954 %arg,
2746 ); 2955 );
2747 2956
2748 $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");
2749 $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);
2750 $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");
2751 2960
2752 $self 2961 $self
2753} 2962}
2754 2963
2755sub set_fontsize { 2964sub set_fontsize {
… …
2776 $self->{value}->set_text ($val); 2985 $self->{value}->set_text ($val);
2777} 2986}
2778 2987
2779############################################################################# 2988#############################################################################
2780 2989
2781package CFPlus::UI::Slider; 2990package dc::UI::Slider;
2782 2991
2783use strict; 2992use strict;
2784 2993
2785use CFPlus::OpenGL; 2994use dc::OpenGL;
2786 2995
2787our @ISA = CFPlus::UI::DrawBG::; 2996our @ISA = dc::UI::DrawBG::;
2788 2997
2789my @tex = 2998my @tex =
2790 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 2999 map { new_from_file dc::Texture dc::find_rcfile $_ }
2791 qw(s1_slider.png s1_slider_bg.png); 3000 qw(s1_slider.png s1_slider_bg.png);
2792 3001
2793sub new { 3002sub new {
2794 my $class = shift; 3003 my $class = shift;
2795 3004
… …
2863 3072
2864 $self->SUPER::invoke_button_down ($ev, $x, $y); 3073 $self->SUPER::invoke_button_down ($ev, $x, $y);
2865 3074
2866 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3075 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2867 3076
2868 $self->invoke_mouse_motion ($ev, $x, $y) 3077 $self->invoke_mouse_motion ($ev, $x, $y);
3078
3079 1
2869} 3080}
2870 3081
2871sub invoke_mouse_motion { 3082sub invoke_mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2873 3084
… …
2889sub invoke_mouse_wheel { 3100sub invoke_mouse_wheel {
2890 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2891 3102
2892 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2893 3104
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3105 my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
2895 3106
2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2897 3108
2898 ! ! $delta 3109 1
2899} 3110}
2900 3111
2901sub update { 3112sub update {
2902 my ($self) = @_; 3113 my ($self) = @_;
2903 3114
… …
2952 glDisable GL_TEXTURE_2D; 3163 glDisable GL_TEXTURE_2D;
2953} 3164}
2954 3165
2955############################################################################# 3166#############################################################################
2956 3167
2957package CFPlus::UI::ValSlider; 3168package dc::UI::ValSlider;
2958 3169
2959our @ISA = CFPlus::UI::HBox::; 3170our @ISA = dc::UI::HBox::;
2960 3171
2961sub new { 3172sub new {
2962 my ($class, %arg) = @_; 3173 my ($class, %arg) = @_;
2963 3174
2964 my $range = delete $arg{range}; 3175 my $range = delete $arg{range};
2965 3176
2966 my $self = $class->SUPER::new ( 3177 my $self = $class->SUPER::new (
2967 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3178 slider => (new dc::UI::Slider expand => 1, range => $range),
2968 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3179 entry => (new dc::UI::Label text => "", template => delete $arg{template}),
2969 to_value => sub { shift }, 3180 to_value => sub { shift },
2970 from_value => sub { shift }, 3181 from_value => sub { shift },
2971 %arg, 3182 %arg,
2972 ); 3183 );
2973 3184
… …
2993sub set_range { shift->{slider}->set_range (@_) } 3204sub set_range { shift->{slider}->set_range (@_) }
2994sub set_value { shift->{slider}->set_value (@_) } 3205sub set_value { shift->{slider}->set_value (@_) }
2995 3206
2996############################################################################# 3207#############################################################################
2997 3208
2998package CFPlus::UI::TextScroller; 3209package dc::UI::TextScroller;
2999 3210
3000our @ISA = CFPlus::UI::HBox::; 3211our @ISA = dc::UI::HBox::;
3001 3212
3002use CFPlus::OpenGL; 3213use dc::OpenGL;
3003 3214
3004sub new { 3215sub new {
3005 my $class = shift; 3216 my $class = shift;
3006 3217
3007 my $self = $class->SUPER::new ( 3218 my $self = $class->SUPER::new (
… …
3009 can_events => 1, 3220 can_events => 1,
3010 indent => 0, 3221 indent => 0,
3011 #font => default_font 3222 #font => default_font
3012 @_, 3223 @_,
3013 3224
3014 layout => (new CFPlus::Layout), 3225 layout => (new dc::Layout),
3015 par => [], 3226 par => [],
3016 max_par => 0, 3227 max_par => 0,
3017 height => 0, 3228 height => 0,
3018 children => [ 3229 children => [
3019 (new CFPlus::UI::Empty expand => 1), 3230 (new dc::UI::Empty expand => 1),
3020 (new CFPlus::UI::Slider vertical => 1), 3231 (new dc::UI::Slider vertical => 1),
3021 ], 3232 ],
3022 ); 3233 );
3023 3234
3024 $self->{children}[1]->connect (changed => sub { $self->update }); 3235 $self->{children}[1]->connect (changed => sub { $self->update });
3025 3236
… …
3034} 3245}
3035 3246
3036sub size_request { 3247sub size_request {
3037 my ($self) = @_; 3248 my ($self) = @_;
3038 3249
3039 my ($empty, $slider) = @{ $self->{children} }; 3250 my ($empty, $slider) = $self->visible_children;
3040 3251
3041 local $self->{children} = [$empty, $slider]; 3252 local $self->{children} = [$empty, $slider];
3042 $self->SUPER::size_request 3253 $self->SUPER::size_request
3043} 3254}
3044 3255
… …
3208 $ROOT->on_post_alloc ($self => sub { 3419 $ROOT->on_post_alloc ($self => sub {
3209 $self->force_uptodate; 3420 $self->force_uptodate;
3210 3421
3211 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3212 3423
3213 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3424 $self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
3214 glClearColor 0, 0, 0, 0; 3425 glClearColor 0, 0, 0, 0;
3215 glClear GL_COLOR_BUFFER_BIT; 3426 glClear GL_COLOR_BUFFER_BIT;
3216 3427
3217 package CFPlus::UI::Base; 3428 package dc::UI::Base;
3218 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3429 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3219 (0, 0, $self->{w}, $self->{h}); 3430 (0, 0, $self->{w}, $self->{h});
3220 3431
3221 my $top = int $self->{children}[1]{range}[0]; 3432 my $top = int $self->{children}[1]{range}[0];
3222 3433
… …
3233 3444
3234 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
3235 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
3236 3447
3237 $layout->render ($para->{indent}, $y - $y0); 3448 $layout->render ($para->{indent}, $y - $y0);
3449 $layout->draw;
3238 3450
3239 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
3240 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
3241 3453
3242 for (@w) { 3454 for (@w) {
… …
3280 $self->{children}[1]->draw; 3492 $self->{children}[1]->draw;
3281} 3493}
3282 3494
3283############################################################################# 3495#############################################################################
3284 3496
3285package CFPlus::UI::Animator; 3497package dc::UI::Animator;
3286 3498
3287use CFPlus::OpenGL; 3499use dc::OpenGL;
3288 3500
3289our @ISA = CFPlus::UI::Bin::; 3501our @ISA = dc::UI::Bin::;
3290 3502
3291sub moveto { 3503sub moveto {
3292 my ($self, $x, $y) = @_; 3504 my ($self, $x, $y) = @_;
3293 3505
3294 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3322 glPopMatrix; 3534 glPopMatrix;
3323} 3535}
3324 3536
3325############################################################################# 3537#############################################################################
3326 3538
3327package CFPlus::UI::Flopper; 3539package dc::UI::Flopper;
3328 3540
3329our @ISA = CFPlus::UI::Button::; 3541our @ISA = dc::UI::Button::;
3330 3542
3331sub new { 3543sub new {
3332 my $class = shift; 3544 my $class = shift;
3333 3545
3334 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
… …
3346 $self->{other}->toggle_visibility; 3558 $self->{other}->toggle_visibility;
3347} 3559}
3348 3560
3349############################################################################# 3561#############################################################################
3350 3562
3351package CFPlus::UI::Tooltip; 3563package dc::UI::Tooltip;
3352 3564
3353our @ISA = CFPlus::UI::Bin::; 3565our @ISA = dc::UI::Bin::;
3354 3566
3355use CFPlus::OpenGL; 3567use dc::OpenGL;
3356 3568
3357sub new { 3569sub new {
3358 my $class = shift; 3570 my $class = shift;
3359 3571
3360 $class->SUPER::new ( 3572 $class->SUPER::new (
… …
3364} 3576}
3365 3577
3366sub set_tooltip_from { 3578sub set_tooltip_from {
3367 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
3368 3580
3369 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3370 if $widget->{tooltip} =~ /^#(.*)$/;
3371
3372 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 =~ /^#(.*)$/;
3373 3586
3374 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
3375 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
3376 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3377 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
3378 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
3379 } 3592 }
3380 3593
3381 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
3382 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
3383 3596
3384 $self->add (new CFPlus::UI::Label 3597 $self->add (new dc::UI::Label
3385 markup => $tooltip, 3598 markup => $tip,
3386 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3387 fontsize => 0.8, 3600 fontsize => 0.8,
3388 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3389 ellipsise => 0, 3602 ellipsise => 0,
3390 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3428} 3641}
3429 3642
3430sub _draw { 3643sub _draw {
3431 my ($self) = @_; 3644 my ($self) = @_;
3432 3645
3433 glTranslate 0.375, 0.375;
3434
3435 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3436 3647
3437 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3438 glBegin GL_QUADS; 3649 glRect 0, 0, $w, $h;
3439 glVertex 0 , 0;
3440 glVertex 0 , $h;
3441 glVertex $w, $h;
3442 glVertex $w, 0;
3443 glEnd;
3444 3650
3445 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3446 glBegin GL_LINE_LOOP; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3447 glVertex 0 , 0;
3448 glVertex 0 , $h;
3449 glVertex $w, $h;
3450 glVertex $w, 0;
3451 glEnd;
3452 3653
3453 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3454 3655
3455 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3456} 3657}
3457 3658
3458############################################################################# 3659#############################################################################
3459 3660
3460package CFPlus::UI::Face; 3661package dc::UI::Face;
3461 3662
3462our @ISA = CFPlus::UI::DrawBG::; 3663our @ISA = dc::UI::DrawBG::;
3463 3664
3464use CFPlus::OpenGL; 3665use dc::OpenGL;
3465 3666
3466sub new { 3667sub new {
3467 my $class = shift; 3668 my $class = shift;
3468 3669
3469 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
… …
3473 can_events => 0, 3674 can_events => 0,
3474 @_, 3675 @_,
3475 ); 3676 );
3476 3677
3477 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3478 CFPlus::weaken (my $widget = $self); 3679 dc::weaken (my $widget = $self);
3479 3680
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3482 $self->{timer} = Event->timer (
3483 parked => 1,
3484 cb => sub {
3485 return unless $::CONN && $widget; 3683 return unless $::CONN;
3486 3684
3685 my $w = $widget
3686 or return;
3687
3487 ++$widget->{frame}; 3688 ++$w->{frame};
3488 $widget->update_face; 3689 $w->update_face;
3690
3691 # somehow, $widget can go away
3489 $widget->update; 3692 $w->update;
3490
3491 $widget->update_timer; 3693 $w->update_timer;
3492 },
3493 ); 3694 };
3494 3695
3495 $self->update_face; 3696 $self->update_face;
3496 $self->update_timer; 3697 $self->update_timer;
3497 } 3698 }
3498 3699
… …
3503 my ($self) = @_; 3704 my ($self) = @_;
3504 3705
3505 return unless $self->{timer}; 3706 return unless $self->{timer};
3506 3707
3507 if ($self->{visible}) { 3708 if ($self->{visible}) {
3508 $self->{timer}->at (
3509 $self->{anim_start}
3510 + $self->{animspeed}
3511 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3512 );
3513 $self->{timer}->start; 3709 $self->{timer}->start;
3514 } else { 3710 } else {
3515 $self->{timer}->stop; 3711 $self->{timer}->stop;
3516 } 3712 }
3517} 3713}
3518 3714
3519sub update_face { 3715sub update_face {
3520 my ($self) = @_; 3716 my ($self) = @_;
3521 3717
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
3532sub size_request {
3533 my ($self) = @_;
3534
3535 if ($::CONN) { 3718 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) { 3720 if ($anim && @$anim) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3539 } else { 3722 delete $self->{face_change_cb};
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3723
3541 $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 }
3542 }); 3728 }
3543 } 3729 }
3544 } 3730 }
3545 } 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 }
3546 3750
3547 ($self->{size_w} || 8, $self->{size_h} || 8) 3751 ($self->{size_w} || 8, $self->{size_h} || 8)
3548} 3752}
3549 3753
3550sub update { 3754sub update {
… …
3564} 3768}
3565 3769
3566sub _draw { 3770sub _draw {
3567 my ($self) = @_; 3771 my ($self) = @_;
3568 3772
3569 return unless $::CONN;
3570
3571 $self->SUPER::_draw; 3773 $self->SUPER::_draw;
3572 3774
3573 my $faceid = $::CONN->{faceid}[$self->{face}] 3775 if (my $tex = $self->{tex}) {
3574 or return;
3575
3576 my $tex = $::CONN->{texture}[$faceid];
3577
3578 if ($tex) {
3579 glEnable GL_TEXTURE_2D; 3776 glEnable GL_TEXTURE_2D;
3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3581 glColor 0, 0, 0, 1; 3778 glColor 0, 0, 0, 1;
3582 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3779 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3583 glDisable GL_TEXTURE_2D; 3780 glDisable GL_TEXTURE_2D;
… …
3593 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3594} 3791}
3595 3792
3596############################################################################# 3793#############################################################################
3597 3794
3598package CFPlus::UI::Buttonbar; 3795package dc::UI::Buttonbar;
3599 3796
3600our @ISA = CFPlus::UI::HBox::; 3797our @ISA = dc::UI::HBox::;
3601 3798
3602# TODO: should actually wrap buttons and other goodies. 3799# TODO: should actually wrap buttons and other goodies.
3603 3800
3604############################################################################# 3801#############################################################################
3605 3802
3606package CFPlus::UI::Menu; 3803package dc::UI::Menu;
3607 3804
3608our @ISA = CFPlus::UI::Toplevel::; 3805our @ISA = dc::UI::Toplevel::;
3609 3806
3610use CFPlus::OpenGL; 3807use dc::OpenGL;
3611 3808
3612sub new { 3809sub new {
3613 my $class = shift; 3810 my $class = shift;
3614 3811
3615 my $self = $class->SUPER::new ( 3812 my $self = $class->SUPER::new (
3616 items => [], 3813 items => [],
3617 z => 100, 3814 z => 100,
3618 @_, 3815 @_,
3619 ); 3816 );
3620 3817
3621 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3818 $self->add ($self->{vbox} = new dc::UI::VBox);
3622 3819
3623 for my $item (@{ $self->{items} }) { 3820 for my $item (@{ $self->{items} }) {
3624 my ($widget, $cb, $tooltip) = @$item; 3821 my ($widget, $cb, $tooltip) = @$item;
3625 3822
3626 # handle various types of items, only text for now 3823 # handle various types of items, only text for now
3627 if (!ref $widget) { 3824 if (!ref $widget) {
3628 if ($widget =~ /\t/) { 3825 if ($widget =~ /\t/) {
3629 my ($left, $right) = split /\t/, $widget, 2; 3826 my ($left, $right) = split /\t/, $widget, 2;
3630 3827
3631 $widget = new CFPlus::UI::HBox 3828 $widget = new dc::UI::HBox
3632 can_hover => 1, 3829 can_hover => 1,
3633 can_events => 1, 3830 can_events => 1,
3634 tooltip => $tooltip, 3831 tooltip => $tooltip,
3635 children => [ 3832 children => [
3636 (new CFPlus::UI::Label markup => $left, expand => 1), 3833 (new dc::UI::Label markup => $left, expand => 1),
3637 (new CFPlus::UI::Label markup => $right, align => +1), 3834 (new dc::UI::Label markup => $right, align => +1),
3638 ], 3835 ],
3639 ; 3836 ;
3640 3837
3641 } else { 3838 } else {
3642 $widget = new CFPlus::UI::Label 3839 $widget = new dc::UI::Label
3643 can_hover => 1, 3840 can_hover => 1,
3644 can_events => 1, 3841 can_events => 1,
3645 markup => $widget, 3842 markup => $widget,
3646 tooltip => $tooltip; 3843 tooltip => $tooltip;
3647 } 3844 }
… …
3695 1 3892 1
3696} 3893}
3697 3894
3698############################################################################# 3895#############################################################################
3699 3896
3700package CFPlus::UI::Multiplexer; 3897package dc::UI::Multiplexer;
3701 3898
3702our @ISA = CFPlus::UI::Container::; 3899our @ISA = dc::UI::Container::;
3703 3900
3704sub new { 3901sub new {
3705 my $class = shift; 3902 my $class = shift;
3706 3903
3707 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
… …
3768 $self->{current}->draw; 3965 $self->{current}->draw;
3769} 3966}
3770 3967
3771############################################################################# 3968#############################################################################
3772 3969
3773package CFPlus::UI::Notebook; 3970package dc::UI::Notebook;
3774 3971
3972use dc::OpenGL;
3973
3775our @ISA = CFPlus::UI::VBox::; 3974our @ISA = dc::UI::VBox::;
3776 3975
3777sub new { 3976sub new {
3778 my $class = shift; 3977 my $class = shift;
3779 3978
3780 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3781 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new dc::UI::Buttonbar),
3782 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new dc::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3783 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3784 @_, 3984 @_,
3785 ); 3985 );
3786 3986
3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3788 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3988 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3789 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
3790 $self 4024 $self
3791} 4025}
3792 4026
3793sub 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 {
3794 my ($self, $title, $widget, $tooltip) = @_; 4045 my ($self, $title, $widget, $tooltip) = @_;
3795 4046
3796 CFPlus::weaken $self; 4047 $title = [$title, $tooltip] unless ref $title;
4048 $widget->{c_tab} = $title;
3797 4049
3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3799 markup => $title,
3800 tooltip => $tooltip,
3801 on_activate => sub { $self->set_current_page ($widget) },
3802 );
3803
3804 $self->{multiplexer}->add ($widget); 4050 $self->add ($widget);
3805} 4051}
3806 4052
3807sub get_current_page { 4053sub get_current_page {
3808 my ($self) = @_; 4054 my ($self) = @_;
3809 4055
… …
3815 4061
3816 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3817 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
3818} 4064}
3819 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
3820############################################################################# 4086#############################################################################
3821 4087
3822package CFPlus::UI::Selector; 4088package dc::UI::Selector;
3823 4089
3824use utf8; 4090use utf8;
3825 4091
3826our @ISA = CFPlus::UI::Button::; 4092our @ISA = dc::UI::Button::;
3827 4093
3828sub new { 4094sub new {
3829 my $class = shift; 4095 my $class = shift;
3830 4096
3831 my $self = $class->SUPER::new ( 4097 my $self = $class->SUPER::new (
… …
3848 my ($value, $title, $tooltip) = @$_; 4114 my ($value, $title, $tooltip) = @$_;
3849 4115
3850 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3851 } 4117 }
3852 4118
3853 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4119 dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
3854} 4120}
3855 4121
3856sub _set_value { 4122sub _set_value {
3857 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3858 4124
3859 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3860 or return; 4127 or return;
3861 4128
3862 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3863 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3864 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3865} 4132}
3866 4133
3867sub set_value { 4134sub set_value {
3868 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3869 4136
… …
3871 4138
3872 $self->_set_value ($value); 4139 $self->_set_value ($value);
3873 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
3874} 4141}
3875 4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
4148}
4149
3876############################################################################# 4150#############################################################################
3877 4151
3878package CFPlus::UI::Statusbox; 4152package dc::UI::Statusbox;
3879 4153
3880our @ISA = CFPlus::UI::VBox::; 4154our @ISA = dc::UI::VBox::;
3881 4155
3882sub new { 4156sub new {
3883 my $class = shift; 4157 my $class = shift;
3884 4158
3885 my $self = $class->SUPER::new ( 4159 my $self = $class->SUPER::new (
3886 fontsize => 0.8, 4160 fontsize => 0.8,
3887 @_, 4161 @_,
3888 ); 4162 );
3889 4163
3890 CFPlus::weaken (my $this = $self); 4164 dc::weaken (my $this = $self);
3891 4165
3892 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3893 4167
3894 $self 4168 $self
3895} 4169}
3896 4170
3897sub reorder { 4171sub reorder {
3898 my ($self) = @_; 4172 my ($self) = @_;
3899 my $NOW = Time::HiRes::time; 4173 my $NOW = Time::HiRes::time;
3900 4174
3901 # freeze display when hovering over any label 4175 # freeze display when hovering over any label
3902 return if $CFPlus::UI::TOOLTIP->{owner} 4176 return if $dc::UI::TOOLTIP->{owner}
3903 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4177 && grep $dc::UI::TOOLTIP->{owner} == $_->{label},
3904 values %{ $self->{item} }; 4178 values %{ $self->{item} };
3905 4179
3906 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
3907 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3908 } 4182 }
4183
4184 $self->{timer}->set (1, 1);
3909 4185
3910 my @widgets; 4186 my @widgets;
3911 4187
3912 my @items = sort { 4188 my @items = sort {
3913 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3914 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3915 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3916
3917 $self->{timer}->interval (1);
3918 4192
3919 my $count = 10 + 1; 4193 my $count = 10 + 1;
3920 for my $item (@items) { 4194 for my $item (@items) {
3921 last unless --$count; 4195 last unless --$count;
3922 4196
… …
3929 for ($short) { 4203 for ($short) {
3930 s/^\s+//; 4204 s/^\s+//;
3931 s/\s+/ /g; 4205 s/\s+/ /g;
3932 } 4206 }
3933 4207
3934 new CFPlus::UI::Label 4208 new dc::UI::Label
3935 markup => $short, 4209 markup => $short,
3936 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
3937 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
3938 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
3939 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3946 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3947 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3948 $label->update; 4222 $label->update;
3949 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3950 if $diff < 1; 4224 if $diff < 1;
3951 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3952 } else { 4226 } else {
3953 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3954 } 4228 }
3955 4229
3956 push @widgets, $label; 4230 push @widgets, $label;
… …
4018 $self->SUPER::destroy; 4292 $self->SUPER::destroy;
4019} 4293}
4020 4294
4021############################################################################# 4295#############################################################################
4022 4296
4023package CFPlus::UI::Root; 4297package dc::UI::Root;
4024 4298
4025our @ISA = CFPlus::UI::Container::; 4299our @ISA = dc::UI::Container::;
4026 4300
4027use List::Util qw(min max); 4301use List::Util qw(min max);
4028 4302
4029use CFPlus::OpenGL; 4303use dc::OpenGL;
4030 4304
4031sub new { 4305sub new {
4032 my $class = shift; 4306 my $class = shift;
4033 4307
4034 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
4035 visible => 1, 4309 visible => 1,
4036 @_, 4310 @_,
4037 ); 4311 );
4038 4312
4039 CFPlus::weaken ($self->{root} = $self); 4313 dc::weaken ($self->{root} = $self);
4040 4314
4041 $self 4315 $self
4042} 4316}
4043 4317
4044sub size_request { 4318sub size_request {
… …
4092} 4366}
4093 4367
4094sub update { 4368sub update {
4095 my ($self) = @_; 4369 my ($self) = @_;
4096 4370
4097 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
4098} 4372}
4099 4373
4100sub add { 4374sub add {
4101 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
4102 4376
… …
4139 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
4140 $_->() 4414 $_->()
4141 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
4142 } 4416 }
4143 4417
4144 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
4145 my %queue; 4419 my %queue;
4146 my @queue; 4420 my @queue;
4147 my $widget; 4421 my $widget;
4148 4422
4149 outer: 4423 outer:
… …
4196 } 4470 }
4197 } 4471 }
4198 4472
4199 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
4200 } 4474 }
4201 }
4202 4475
4203 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
4204 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
4205 values %$size_alloc; 4478 values %$size_alloc;
4206 4479
4207 while () { 4480 while () {
4208 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
4209 4482
4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4211 4484
4212 $w = 0 if $w < 0;
4213 $h = 0 if $h < 0;
4214
4215 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
4217 4487
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220 4490
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223 4493
4224 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
4225 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
4226 4496
4227 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}) {
4228 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
4229 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
4230 4500
4231 $widget->{w} = $w; 4501 $widget->{w} = $w;
4232 $widget->{h} = $h; 4502 $widget->{h} = $h;
4233 4503
4234 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
4235 } 4506 }
4236 } 4507 }
4237 } 4508 }
4238 4509
4239 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
… …
4250 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4251 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
4252 glLoadIdentity; 4523 glLoadIdentity;
4253 4524
4254 { 4525 {
4255 package CFPlus::UI::Base; 4526 package dc::UI::Base;
4256 4527
4257 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4258 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
4259 4530
4260 $self->_draw; 4531 $self->_draw;
4261 } 4532 }
4262} 4533}
4263 4534
4264############################################################################# 4535#############################################################################
4265 4536
4266package CFPlus::UI; 4537package dc::UI;
4267 4538
4268$ROOT = new CFPlus::UI::Root; 4539$ROOT = new dc::UI::Root;
4269$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4540$TOOLTIP = new dc::UI::Tooltip z => 900;
4270 4541
42711 45421
4272 4543

Diff Legend

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