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.393 by root, Sat Jul 21 13:41:46 2007 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 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 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
369sub size_request { 387sub size_request {
370 require Carp; 388 require Carp;
371 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
372} 390}
373 391
379 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
380 398
381 if ($self->{aspect}) { 399 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
383 401
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 404
387 # use alignment to adjust x, y 405 # use alignment to adjust x, y
388 406
389 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
431 449
432 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
433 451
434 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
435 453
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 457 }
440} 458}
441 459
442# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
443sub coord2local { 461sub coord2local {
444 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
445 463
446 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
447 465
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 467}
450 468
451# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
452sub coord2global { 470sub coord2global {
453 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
454 472
455 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
456 474
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 476}
459 477
460sub invoke_focus_in { 478sub invoke_focus_in {
509sub connect { 527sub connect {
510 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
511 529
512 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
513 531
514 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
517 } 535 }
518} 536}
519 537
557# in .xs 575# in .xs
558 576
559sub set_parent { 577sub set_parent {
560 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
561 579
562 CFPlus::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
564} 582}
565 583
566sub realloc { 584sub realloc {
567 my ($self) = @_; 585 my ($self) = @_;
593 611
594# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 613# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 615
598sub draw { 616#sub draw {
599 my ($self) = @_; 617#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 618
645sub _draw { 619sub _draw {
646 my ($self) = @_; 620 my ($self) = @_;
647 621
648 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
649} 623}
650 624
651my $cntx;#d#
652sub DESTROY { 625sub DESTROY {
653 my ($self) = @_; 626 my ($self) = @_;
654 627
655 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
656 629
630 local $@;
657 eval { $self->destroy }; 631 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 633
660 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
661} 635}
662 636
663############################################################################# 637#############################################################################
664 638
665package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
666 640
667our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
668 642
669use strict; 643use strict;
670use CFPlus::OpenGL; 644use DC::OpenGL;
671 645
672sub new { 646sub new {
673 my $class = shift; 647 my $class = shift;
674
675 # range [value, low, high, page]
676 648
677 $class->SUPER::new ( 649 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
680 @_ 652 @_
692 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
693 665
694 glEnable GL_BLEND; 666 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 668 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 670 glDisable GL_BLEND;
706 } 671 }
707} 672}
708 673
709############################################################################# 674#############################################################################
710 675
711package CFPlus::UI::Empty; 676package DC::UI::Empty;
712 677
713our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
714 679
715sub new { 680sub new {
716 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
717 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
718} 683}
725 690
726sub draw { } 691sub draw { }
727 692
728############################################################################# 693#############################################################################
729 694
730package CFPlus::UI::Container; 695package DC::UI::Container;
731 696
732our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
733 698
734sub new { 699sub new {
735 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
736 701
737 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
769 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
771 ]; 736 ];
772 737
773 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
774} 743}
775 744
776sub children { 745sub children {
777 @{ $_[0]{children} } 746 @{ $_[0]{children} }
778} 747}
779 748
780sub remove { 749sub remove {
781 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
782 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
783 delete $child->{parent}; 755 delete $child->{parent};
784 $child->hide; 756 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
787 759
788 $self->realloc; 760 $self->realloc;
789} 761}
790 762
791sub clear { 763sub clear {
792 my ($self) = @_; 764 my ($self) = @_;
793 765
794 my $children = delete $self->{children}; 766 my $children = $self->{children};
795 $self->{children} = []; 767 $self->{children} = [];
796 768
797 for (@$children) { 769 for (@$children) {
798 delete $_->{parent}; 770 delete $_->{parent};
799 $_->hide; 771 $_->hide;
819} 791}
820 792
821sub _draw { 793sub _draw {
822 my ($self) = @_; 794 my ($self) = @_;
823 795
824 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
825} 797}
826 798
827############################################################################# 799#############################################################################
828 800
829package CFPlus::UI::Bin; 801package DC::UI::Bin;
830 802
831our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
832 804
833sub new { 805sub new {
834 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
835 807
836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
837 809
838 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
839} 811}
840 812
841sub add { 813sub add {
842 my ($self, $child) = @_; 814 my ($self, $child) = @_;
843 815
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
845 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
846} 818}
847 819
848sub remove { 820sub remove {
849 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
850 822
851 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
852 824
853 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
854 unless @{$self->{children}}; 826 unless @{$self->{children}};
855} 827}
856 828
857sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
858 830
867 839
868 1 840 1
869} 841}
870 842
871############################################################################# 843#############################################################################
872
873# back-buffered drawing area 844# back-buffered drawing area
874 845
875package CFPlus::UI::Window; 846package DC::UI::Window;
876 847
877our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
878 849
879use CFPlus::OpenGL; 850use DC::OpenGL;
880 851
881sub new { 852sub new {
882 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
883 854
884 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
906} 877}
907 878
908sub render_child { 879sub render_child {
909 my ($self) = @_; 880 my ($self) = @_;
910 881
911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
912 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
913 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
914 885
915 { 886 {
916 package CFPlus::UI::Base; 887 package DC::UI::Base;
917 888
918 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
919 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
920 891
921 $self->_render; 892 $self->_render;
938 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
939} 910}
940 911
941############################################################################# 912#############################################################################
942 913
943package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
944 915
945use List::Util qw(min max); 916use List::Util qw(min max);
946 917
947our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
948 919
949sub new { 920sub new {
950 my $class = shift; 921 my $class = shift;
951 922
952 $class->SUPER::new ( 923 $class->SUPER::new (
994 $self->emit (changed => $x, $y); 965 $self->emit (changed => $x, $y);
995 $self->update; 966 $self->update;
996 } 967 }
997} 968}
998 969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
986}
987
999# hmm, this does not work for topleft of $self... but we should not ask for that 988# hmm, this does not work for topleft of $self... but we should not ask for that
1000sub coord2local { 989sub coord2local {
1001 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
1002 991
1003 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 992 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1020 ) { 1009 ) {
1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1022 } else { 1011 } else {
1023 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1024 } 1013 }
1025} 1014}
1026 1015
1027sub _render { 1016sub _render {
1028 my ($self) = @_; 1017 my ($self) = @_;
1029 1018
1030 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1019 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}; 1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1032 1021
1033 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1034 1023
1035 $self->SUPER::_render; 1024 $self->SUPER::_render;
1036} 1025}
1037 1026
1038############################################################################# 1027#############################################################################
1039 1028
1040package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1041 1030
1042our @ISA = CFPlus::UI::Table::; 1031our @ISA = DC::UI::Table::;
1043 1032
1044sub new { 1033sub new {
1045 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1046 1035
1047 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1048 1037
1049 my $self; 1038 my $self;
1050 1039
1051 my $hslider = new CFPlus::UI::Slider 1040 my $hslider = new DC::UI::Slider
1052 col => 0, 1041 c_col => 0,
1053 row => 1, 1042 c_row => 1,
1054 vertical => 0, 1043 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1045 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1046 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1048 },
1060 ; 1049 ;
1061 1050
1062 my $vslider = new CFPlus::UI::Slider 1051 my $vslider = new DC::UI::Slider
1063 col => 1, 1052 c_col => 1,
1064 row => 0, 1053 c_row => 0,
1065 vertical => 1, 1054 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1056 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1057 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1079 col_expand => [1, 0], 1068 col_expand => [1, 0],
1080 row_expand => [1, 0], 1069 row_expand => [1, 0],
1081 %arg, 1070 %arg,
1082 ); 1071 );
1083 1072
1084 $self->{vp} = new CFPlus::UI::ViewPort 1073 $self->{vp} = new DC::UI::ViewPort
1085 col => 0, 1074 c_col => 0,
1086 row => 0, 1075 c_row => 0,
1087 expand => 1, 1076 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1077 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1078 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1079 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1080 my ($vp, $x, $y) = @_;
1093 $vp->{parent}{hslider}->set_value ($x); 1082 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1083 $vp->{parent}{vslider}->set_value ($y);
1095 1084
1096 0 1085 0
1097 }, 1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1098 ; 1092 ;
1099 1093
1100 $self->SUPER::add ($self->{vp}); 1094 $self->SUPER::add ($self->{vp});
1101 1095
1102 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1103 1097
1104 $self 1098 $self
1105} 1099}
1106
1107#TODO# update range on size_allocate depending on child?
1108 1100
1109sub add { 1101sub add {
1110 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1111 1103
1112 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1113} 1105}
1114 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1115sub update_slider { 1111sub update_slider {
1116 my ($self) = @_; 1112 my ($self) = @_;
1117 1113
1118 my $child = ($self->{vp} or return)->child; 1114 my $child = ($self->{vp} or return)->child;
1119 1115
1116 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1119
1123 my $visible = $w1 > $w2; 1120 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) { 1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1123 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1127 } 1126 }
1128 1127
1128 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131 1131
1132 my $visible = $h1 > $h2; 1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) { 1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1135 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1136 } 1156 };
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144} 1157}
1145 1158
1146sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1148 1161
1149 $self->{vslider}->emit (mouse_wheel => $ev) 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev) 1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153 if $ev->{dx};
1154 1164
1155 1 1165 1
1156} 1166}
1157 1167
1158sub invoke_button_down { 1168sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1160 1170
1161 if ($ev->{button} == 2) { 1171 if ($ev->{button} == 2) {
1162 $self->grab_focus; 1172 $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; 1173 return 1;
1175 } 1174 }
1176 1175
1177 0 1176 0
1178} 1177}
1205 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1206} 1205}
1207 1206
1208############################################################################# 1207#############################################################################
1209 1208
1210package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1211 1210
1212our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1213 1212
1214use CFPlus::OpenGL; 1213use DC::OpenGL;
1215 1214
1216sub new { 1215sub new {
1217 my $class = shift; 1216 my $class = shift;
1218 1217
1219 $class->SUPER::new ( 1218 $class->SUPER::new (
1229 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1230 1229
1231 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1232 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1233 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1234
1235 glBegin GL_QUADS;
1236 glVertex 0 , 0;
1237 glVertex 0 , $h;
1238 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1239 glVertex $w, 0;
1240 glEnd;
1241
1242 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1243 } 1235 }
1244 1236
1245 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1246} 1238}
1247 1239
1248############################################################################# 1240#############################################################################
1249 1241
1250package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1251 1243
1252our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1253 1245
1254use CFPlus::OpenGL; 1246use DC::OpenGL;
1255 1247
1256sub new { 1248sub new {
1257 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1258 1250
1259 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1260 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1261 align => 1, 1253 align => 1,
1262 valign => 0, 1254 valign => 0.5,
1263 text => $arg{label}, 1255 text => $arg{label},
1264 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1265 } 1257 }
1266 1258
1267 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
1277 1269
1278sub add { 1270sub add {
1279 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1280 1272
1281 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1282 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1283} 1275}
1284 1276
1285sub border { 1277sub border {
1286 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1287} 1279}
1345 } 1337 }
1346} 1338}
1347 1339
1348############################################################################# 1340#############################################################################
1349 1341
1350package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1351 1343
1352our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1353 1345
1354use CFPlus::OpenGL; 1346use DC::OpenGL;
1355 1347
1356my $bg = 1348my $bg =
1357 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_resource DC::Texture "d1_bg.png",
1358 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1359 1351
1360my @border = 1352my @border =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_resource DC::Texture $_, mipmap => 1 }
1362 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1363 1355
1364my @icon = 1356my @icon =
1365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_resource DC::Texture $_, mipmap => 1 }
1366 qw(x1_move.png x1_resize.png); 1358 qw(x1_move.png x1_resize.png);
1367 1359
1368sub new { 1360sub new {
1369 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1370 1362
1371 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1372 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1373 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1374 border => 0.6, 1366 border => 1,
1375 can_events => 1, 1367 can_events => 1,
1376 min_w => 64, 1368 min_w => 64,
1377 min_h => 32, 1369 min_h => 32,
1378 %arg, 1370 %arg,
1379 ); 1371 );
1380 1372
1381 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1382 align => 0, 1374 align => 0.5,
1383 valign => 1, 1375 valign => 1,
1384 text => $self->{title}, 1376 text => $self->{title},
1385 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1386 if exists $self->{title}; 1378 if exists $self->{title};
1387 1379
1388 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1389 $self->{close_button} = 1381 $self->{close_button} =
1390 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1391 path => 'x1_close.png', 1383 path => 'x1_close.png',
1392 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1393 1385
1394 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1395 } 1387 }
1396 1388
1397 $self 1389 $self
1398} 1390}
1399 1391
1400sub add { 1392sub add {
1401 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1402 1394
1403 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1404 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $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}; 1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1406} 1398}
1407 1399
1408sub border { 1400sub border {
1409 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1410} 1411}
1411 1412
1412sub size_request { 1413sub size_request {
1413 my ($self) = @_; 1414 my ($self) = @_;
1414 1415
1586 if $self->{close_button}; 1587 if $self->{close_button};
1587} 1588}
1588 1589
1589############################################################################# 1590#############################################################################
1590 1591
1591package CFPlus::UI::Table; 1592package DC::UI::Table;
1592 1593
1593our @ISA = CFPlus::UI::Container::; 1594our @ISA = DC::UI::Container::;
1594 1595
1595use List::Util qw(max sum); 1596use List::Util qw(max sum);
1596 1597
1597use CFPlus::OpenGL; 1598use DC::OpenGL;
1598 1599
1599sub new { 1600sub new {
1600 my $class = shift; 1601 my $class = shift;
1601 1602
1602 $class->SUPER::new ( 1603 $class->SUPER::new (
1608 1609
1609sub add { 1610sub add {
1610 my ($self, @widgets) = @_; 1611 my ($self, @widgets) = @_;
1611 1612
1612 for my $child (@widgets) { 1613 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1; 1614 $child->{c_rowspan} ||= 1;
1614 $child->{colspan} ||= 1; 1615 $child->{c_colspan} ||= 1;
1615 } 1616 }
1616 1617
1617 $self->SUPER::add (@widgets); 1618 $self->SUPER::add (@widgets);
1618} 1619}
1619 1620
1623 my @widgets; 1624 my @widgets;
1624 1625
1625 while (@_) { 1626 while (@_) {
1626 my ($col, $row, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1627 1628
1628 $child->{row} = $row; 1629 $child->{c_row} = $row;
1629 $child->{col} = $col; 1630 $child->{c_col} = $col;
1630 1631
1631 push @widgets, $child; 1632 push @widgets, $child;
1632 } 1633 }
1633 1634
1634 $self->add (@widgets); 1635 $self->add (@widgets);
1640 my (@w, @h); 1641 my (@w, @h);
1641 1642
1642 my @children = $self->children; 1643 my @children = $self->children;
1643 1644
1644 # first pass, columns 1645 # first pass, columns
1645 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1647 1648
1648 my $sw = sum @w[$c .. $c + $cs - 1]; 1649 my $sw = sum @w[$c .. $c + $cs - 1];
1649 1650
1650 if ($w > $sw) { 1651 if ($w > $sw) {
1651 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 } 1653 }
1653 } 1654 }
1654 1655
1655 # second pass, rows 1656 # second pass, rows
1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1658 1659
1659 my $sh = sum @h[$r .. $r + $rs - 1]; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1660 1661
1661 if ($h > $sh) { 1662 if ($h > $sh) {
1662 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1663 } 1664 }
1664 } 1665 }
1665 1666
1666 (\@w, \@h) 1667 (\@w, \@h)
1667} 1668}
1690 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1691 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1692 1693
1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1694 1695
1695 CFPlus::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1696 1697
1697 my @row_expand = @{$self->{row_expand}}; 1698 my @row_expand = @{$self->{row_expand}};
1698 @row_expand = (1) x @$ws unless @row_expand; 1699 @row_expand = (1) x @$ws unless @row_expand;
1699 my $row_expand = (sum @row_expand) || 1; 1700 my $row_expand = (sum @row_expand) || 1;
1700 1701
1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1702 1703
1703 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1704 1705
1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1707 1708
1708 for my $widget ($self->children) { 1709 for my $widget ($self->children) {
1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1710 1711
1711 $widget->configure ( 1712 $widget->configure (
1712 $x[$c], $y[$r], 1713 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1714 ); 1715 );
1717 1 1718 1
1718} 1719}
1719 1720
1720############################################################################# 1721#############################################################################
1721 1722
1722package CFPlus::UI::Fixed; 1723package DC::UI::Fixed;
1723 1724
1724use List::Util qw(min max); 1725use List::Util qw(min max);
1725 1726
1726our @ISA = CFPlus::UI::Container::; 1727our @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 1728
1735sub _scale($$$) { 1729sub _scale($$$) {
1736 my ($mode, $val, $max) = @_; 1730 my ($rel, $val, $max) = @_;
1737 1731
1738 $mode eq "abs" ? $val 1732 $rel ? $val * $max : $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741} 1733}
1742 1734
1743sub size_request { 1735sub size_request {
1744 my ($self) = @_; 1736 my ($self) = @_;
1745 1737
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747 1739
1748 # determine overall size by querying abs widgets 1740 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) { 1741 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1751 1745
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; 1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1758 } 1748 }
1759 } 1749 }
1760 1750
1761 my $W = $x2 - $x1; 1751 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1; 1752 my $H = $y2 - $y1;
1763 1753
1764 # now layout remaining widgets 1754 # now layout remaining widgets
1765 for my $child ($self->visible_children) { 1755 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1767 1759
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; 1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1776 } 1762 }
1777 } 1763 }
1778 1764
1779 my $W = $x2 - $x1; 1765 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1; 1766 my $H = $y2 - $y1;
1784 1770
1785sub invoke_size_allocate { 1771sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_; 1772 my ($self, $W, $H) = @_;
1787 1773
1788 for my $child ($self->visible_children) { 1774 for my $child ($self->visible_children) {
1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1790 1777
1791 $x = _scale $pos, $x, $W; 1778 $x += $child->{c_halign} * $child->{req_w};
1792 $y = _scale $pos, $x, $H; 1779 $y += $child->{c_valign} * $child->{req_h};
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795 1780
1796 $child->configure ($x, $y, $w, $h); 1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1797 } 1782 }
1798 1783
1799 1 1784 1
1800} 1785}
1801 1786
1802############################################################################# 1787#############################################################################
1803 1788
1804package CFPlus::UI::Box; 1789package DC::UI::Box;
1805 1790
1806our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1807 1792
1808sub size_request { 1793sub size_request {
1809 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1810 1797
1811 $self->{vertical} 1798 $self->{vertical}
1812 ? ( 1799 ? (
1813 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1814 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1815 ) 1802 )
1816 : ( 1803 : (
1817 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1818 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1819 ) 1806 )
1820} 1807}
1821 1808
1822sub invoke_size_allocate { 1809sub invoke_size_allocate {
1823 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
1844 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1845 for 0 .. $#children; 1832 for 0 .. $#children;
1846 } 1833 }
1847 } 1834 }
1848 1835
1849 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1850 1837
1851 my $pos = 0; 1838 my $pos = 0;
1852 for (0 .. $#children) { 1839 for (0 .. $#children) {
1853 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1854 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1859 1 1846 1
1860} 1847}
1861 1848
1862############################################################################# 1849#############################################################################
1863 1850
1864package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1865 1852
1866our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1867 1854
1868sub new { 1855sub new {
1869 my $class = shift; 1856 my $class = shift;
1870 1857
1871 $class->SUPER::new ( 1858 $class->SUPER::new (
1874 ) 1861 )
1875} 1862}
1876 1863
1877############################################################################# 1864#############################################################################
1878 1865
1879package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1880 1867
1881our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1882 1869
1883sub new { 1870sub new {
1884 my $class = shift; 1871 my $class = shift;
1885 1872
1886 $class->SUPER::new ( 1873 $class->SUPER::new (
1889 ) 1876 )
1890} 1877}
1891 1878
1892############################################################################# 1879#############################################################################
1893 1880
1894package CFPlus::UI::Label; 1881package DC::UI::Label;
1895 1882
1896our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1897 1884
1898use CFPlus::OpenGL; 1885use DC::OpenGL;
1899 1886
1900sub new { 1887sub new {
1901 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1902 1889
1903 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
1908 #text => initial text 1895 #text => initial text
1909 #markup => initial narkup 1896 #markup => initial narkup
1910 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1911 #style => 0, # render flags 1898 #style => 0, # render flags
1912 ellipsise => 3, # end 1899 ellipsise => 3, # end
1913 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1914 fontsize => 1, 1901 fontsize => 1,
1915 align => -1, 1902 align => 0.5,
1916 valign => -1, 1903 valign => 0.5,
1917 padding_x => 2, 1904 padding_x => 4,
1918 padding_y => 2, 1905 padding_y => 2,
1919 can_events => 0, 1906 can_events => 0,
1920 %arg 1907 %arg
1921 ); 1908 );
1922 1909
1923 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1924 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1925 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1926 $self->{template} = $layout; 1913 $self->{template} = $layout;
1927 } 1914 }
1928 1915
1929 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
1947 1934
1948 delete $self->{ox}; 1935 delete $self->{ox};
1949 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1950} 1937}
1951 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1952sub set_text { 1945sub set_text {
1953 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1954 1947
1955 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1956 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1979 1972
1980sub size_request { 1973sub size_request {
1981 my ($self) = @_; 1974 my ($self) = @_;
1982 1975
1983 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1984 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1985 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1986 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1987 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1988 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1989 1984
1990 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1991 1986
1992 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1993 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1994 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1995 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1996 1991
1997 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1998 1993
1999 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
2055 2050
2056 [$self->{layout}->size] 2051 [$self->{layout}->size]
2057 }; 2052 };
2058 2053
2059 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
2060 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2061 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2062 : ($self->{w} - $size->[0]) * 0.5);
2063 2057
2064 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2066 : ($self->{h} - $size->[1]) * 0.5);
2067 }; 2059 };
2068 2060
2069 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
2070 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
2071 2063# DC::OpenGL::glNewList $self->{list};
2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
2069
2070 $self->{layout}->draw;
2073} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
2074 2080
2075############################################################################# 2081#############################################################################
2076 2082
2077package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
2078 2084
2079our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
2080 2086
2081use CFPlus::OpenGL; 2087use DC::OpenGL;
2082 2088
2083sub new { 2089sub new {
2084 my $class = shift; 2090 my $class = shift;
2085 2091
2086 $class->SUPER::new ( 2092 $class->SUPER::new (
2087 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
2088 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
2089 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
2090 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
2091 can_hover => 1, 2099 can_hover => 1,
2092 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
2093 valign => 0, 2102 valign => 0.5,
2094 can_events => 1, 2103 can_events => 1,
2095 ellipsise => 0, 2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
2096 #text => ... 2107 #text => ...
2097 #hidden => "*", 2108 #hidden => "*",
2098 @_ 2109 @_
2099 ) 2110 )
2100} 2111}
2147 2158
2148 my $text = $self->get_text; 2159 my $text = $self->get_text;
2149 2160
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2151 2162
2152 if ($uni == 8) { 2163 if ($sym == DC::SDLK_BACKSPACE) {
2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2154 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
2155 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
2156 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
2157 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
2158 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
2159 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2160 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2161 # what a hack 2172 # what a hack
2162 $self->{cursor} = 2173 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1 2175 ? length $1
2165 : 0; 2176 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
2167 # uh, again 2178 # uh, again
2168 $self->{cursor} = 2179 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1 2181 ? $self->{cursor} + length $1
2171 : length $self->{text}; 2182 : length $self->{text};
2235 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2236 } 2247 }
2237 2248
2238 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 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}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2244 glVertex $self->{w}, 0;
2245 glEnd;
2246 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2247 2253
2248 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2249 2255
2250 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
2252 2258
2253 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2254 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2255 utf8::encode $text; 2261 utf8::encode $text;
2256 2262
2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2258 } 2264 }
2259 2265
2266 glColor_premultiply @{$self->{active_fg}};
2260 glBegin GL_LINES; 2267 glBegin GL_LINES;
2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 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}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2263 glEnd; 2270 glEnd;
2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2264 } 2285 }
2265} 2286}
2266 2287
2267############################################################################# 2288#############################################################################
2268 2289
2269package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2270 2291
2271our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2272 2293
2273use CFPlus::OpenGL; 2294use DC::OpenGL;
2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
2274 2305
2275sub invoke_key_down { 2306sub invoke_key_down {
2276 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
2277 2308
2278 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
2284 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
2285 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
2286 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
2287 $self->update; 2318 $self->update;
2288 2319
2289 } elsif ($sym == CFPlus::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
2290 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
2291 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
2292 } 2323 }
2293 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
2294 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
2296 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
2297 } 2328 }
2298 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2299 } 2330 }
2300 2331
2301 } elsif ($sym == CFPlus::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
2302 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
2303 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2304 2335
2305 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2306 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2307 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2308 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2309 } 2343 }
2310 2344
2311 } else { 2345 } else {
2312 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2313 } 2347 }
2315 1 2349 1
2316} 2350}
2317 2351
2318############################################################################# 2352#############################################################################
2319 2353
2320package CFPlus::UI::TextEdit; 2354package DC::UI::TextEdit;
2321 2355
2322our @ISA = CFPlus::UI::EntryBase::; 2356our @ISA = DC::UI::EntryBase::;
2323 2357
2324use CFPlus::OpenGL; 2358use DC::OpenGL;
2359
2360sub new {
2361 my $class = shift;
2362
2363 $class->SUPER::new (
2364 padding_y => 4,
2365
2366 @_
2367 )
2368}
2325 2369
2326sub move_cursor_ver { 2370sub move_cursor_ver {
2327 my ($self, $dy) = @_; 2371 my ($self, $dy) = @_;
2328 2372
2329 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2330 2374
2331 $y += $dy; 2375 $line += $dy;
2332 2376
2333 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2334 $self->{cursor} = $index; 2378 $self->{cursor} = $index;
2335 delete $self->{cur_h}; 2379 delete $self->{cur_h};
2336 $self->update; 2380 $self->update;
2337 return; 2381 return;
2338 } 2382 }
2341sub invoke_key_down { 2385sub invoke_key_down {
2342 my ($self, $ev) = @_; 2386 my ($self, $ev) = @_;
2343 2387
2344 my $sym = $ev->{sym}; 2388 my $sym = $ev->{sym};
2345 2389
2346 if ($sym == CFPlus::SDLK_UP) { 2390 if ($sym == DC::SDLK_UP) {
2347 $self->move_cursor_ver (-1); 2391 $self->move_cursor_ver (-1);
2348 } elsif ($sym == CFPlus::SDLK_DOWN) { 2392 } elsif ($sym == DC::SDLK_DOWN) {
2349 $self->move_cursor_ver (+1); 2393 $self->move_cursor_ver (+1);
2350 } else { 2394 } else {
2351 return $self->SUPER::invoke_key_down ($ev) 2395 return $self->SUPER::invoke_key_down ($ev)
2352 } 2396 }
2353 2397
2354 1 2398 1
2355} 2399}
2356 2400
2357############################################################################# 2401#############################################################################
2358 2402
2359package CFPlus::UI::Button; 2403package DC::UI::ButtonBin;
2360 2404
2361our @ISA = CFPlus::UI::Label::; 2405our @ISA = DC::UI::Bin::;
2362 2406
2363use CFPlus::OpenGL; 2407use DC::OpenGL;
2364 2408
2365my @tex = 2409my @tex =
2366 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2410 map { new_from_resource DC::Texture $_, mipmap => 1 }
2367 qw(b1_button_inactive.png b1_button_active.png); 2411 qw(b1_button_inactive.png b1_button_active.png);
2368 2412
2369sub new { 2413sub new {
2370 my $class = shift; 2414 my $class = shift;
2371 2415
2372 $class->SUPER::new ( 2416 $class->SUPER::new (
2417 can_hover => 1,
2418 align => 0.5,
2419 valign => 0.5,
2420 can_events => 1,
2421 @_
2422 )
2423}
2424
2425sub invoke_button_up {
2426 my ($self, $ev, $x, $y) = @_;
2427
2428 $self->emit ("activate")
2429 if $x >= 0 && $x < $self->{w}
2430 && $y >= 0 && $y < $self->{h};
2431
2432 1
2433}
2434
2435sub _draw {
2436 my ($self) = @_;
2437
2438 glEnable GL_TEXTURE_2D;
2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2440 glColor 0, 0, 0, 1;
2441
2442 my $tex = $tex[$GRAB == $self];
2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2444
2445 glDisable GL_TEXTURE_2D;
2446
2447 $self->SUPER::_draw;
2448}
2449
2450#############################################################################
2451
2452package DC::UI::Button;
2453
2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
2457
2458my @tex =
2459 map { new_from_resource DC::Texture $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png);
2461
2462sub new {
2463 my $class = shift;
2464
2465 $class->SUPER::new (
2373 padding_x => 4, 2466 padding_x => 8,
2374 padding_y => 4, 2467 padding_y => 4,
2375 fg => [1.0, 1.0, 1.0], 2468 fg => [1.0, 1.0, 1.0],
2376 active_fg => [0.8, 0.8, 0.8], 2469 active_fg => [0.8, 0.8, 0.8],
2377 can_hover => 1, 2470 can_hover => 1,
2378 align => 0, 2471 align => 0.5,
2379 valign => 0, 2472 valign => 0.5,
2380 can_events => 1, 2473 can_events => 1,
2381 @_ 2474 @_
2382 ) 2475 )
2383} 2476}
2384 2477
2409 $self->SUPER::_draw; 2502 $self->SUPER::_draw;
2410} 2503}
2411 2504
2412############################################################################# 2505#############################################################################
2413 2506
2414package CFPlus::UI::CheckBox; 2507package DC::UI::CheckBox;
2415 2508
2416our @ISA = CFPlus::UI::DrawBG::; 2509our @ISA = DC::UI::DrawBG::;
2417 2510
2418my @tex = 2511my @tex =
2419 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2512 map { new_from_resource DC::Texture $_, mipmap => 1 }
2420 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2421 2514
2422use CFPlus::OpenGL; 2515use DC::OpenGL;
2423 2516
2424sub new { 2517sub new {
2425 my $class = shift; 2518 my $class = shift;
2426 2519
2427 $class->SUPER::new ( 2520 $class->SUPER::new (
2467sub _draw { 2560sub _draw {
2468 my ($self) = @_; 2561 my ($self) = @_;
2469 2562
2470 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2471 2564
2472 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2473 2566
2474 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2475 2568
2476 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2477 2570
2484 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2485} 2578}
2486 2579
2487############################################################################# 2580#############################################################################
2488 2581
2489package CFPlus::UI::Image; 2582package DC::UI::Image;
2490 2583
2491our @ISA = CFPlus::UI::Base::; 2584our @ISA = DC::UI::Base::;
2492 2585
2493use CFPlus::OpenGL; 2586use DC::OpenGL;
2494 2587
2495our %texture_cache; 2588our %texture_cache;
2496 2589
2497sub new { 2590sub new {
2498 my $class = shift; 2591 my $class = shift;
2499 2592
2500 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2501 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2502 @_, 2596 @_,
2503 ); 2597 );
2504 2598
2505 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2506 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2507 2601
2508 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2509 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2510 2604
2511 CFPlus::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2512 2606
2513 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2514 2608
2515 $self 2609 $self
2516} 2610}
2517 2611
2518sub STORABLE_freeze { 2612sub STORABLE_freeze {
2519 my ($self, $cloning) = @_; 2613 my ($self, $cloning) = @_;
2520 2614
2521 $self->{path} 2615 $self->{path}
2522 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2523 2617
2524 $self->{path} 2618 $self->{path}
2525} 2619}
2526 2620
2527sub STORABLE_attach { 2621sub STORABLE_attach {
2531} 2625}
2532 2626
2533sub size_request { 2627sub size_request {
2534 my ($self) = @_; 2628 my ($self) = @_;
2535 2629
2536 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2537} 2631}
2538 2632
2539sub _draw { 2633sub _draw {
2540 my ($self) = @_; 2634 my ($self) = @_;
2541 2635
2551 } 2645 }
2552 2646
2553 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2555 2649
2556 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
2557 2651
2558 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2559} 2653}
2560 2654
2561############################################################################# 2655#############################################################################
2562 2656
2563package CFPlus::UI::ImageButton; 2657package DC::UI::ImageButton;
2564 2658
2565our @ISA = CFPlus::UI::Image::; 2659our @ISA = DC::UI::Image::;
2566 2660
2567use CFPlus::OpenGL; 2661use DC::OpenGL;
2568 2662
2569my %textures; 2663my %textures;
2570 2664
2571sub new { 2665sub new {
2572 my $class = shift; 2666 my $class = shift;
2575 padding_x => 4, 2669 padding_x => 4,
2576 padding_y => 4, 2670 padding_y => 4,
2577 fg => [1, 1, 1], 2671 fg => [1, 1, 1],
2578 active_fg => [0, 0, 1], 2672 active_fg => [0, 0, 1],
2579 can_hover => 1, 2673 can_hover => 1,
2580 align => 0, 2674 align => 0.5,
2581 valign => 0, 2675 valign => 0.5,
2582 can_events => 1, 2676 can_events => 1,
2583 @_ 2677 @_
2584 ); 2678 );
2585} 2679}
2586 2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2587sub invoke_button_up { 2687sub invoke_button_up {
2588 my ($self, $ev, $x, $y) = @_; 2688 my ($self, $ev, $x, $y) = @_;
2589 2689
2590 $self->emit ("activate") 2690 $self->emit ("activate")
2591 if $x >= 0 && $x < $self->{w} 2691 if $x >= 0 && $x < $self->{w}
2594 1 2694 1
2595} 2695}
2596 2696
2597############################################################################# 2697#############################################################################
2598 2698
2599package CFPlus::UI::VGauge; 2699package DC::UI::VGauge;
2600 2700
2601our @ISA = CFPlus::UI::Base::; 2701our @ISA = DC::UI::Base::;
2602 2702
2603use List::Util qw(min max); 2703use List::Util qw(min max);
2604 2704
2605use CFPlus::OpenGL; 2705use DC::OpenGL;
2606 2706
2607my %tex = ( 2707my %tex = (
2608 food => [ 2708 food => [
2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
2610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2611 ], 2711 ],
2612 grace => [ 2712 grace => [
2613 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
2614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2615 ], 2715 ],
2616 hp => [ 2716 hp => [
2617 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2619 ], 2719 ],
2620 mana => [ 2720 mana => [
2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2623 ], 2723 ],
2624); 2724);
2625 2725
2626# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
2729 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2730} 2830}
2731 2831
2732############################################################################# 2832#############################################################################
2733 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
2734package CFPlus::UI::Gauge; 2972package DC::UI::Gauge;
2735 2973
2736our @ISA = CFPlus::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2737 2975
2738sub new { 2976sub new {
2739 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2740 2978
2741 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2743 can_hover => 1, 2981 can_hover => 1,
2744 can_events => 1, 2982 can_events => 1,
2745 %arg, 2983 %arg,
2746 ); 2984 );
2747 2985
2748 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2749 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $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"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2751 2989
2752 $self 2990 $self
2753} 2991}
2754 2992
2755sub set_fontsize { 2993sub set_fontsize {
2776 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2777} 3015}
2778 3016
2779############################################################################# 3017#############################################################################
2780 3018
2781package CFPlus::UI::Slider; 3019package DC::UI::Slider;
2782 3020
2783use strict; 3021use strict;
2784 3022
2785use CFPlus::OpenGL; 3023use DC::OpenGL;
2786 3024
2787our @ISA = CFPlus::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2788 3026
2789my @tex = 3027my @tex =
2790 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
2791 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2792 3030
2793sub new { 3031sub new {
2794 my $class = shift; 3032 my $class = shift;
2795 3033
2832sub set_value { 3070sub set_value {
2833 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2834 3072
2835 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2836 3074
2837 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2838 3076
2839 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2840
2841 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2842 $value = $hi - $page if $value > $hi - $page;
2843 3079
2844 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2845 if $unit; 3081 if $unit;
2846 3082
2847 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2863 3099
2864 $self->SUPER::invoke_button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2865 3101
2866 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2867 3103
2868 $self->invoke_mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
3105
3106 1
2869} 3107}
2870 3108
2871sub invoke_mouse_motion { 3109sub invoke_mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2873 3111
2889sub invoke_mouse_wheel { 3127sub invoke_mouse_wheel {
2890 my ($self, $ev) = @_; 3128 my ($self, $ev) = @_;
2891 3129
2892 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2893 3131
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2895 3133
2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2897 3135
2898 ! ! $delta 3136 1
2899} 3137}
2900 3138
2901sub update { 3139sub update {
2902 my ($self) = @_; 3140 my ($self) = @_;
2903 3141
2909 my ($self) = @_; 3147 my ($self) = @_;
2910 3148
2911 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2912 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2913 3151
2914 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2915 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2916 3154
2917 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3155 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2918 3156
2919 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3157 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2920 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2921 3159
2922 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
2952 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2953} 3191}
2954 3192
2955############################################################################# 3193#############################################################################
2956 3194
2957package CFPlus::UI::ValSlider; 3195package DC::UI::ValSlider;
2958 3196
2959our @ISA = CFPlus::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2960 3198
2961sub new { 3199sub new {
2962 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2963 3201
2964 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2965 3203
2966 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2967 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2968 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2969 to_value => sub { shift }, 3207 to_value => sub { shift },
2970 from_value => sub { shift }, 3208 from_value => sub { shift },
2971 %arg, 3209 %arg,
2972 ); 3210 );
2973 3211
2993sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2994sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2995 3233
2996############################################################################# 3234#############################################################################
2997 3235
2998package CFPlus::UI::TextScroller; 3236package DC::UI::TextScroller;
2999 3237
3000our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
3001 3239
3002use CFPlus::OpenGL; 3240use DC::OpenGL;
3003 3241
3004sub new { 3242sub new {
3005 my $class = shift; 3243 my $class = shift;
3006 3244
3007 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
3009 can_events => 1, 3247 can_events => 1,
3010 indent => 0, 3248 indent => 0,
3011 #font => default_font 3249 #font => default_font
3012 @_, 3250 @_,
3013 3251
3014 layout => (new CFPlus::Layout), 3252 layout => (new DC::Layout),
3015 par => [], 3253 par => [],
3016 max_par => 0, 3254 max_par => 0,
3017 height => 0, 3255 height => 0,
3018 children => [ 3256 children => [
3019 (new CFPlus::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
3020 (new CFPlus::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
3021 ], 3259 ],
3022 ); 3260 );
3023 3261
3024 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
3025 3263
3034} 3272}
3035 3273
3036sub size_request { 3274sub size_request {
3037 my ($self) = @_; 3275 my ($self) = @_;
3038 3276
3039 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
3040 3278
3041 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
3042 $self->SUPER::size_request 3280 $self->SUPER::size_request
3043} 3281}
3044 3282
3081 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3082 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
3083 3321
3084 $layout->set_shapes ( 3322 $layout->set_shapes (
3085 map 3323 map
3086 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3087 @{$para->{widget}} 3325 @{$para->{widget}}
3088 ); 3326 );
3089 3327
3090 $layout 3328 $layout
3091} 3329}
3208 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3209 $self->force_uptodate; 3447 $self->force_uptodate;
3210 3448
3211 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3212 3450
3213 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3214 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
3215 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
3216 3454
3217 package CFPlus::UI::Base; 3455 package DC::UI::Base;
3218 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3219 (0, 0, $self->{w}, $self->{h}); 3457 (0, 0, $self->{w}, $self->{h});
3220 3458
3221 my $top = int $self->{children}[1]{range}[0]; 3459 my $top = int $self->{children}[1]{range}[0];
3222 3460
3233 3471
3234 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
3235 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
3236 3474
3237 $layout->render ($para->{indent}, $y - $y0); 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
3238 3477
3239 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
3240 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
3241 3480
3242 for (@w) { 3481 for (@w) {
3280 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
3281} 3520}
3282 3521
3283############################################################################# 3522#############################################################################
3284 3523
3285package CFPlus::UI::Animator; 3524package DC::UI::Animator;
3286 3525
3287use CFPlus::OpenGL; 3526use DC::OpenGL;
3288 3527
3289our @ISA = CFPlus::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
3290 3529
3291sub moveto { 3530sub moveto {
3292 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
3293 3532
3294 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3322 glPopMatrix; 3561 glPopMatrix;
3323} 3562}
3324 3563
3325############################################################################# 3564#############################################################################
3326 3565
3327package CFPlus::UI::Flopper; 3566package DC::UI::Flopper;
3328 3567
3329our @ISA = CFPlus::UI::Button::; 3568our @ISA = DC::UI::Button::;
3330 3569
3331sub new { 3570sub new {
3332 my $class = shift; 3571 my $class = shift;
3333 3572
3334 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3346 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
3347} 3586}
3348 3587
3349############################################################################# 3588#############################################################################
3350 3589
3351package CFPlus::UI::Tooltip; 3590package DC::UI::Tooltip;
3352 3591
3353our @ISA = CFPlus::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
3354 3593
3355use CFPlus::OpenGL; 3594use DC::OpenGL;
3356 3595
3357sub new { 3596sub new {
3358 my $class = shift; 3597 my $class = shift;
3359 3598
3360 $class->SUPER::new ( 3599 $class->SUPER::new (
3364} 3603}
3365 3604
3366sub set_tooltip_from { 3605sub set_tooltip_from {
3367 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
3368 3607
3369 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3370 if $widget->{tooltip} =~ /^#(.*)$/;
3371
3372 my $tooltip = $widget->{tooltip}; 3608 my $tip = $widget->{tooltip};
3609 $tip = $tip->($widget) if "CODE" eq ref $tip;
3610
3611 $tip = DC::Pod::section_label tooltip => $1
3612 if $tip =~ /^#(.*)$/;
3373 3613
3374 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
3375 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
3376 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3377 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
3378 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
3379 } 3619 }
3380 3620
3381 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
3382 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
3383 3623
3384 $self->add (new CFPlus::UI::Label 3624 $self->add (new DC::UI::Label
3385 markup => $tooltip, 3625 markup => $tip,
3386 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
3387 fontsize => 0.8, 3628 fontsize => 0.8,
3388 style => 1, # FLAG_INVERSE 3629 style => 1, # FLAG_INVERSE
3389 ellipsise => 0, 3630 ellipsise => 0,
3390 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
3391 ); 3632 );
3428} 3669}
3429 3670
3430sub _draw { 3671sub _draw {
3431 my ($self) = @_; 3672 my ($self) = @_;
3432 3673
3433 glTranslate 0.375, 0.375;
3434
3435 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
3436 3675
3437 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
3438 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
3439 glVertex 0 , 0;
3440 glVertex 0 , $h;
3441 glVertex $w, $h;
3442 glVertex $w, 0;
3443 glEnd;
3444 3678
3445 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
3446 glBegin GL_LINE_LOOP; 3680 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 3681
3453 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
3454 3683
3455 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
3456} 3685}
3457 3686
3458############################################################################# 3687#############################################################################
3459 3688
3460package CFPlus::UI::Face; 3689package DC::UI::Face;
3461 3690
3462our @ISA = CFPlus::UI::DrawBG::; 3691our @ISA = DC::UI::DrawBG::;
3463 3692
3464use CFPlus::OpenGL; 3693use DC::OpenGL;
3465 3694
3466sub new { 3695sub new {
3467 my $class = shift; 3696 my $class = shift;
3468 3697
3469 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3473 can_events => 0, 3702 can_events => 0,
3474 @_, 3703 @_,
3475 ); 3704 );
3476 3705
3477 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
3478 CFPlus::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
3479 3708
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3710 $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; 3711 return unless $::CONN;
3486 3712
3713 my $w = $widget
3714 or return;
3715
3487 ++$widget->{frame}; 3716 ++$w->{frame};
3488 $widget->update_face; 3717 $w->update_face;
3718
3719 # somehow, $widget can go away
3489 $widget->update; 3720 $w->update;
3490
3491 $widget->update_timer; 3721 $w->update_timer;
3492 },
3493 ); 3722 };
3494 3723
3495 $self->update_face; 3724 $self->update_face;
3496 $self->update_timer; 3725 $self->update_timer;
3497 } 3726 }
3498 3727
3503 my ($self) = @_; 3732 my ($self) = @_;
3504 3733
3505 return unless $self->{timer}; 3734 return unless $self->{timer};
3506 3735
3507 if ($self->{visible}) { 3736 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; 3737 $self->{timer}->start;
3514 } else { 3738 } else {
3515 $self->{timer}->stop; 3739 $self->{timer}->stop;
3516 } 3740 }
3517} 3741}
3518 3742
3519sub update_face { 3743sub update_face {
3520 my ($self) = @_; 3744 my ($self) = @_;
3521 3745
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) { 3746 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) { 3748 if ($anim && @$anim) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3539 } else { 3750 delete $self->{face_change_cb};
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3751
3541 $self->realloc; 3752 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3753 unless ($tex->{name} || $tex->{loading}) {
3754 $tex->upload (sub { $self->reconfigure });
3755 }
3542 }); 3756 }
3543 } 3757 }
3544 } 3758 }
3545 } 3759 }
3760}
3761
3762sub size_request {
3763 my ($self) = @_;
3764
3765 if ($::CONN) {
3766 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3767 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3768 if ($tex->{name}) {
3769 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3770 } elsif (!$tex->{loading}) {
3771 $tex->upload (sub { $self->reconfigure });
3772 }
3773 }
3774
3775 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3776 }
3777 }
3546 3778
3547 ($self->{size_w} || 8, $self->{size_h} || 8) 3779 ($self->{size_w} || 8, $self->{size_h} || 8)
3548} 3780}
3549 3781
3550sub update { 3782sub update {
3564} 3796}
3565 3797
3566sub _draw { 3798sub _draw {
3567 my ($self) = @_; 3799 my ($self) = @_;
3568 3800
3569 return unless $::CONN;
3570
3571 $self->SUPER::_draw; 3801 $self->SUPER::_draw;
3572 3802
3573 my $faceid = $::CONN->{faceid}[$self->{face}] 3803 if (my $tex = $self->{tex}) {
3574 or return;
3575
3576 my $tex = $::CONN->{texture}[$faceid];
3577
3578 if ($tex) {
3579 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3581 glColor 0, 0, 0, 1; 3806 glColor 0, 0, 0, 1;
3582 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3583 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
3593 $self->SUPER::destroy; 3818 $self->SUPER::destroy;
3594} 3819}
3595 3820
3596############################################################################# 3821#############################################################################
3597 3822
3598package CFPlus::UI::Buttonbar; 3823package DC::UI::Buttonbar;
3599 3824
3600our @ISA = CFPlus::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
3601 3826
3602# TODO: should actually wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
3603 3828
3604############################################################################# 3829#############################################################################
3605 3830
3606package CFPlus::UI::Menu; 3831package DC::UI::Menu;
3607 3832
3608our @ISA = CFPlus::UI::Toplevel::; 3833our @ISA = DC::UI::Toplevel::;
3609 3834
3610use CFPlus::OpenGL; 3835use DC::OpenGL;
3611 3836
3612sub new { 3837sub new {
3613 my $class = shift; 3838 my $class = shift;
3614 3839
3615 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3616 items => [], 3841 items => [],
3617 z => 100, 3842 z => 100,
3618 @_, 3843 @_,
3619 ); 3844 );
3620 3845
3621 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
3622 3847
3623 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
3624 my ($widget, $cb, $tooltip) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
3625 3850
3626 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
3627 if (!ref $widget) { 3852 if (!ref $widget) {
3628 if ($widget =~ /\t/) { 3853 if ($widget =~ /\t/) {
3629 my ($left, $right) = split /\t/, $widget, 2; 3854 my ($left, $right) = split /\t/, $widget, 2;
3630 3855
3631 $widget = new CFPlus::UI::HBox 3856 $widget = new DC::UI::HBox
3632 can_hover => 1, 3857 can_hover => 1,
3633 can_events => 1, 3858 can_events => 1,
3634 tooltip => $tooltip, 3859 tooltip => $tooltip,
3635 children => [ 3860 children => [
3636 (new CFPlus::UI::Label markup => $left, expand => 1), 3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3637 (new CFPlus::UI::Label markup => $right, align => +1), 3862 (new DC::UI::Label markup => $right, align => 1),
3638 ], 3863 ],
3639 ; 3864 ;
3640 3865
3641 } else { 3866 } else {
3642 $widget = new CFPlus::UI::Label 3867 $widget = new DC::UI::Label
3643 can_hover => 1, 3868 can_hover => 1,
3644 can_events => 1, 3869 can_events => 1,
3870 align => 0,
3645 markup => $widget, 3871 markup => $widget,
3646 tooltip => $tooltip; 3872 tooltip => $tooltip;
3647 } 3873 }
3648 } 3874 }
3649 3875
3695 1 3921 1
3696} 3922}
3697 3923
3698############################################################################# 3924#############################################################################
3699 3925
3700package CFPlus::UI::Multiplexer; 3926package DC::UI::Multiplexer;
3701 3927
3702our @ISA = CFPlus::UI::Container::; 3928our @ISA = DC::UI::Container::;
3703 3929
3704sub new { 3930sub new {
3705 my $class = shift; 3931 my $class = shift;
3706 3932
3707 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
3768 $self->{current}->draw; 3994 $self->{current}->draw;
3769} 3995}
3770 3996
3771############################################################################# 3997#############################################################################
3772 3998
3773package CFPlus::UI::Notebook; 3999package DC::UI::Notebook;
3774 4000
4001use DC::OpenGL;
4002
3775our @ISA = CFPlus::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3776 4004
3777sub new { 4005sub new {
3778 my $class = shift; 4006 my $class = shift;
3779 4007
3780 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3781 buttonbar => (new CFPlus::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3782 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3783 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3784 @_, 4013 @_,
3785 ); 4014 );
3786 4015
3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3788 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3789 4018
4019 {
4020 Scalar::Util::weaken (my $wself = $self);
4021
4022 $self->{multiplexer}->connect (c_add => sub {
4023 my ($mplex, $widgets) = @_;
4024
4025 for my $child (@$widgets) {
4026 Scalar::Util::weaken $child;
4027 $child->{c_tab_} ||= do {
4028 my $tab =
4029 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4030 ? $child->{c_tab}
4031 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4032
4033 $tab->connect (activate => sub {
4034 $wself->set_current_page ($child);
4035 });
4036
4037 $tab
4038 };
4039
4040 $self->{buttonbar}->add ($child->{c_tab_});
4041 }
4042 });
4043
4044 $self->{multiplexer}->connect (c_remove => sub {
4045 my ($mplex, $widgets) = @_;
4046
4047 for my $child (@$widgets) {
4048 $wself->{buttonbar}->remove ($child->{c_tab_});
4049 }
4050 });
4051 }
4052
3790 $self 4053 $self
3791} 4054}
3792 4055
3793sub add { 4056sub add {
4057 my ($self, @widgets) = @_;
4058
4059 $self->{multiplexer}->add (@widgets)
4060}
4061
4062sub remove {
4063 my ($self, @widgets) = @_;
4064
4065 $self->{multiplexer}->remove (@widgets)
4066}
4067
4068sub pages {
4069 my ($self) = @_;
4070 $self->{multiplexer}->children
4071}
4072
4073sub page_index {
4074 my ($self, $widget) = @_;
4075
4076 my $i = 0;
4077 for ($self->pages) {
4078 if ($_ eq $widget) { return $i };
4079 $i++;
4080 }
4081
4082 undef
4083}
4084
4085sub add_tab {
3794 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3795 4087
3796 CFPlus::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3797 4090
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); 4091 $self->add ($widget);
3805} 4092}
3806 4093
3807sub get_current_page { 4094sub get_current_page {
3808 my ($self) = @_; 4095 my ($self) = @_;
3809 4096
3815 4102
3816 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3817 $self->emit (page_changed => $self->{multiplexer}{current}); 4104 $self->emit (page_changed => $self->{multiplexer}{current});
3818} 4105}
3819 4106
4107sub _draw {
4108 my ($self) = @_;
4109
4110 $self->SUPER::_draw ();
4111
4112 if (my $cur = $self->{multiplexer}{current}) {
4113 if ($cur = $cur->{c_tab_}) {
4114 glTranslate $self->{buttonbar}{x} + $cur->{x},
4115 $self->{buttonbar}{y} + $cur->{y};
4116 glLineWidth 3;
4117 #glEnable GL_BLEND;
4118 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4119 glColor @{$self->{active_outline}};
4120 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4121 glLineWidth 1;
4122 #glDisable GL_BLEND;
4123 }
4124 }
4125}
4126
3820############################################################################# 4127#############################################################################
3821 4128
3822package CFPlus::UI::Selector; 4129package DC::UI::Selector;
3823 4130
3824use utf8; 4131use utf8;
3825 4132
3826our @ISA = CFPlus::UI::Button::; 4133our @ISA = DC::UI::Button::;
3827 4134
3828sub new { 4135sub new {
3829 my $class = shift; 4136 my $class = shift;
3830 4137
3831 my $self = $class->SUPER::new ( 4138 my $self = $class->SUPER::new (
3848 my ($value, $title, $tooltip) = @$_; 4155 my ($value, $title, $tooltip) = @$_;
3849 4156
3850 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3851 } 4158 }
3852 4159
3853 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3854} 4161}
3855 4162
3856sub _set_value { 4163sub _set_value {
3857 my ($self, $value) = @_; 4164 my ($self, $value) = @_;
3858 4165
3859 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
3860 or return; 4168 or return;
3861 4169
3862 $self->{value} = $item->[0]; 4170 $self->{value} = $item->[0];
3863 $self->set_markup ("$item->[1] ⇓"); 4171 $self->set_markup ("$item->[1] ⇓");
3864 $self->set_tooltip ($item->[2]); 4172# $self->set_tooltip ($item->[2]);
3865} 4173}
3866 4174
3867sub set_value { 4175sub set_value {
3868 my ($self, $value) = @_; 4176 my ($self, $value) = @_;
3869 4177
3871 4179
3872 $self->_set_value ($value); 4180 $self->_set_value ($value);
3873 $self->emit (changed => $value); 4181 $self->emit (changed => $value);
3874} 4182}
3875 4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
3876############################################################################# 4191#############################################################################
3877 4192
3878package CFPlus::UI::Statusbox; 4193package DC::UI::Statusbox;
3879 4194
3880our @ISA = CFPlus::UI::VBox::; 4195our @ISA = DC::UI::VBox::;
3881 4196
3882sub new { 4197sub new {
3883 my $class = shift; 4198 my $class = shift;
3884 4199
3885 my $self = $class->SUPER::new ( 4200 my $self = $class->SUPER::new (
3886 fontsize => 0.8, 4201 fontsize => 0.8,
3887 @_, 4202 @_,
3888 ); 4203 );
3889 4204
3890 CFPlus::weaken (my $this = $self); 4205 DC::weaken (my $this = $self);
3891 4206
3892 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3893 4208
3894 $self 4209 $self
3895} 4210}
3896 4211
3897sub reorder { 4212sub reorder {
3898 my ($self) = @_; 4213 my ($self) = @_;
3899 my $NOW = Time::HiRes::time; 4214 my $NOW = Time::HiRes::time;
3900 4215
3901 # freeze display when hovering over any label 4216 # freeze display when hovering over any label
3902 return if $CFPlus::UI::TOOLTIP->{owner} 4217 return if $DC::UI::TOOLTIP->{owner}
3903 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3904 values %{ $self->{item} }; 4219 values %{ $self->{item} };
3905 4220
3906 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3907 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3908 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3909 4226
3910 my @widgets; 4227 my @widgets;
3911 4228
3912 my @items = sort { 4229 my @items = sort {
3913 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
3914 or $b->{id} <=> $a->{id} 4231 or $b->{id} <=> $a->{id}
3915 } values %{ $self->{item} }; 4232 } values %{ $self->{item} };
3916
3917 $self->{timer}->interval (1);
3918 4233
3919 my $count = 10 + 1; 4234 my $count = 10 + 1;
3920 for my $item (@items) { 4235 for my $item (@items) {
3921 last unless --$count; 4236 last unless --$count;
3922 4237
3929 for ($short) { 4244 for ($short) {
3930 s/^\s+//; 4245 s/^\s+//;
3931 s/\s+/ /g; 4246 s/\s+/ /g;
3932 } 4247 }
3933 4248
3934 new CFPlus::UI::Label 4249 new DC::UI::Label
3935 markup => $short, 4250 markup => $short,
3936 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3937 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3938 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3939 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3940 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3941 fg => [@{ $item->{fg} }], 4257 fg => [@{ $item->{fg} }],
3942 can_events => 1, 4258 can_events => 1,
3943 can_hover => 1 4259 can_hover => 1
3944 }; 4260 };
3945 4261
3946 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3947 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3948 $label->update; 4264 $label->update;
3949 $label->set_max_size (undef, $label->{req_h} * $diff) 4265 $label->set_max_size (undef, $label->{req_h} * $diff)
3950 if $diff < 1; 4266 if $diff < 1;
3951 $self->{timer}->interval (1/30); 4267 $self->{timer}->set (1/30, 1/30);
3952 } else { 4268 } else {
3953 $label->{fg}[3] = $item->{fg}[3] || 1; 4269 $label->{fg}[3] = $item->{fg}[3] || 1;
3954 } 4270 }
3955 4271
3956 push @widgets, $label; 4272 push @widgets, $label;
4018 $self->SUPER::destroy; 4334 $self->SUPER::destroy;
4019} 4335}
4020 4336
4021############################################################################# 4337#############################################################################
4022 4338
4023package CFPlus::UI::Root; 4339package DC::UI::Root;
4024 4340
4025our @ISA = CFPlus::UI::Container::; 4341our @ISA = DC::UI::Container::;
4026 4342
4027use List::Util qw(min max); 4343use List::Util qw(min max);
4028 4344
4029use CFPlus::OpenGL; 4345use DC::OpenGL;
4030 4346
4031sub new { 4347sub new {
4032 my $class = shift; 4348 my $class = shift;
4033 4349
4034 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
4035 visible => 1, 4351 visible => 1,
4036 @_, 4352 @_,
4037 ); 4353 );
4038 4354
4039 CFPlus::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
4040 4356
4041 $self 4357 $self
4042} 4358}
4043 4359
4044sub size_request { 4360sub size_request {
4092} 4408}
4093 4409
4094sub update { 4410sub update {
4095 my ($self) = @_; 4411 my ($self) = @_;
4096 4412
4097 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
4098} 4414}
4099 4415
4100sub add { 4416sub add {
4101 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
4102 4418
4139 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
4140 $_->() 4456 $_->()
4141 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
4142 } 4458 }
4143 4459
4144 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
4145 my %queue; 4461 my %queue;
4146 my @queue; 4462 my @queue;
4147 my $widget; 4463 my $widget;
4148 4464
4149 outer: 4465 outer:
4169 4485
4170 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
4171 4487
4172 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
4173 4489
4174 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
4175 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4491 $h += $widget->{padding_y} * 2;
4492
4493 $w = max $widget->{min_w}, $w;
4494 $h = max $widget->{min_h}, $h;
4176 4495
4177 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4178 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4179 4498
4180 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
4196 } 4515 }
4197 } 4516 }
4198 4517
4199 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
4200 } 4519 }
4201 }
4202 4520
4203 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
4204 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
4205 values %$size_alloc; 4523 values %$size_alloc;
4206 4524
4207 while () { 4525 while () {
4208 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
4209 4527
4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4211 4529
4212 $w = 0 if $w < 0;
4213 $h = 0 if $h < 0;
4214
4215 $w = max $widget->{min_w}, $w; 4530 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h; 4531 $h = max $widget->{min_h}, $h;
4217 4532
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220 4535
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223 4538
4224 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
4225 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
4226 4541
4227 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4542 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4228 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
4229 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
4230 4545
4231 $widget->{w} = $w; 4546 $widget->{w} = $w;
4232 $widget->{h} = $h; 4547 $widget->{h} = $h;
4233 4548
4234 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
4235 } 4551 }
4236 } 4552 }
4237 } 4553 }
4238 4554
4239 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
4250 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4251 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
4252 glLoadIdentity; 4568 glLoadIdentity;
4253 4569
4254 { 4570 {
4255 package CFPlus::UI::Base; 4571 package DC::UI::Base;
4256 4572
4257 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4258 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
4259 4575
4260 $self->_draw; 4576 $self->_draw;
4261 } 4577 }
4262} 4578}
4263 4579
4264############################################################################# 4580#############################################################################
4265 4581
4266package CFPlus::UI; 4582package DC::UI;
4267 4583
4268$ROOT = new CFPlus::UI::Root; 4584$ROOT = new DC::UI::Root;
4269$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
4270 4586
42711 45871
4272 4588

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines