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.411 by root, Sun Jul 22 19:34:59 2007 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 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 Guard ();
9
10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
… …
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
… …
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200 199
201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use strict;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
… …
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $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}; 255 $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}; 256 $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}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
… …
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
… …
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
… …
364 $self->{force_h} = $h; 369 $self->{force_h} = $h;
365 370
366 $self->realloc; 371 $self->realloc;
367} 372}
368 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
372} 395}
373 396
… …
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
… …
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
… …
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
… …
605} 628}
606 629
607sub DESTROY { 630sub DESTROY {
608 my ($self) = @_; 631 my ($self) = @_;
609 632
610 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
611 634
635 local $@;
612 eval { $self->destroy }; 636 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 638
615 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
616} 640}
617 641
618############################################################################# 642#############################################################################
619 643
620package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
621 645
622our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
623 647
624use strict; 648use strict;
625use CFPlus::OpenGL; 649use DC::OpenGL;
626 650
627sub new { 651sub new {
628 my $class = shift; 652 my $class = shift;
629
630 # range [value, low, high, page]
631 653
632 $class->SUPER::new ( 654 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
635 @_ 657 @_
636 ) 658 )
637} 659}
638 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
639sub _draw { 668sub _draw {
640 my ($self) = @_; 669 my ($self) = @_;
641 670
642 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self && $self->{active_bg}
643 ? $self->{active_bg} 672 ? $self->{active_bg}
… …
647 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
648 677
649 glEnable GL_BLEND; 678 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 680 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 682 glDisable GL_BLEND;
661 } 683 }
662} 684}
663 685
664############################################################################# 686#############################################################################
665 687
666package CFPlus::UI::Empty; 688package DC::UI::Empty;
667 689
668our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
669 691
670sub new { 692sub new {
671 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
673} 695}
… …
680 702
681sub draw { } 703sub draw { }
682 704
683############################################################################# 705#############################################################################
684 706
685package CFPlus::UI::Container; 707package DC::UI::Container;
686 708
687our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
688 710
689sub new { 711sub new {
690 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
691 713
692 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
725 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
726 ]; 748 ];
727 749
728 $self->realloc; 750 $self->realloc;
729 751
752 $self->emit (c_add => \@widgets);
753
730 map $_+0, @widgets 754 map $_+0, @widgets
731} 755}
732 756
733sub children { 757sub children {
734 @{ $_[0]{children} } 758 @{ $_[0]{children} }
735} 759}
736 760
737sub remove { 761sub remove {
738 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
739 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
740 delete $child->{parent}; 767 delete $child->{parent};
741 $child->hide; 768 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
744 771
745 $self->realloc; 772 $self->realloc;
746} 773}
747 774
748sub clear { 775sub clear {
… …
776} 803}
777 804
778sub _draw { 805sub _draw {
779 my ($self) = @_; 806 my ($self) = @_;
780 807
781 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
782} 809}
783 810
784############################################################################# 811#############################################################################
785 812
786package CFPlus::UI::Bin; 813package DC::UI::Bin;
787 814
788our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
789 816
790sub new { 817sub new {
791 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
792 819
793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
794 821
795 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
796} 823}
797 824
798sub add { 825sub add {
799 my ($self, $child) = @_; 826 my ($self, $child) = @_;
800 827
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
802 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
803} 830}
804 831
805sub remove { 832sub remove {
806 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
807 834
808 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
809 836
810 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
811 unless @{$self->{children}}; 838 unless @{$self->{children}};
812} 839}
813 840
814sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
815 842
… …
824 851
825 1 852 1
826} 853}
827 854
828############################################################################# 855#############################################################################
829
830# back-buffered drawing area 856# back-buffered drawing area
831 857
832package CFPlus::UI::Window; 858package DC::UI::Window;
833 859
834our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
835 861
836use CFPlus::OpenGL; 862use DC::OpenGL;
837 863
838sub new { 864sub new {
839 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
840 866
841 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
863} 889}
864 890
865sub render_child { 891sub render_child {
866 my ($self) = @_; 892 my ($self) = @_;
867 893
868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 894 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
870 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
871 897
872 { 898 {
873 package CFPlus::UI::Base; 899 package DC::UI::Base;
874 900
875 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
877 903
878 $self->_render; 904 $self->_render;
… …
895 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
896} 922}
897 923
898############################################################################# 924#############################################################################
899 925
900package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
901 927
902use List::Util qw(min max); 928use List::Util qw(min max);
903 929
904our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
905 931
906sub new { 932sub new {
907 my $class = shift; 933 my $class = shift;
908 934
909 $class->SUPER::new ( 935 $class->SUPER::new (
… …
951 $self->emit (changed => $x, $y); 977 $self->emit (changed => $x, $y);
952 $self->update; 978 $self->update;
953 } 979 }
954} 980}
955 981
982sub set_center {
983 my ($self, $x, $y) = @_;
984
985 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
986}
987
988sub make_visible {
989 my ($self, $x, $y, $border) = @_;
990
991 if ( $x < $self->{view_x} + $self->{w} * $border
992 || $x > $self->{view_x} + $self->{w} * (1 - $border)
993 || $y < $self->{view_y} + $self->{h} * $border
994 || $y > $self->{view_y} + $self->{h} * (1 - $border)
995 ) {
996 $self->set_center ($x, $y);
997 }
998}
999
956# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 1001sub coord2local {
958 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
959 1003
960 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1004 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
977 ) { 1021 ) {
978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979 } else { 1023 } else {
980 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
981 } 1025 }
982} 1026}
983 1027
984sub _render { 1028sub _render {
985 my ($self) = @_; 1029 my ($self) = @_;
986 1030
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1031 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1032 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989 1033
990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991 1035
992 $self->SUPER::_render; 1036 $self->SUPER::_render;
993} 1037}
994 1038
995############################################################################# 1039#############################################################################
996 1040
997package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
998 1042
999our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1000 1044
1001sub new { 1045sub new {
1002 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1003 1047
1004 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1005 1049
1006 my $self; 1050 my $self;
1007 1051
1008 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1009 col => 0, 1053 c_col => 0,
1010 row => 1, 1054 c_row => 1,
1011 vertical => 0, 1055 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1057 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1060 },
1017 ; 1061 ;
1018 1062
1019 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1020 col => 1, 1064 c_col => 1,
1021 row => 0, 1065 c_row => 0,
1022 vertical => 1, 1066 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1068 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1036 col_expand => [1, 0], 1080 col_expand => [1, 0],
1037 row_expand => [1, 0], 1081 row_expand => [1, 0],
1038 %arg, 1082 %arg,
1039 ); 1083 );
1040 1084
1041 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new DC::UI::ViewPort
1042 col => 0, 1086 c_col => 0,
1043 row => 0, 1087 c_row => 0,
1044 expand => 1, 1088 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1091 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1092 my ($vp, $x, $y) = @_;
… …
1070 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1071 1115
1072 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1073} 1117}
1074 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
1075sub update_slider { 1123sub update_slider {
1076 my ($self) = @_; 1124 my ($self) = @_;
1077 1125
1078 my $child = ($self->{vp} or return)->child; 1126 my $child = ($self->{vp} or return)->child;
1079 1127
… …
1168 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1169} 1217}
1170 1218
1171############################################################################# 1219#############################################################################
1172 1220
1173package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1174 1222
1175our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1176 1224
1177use CFPlus::OpenGL; 1225use DC::OpenGL;
1178 1226
1179sub new { 1227sub new {
1180 my $class = shift; 1228 my $class = shift;
1181 1229
1182 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1193 1241
1194 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1206 } 1247 }
1207 1248
1208 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1209} 1250}
1210 1251
1211############################################################################# 1252#############################################################################
1212 1253
1213package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1214 1255
1215our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1216 1257
1217use CFPlus::OpenGL; 1258use DC::OpenGL;
1218 1259
1219sub new { 1260sub new {
1220 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1221 1262
1222 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1224 align => 1, 1265 align => 1,
1225 valign => 0, 1266 valign => 0.5,
1226 text => $arg{label}, 1267 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1228 } 1269 }
1229 1270
1230 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1231 # label => "", 1272 # label => "",
1232 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1233 border => 0.8, 1274 border => 0.8,
1234 style => 'single', 1275 style => 'single',
1235 %arg, 1276 %arg,
1236 ); 1277 );
1237 1278
… …
1240 1281
1241sub add { 1282sub add {
1242 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1243 1284
1244 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246} 1287}
1247 1288
1248sub border { 1289sub border {
1249 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1250} 1291}
… …
1290 my $border = $self->border; 1331 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1292 1333
1293 $child->draw; 1334 $child->draw;
1294 1335
1295 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1308 } 1349 }
1309} 1350}
1310 1351
1311############################################################################# 1352#############################################################################
1312 1353
1313package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1314 1355
1315our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1316 1357
1317use CFPlus::OpenGL; 1358use DC::OpenGL;
1318 1359
1319my $bg = 1360my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1321 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1322 1363
1323my @border = 1364my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1366 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326 1367
1327my @icon = 1368my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png); 1370 qw(x1_move.png x1_resize.png);
1330 1371
1331sub new { 1372sub new {
1332 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1333 1374
1334 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1337 border => 0.6, 1378 border => 0.8,
1338 can_events => 1, 1379 can_events => 1,
1339 min_w => 64, 1380 min_w => 64,
1340 min_h => 32, 1381 min_h => 32,
1341 %arg, 1382 %arg,
1342 ); 1383 );
1343 1384
1344 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1345 align => 0, 1386 align => 0.5,
1346 valign => 1, 1387 valign => 1,
1347 text => $self->{title}, 1388 text => $self->{title},
1348 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1349 if exists $self->{title}; 1390 if exists $self->{title};
1350 1391
1351 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1352 $self->{close_button} = 1393 $self->{close_button} =
1353 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1354 path => 'x1_close.png', 1395 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1356 1397
1357 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1358 } 1399 }
1359 1400
1360 $self 1401 $self
1361} 1402}
1362 1403
1363sub add { 1404sub add {
1364 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1365 1406
1366 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369} 1410}
1370 1411
1371sub border { 1412sub border {
1372 int $_[0]{border} * $::FONTSIZE 1413 int $_[0]{border} * $::FONTSIZE
1414}
1415
1416sub get_max_wh {
1417 my ($self) = @_;
1418
1419 return ($self->{w}, $self->{h})
1420 if $self->{visible} && $self->{w};
1421
1422 $self->SUPER::get_max_wh
1373} 1423}
1374 1424
1375sub size_request { 1425sub size_request {
1376 my ($self) = @_; 1426 my ($self) = @_;
1377 1427
… …
1502 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504 1554
1505 my $border = $self->border; 1555 my $border = $self->border;
1506 1556
1557 if ($border) {
1507 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512 1563
1513 # move 1564 # move
1514 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519 1570
1520 # resize 1571 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1526 1578
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1529 1581
1530 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1549 if $self->{close_button}; 1601 if $self->{close_button};
1550} 1602}
1551 1603
1552############################################################################# 1604#############################################################################
1553 1605
1554package CFPlus::UI::Table; 1606package DC::UI::Table;
1555 1607
1556our @ISA = CFPlus::UI::Container::; 1608our @ISA = DC::UI::Container::;
1557 1609
1558use List::Util qw(max sum); 1610use List::Util qw(max sum);
1559 1611
1560use CFPlus::OpenGL; 1612use DC::OpenGL;
1561 1613
1562sub new { 1614sub new {
1563 my $class = shift; 1615 my $class = shift;
1564 1616
1565 $class->SUPER::new ( 1617 $class->SUPER::new (
… …
1571 1623
1572sub add { 1624sub add {
1573 my ($self, @widgets) = @_; 1625 my ($self, @widgets) = @_;
1574 1626
1575 for my $child (@widgets) { 1627 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1628 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1629 $child->{c_colspan} ||= 1;
1578 } 1630 }
1579 1631
1580 $self->SUPER::add (@widgets); 1632 $self->SUPER::add (@widgets);
1581} 1633}
1582 1634
… …
1586 my @widgets; 1638 my @widgets;
1587 1639
1588 while (@_) { 1640 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1642
1591 $child->{row} = $row; 1643 $child->{c_row} = $row;
1592 $child->{col} = $col; 1644 $child->{c_col} = $col;
1593 1645
1594 push @widgets, $child; 1646 push @widgets, $child;
1595 } 1647 }
1596 1648
1597 $self->add (@widgets); 1649 $self->add (@widgets);
… …
1603 my (@w, @h); 1655 my (@w, @h);
1604 1656
1605 my @children = $self->children; 1657 my @children = $self->children;
1606 1658
1607 # first pass, columns 1659 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1660 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1661 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1662
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1663 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1664
1613 if ($w > $sw) { 1665 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1666 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1667 }
1616 } 1668 }
1617 1669
1618 # second pass, rows 1670 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1673
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1675
1624 if ($h > $sh) { 1676 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626 } 1678 }
1627 } 1679 }
1628 1680
1629 (\@w, \@h) 1681 (\@w, \@h)
1630} 1682}
… …
1653 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1654 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1655 1707
1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657 1709
1658 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1659 1711
1660 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1663 1715
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665 1717
1666 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1667 1719
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1722
1671 for my $widget ($self->children) { 1723 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1724 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1725
1674 $widget->configure ( 1726 $widget->configure (
1675 $x[$c], $y[$r], 1727 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1729 );
… …
1680 1 1732 1
1681} 1733}
1682 1734
1683############################################################################# 1735#############################################################################
1684 1736
1685package CFPlus::UI::Fixed; 1737package DC::UI::Fixed;
1686 1738
1687use List::Util qw(min max); 1739use List::Util qw(min max);
1688 1740
1689our @ISA = CFPlus::UI::Container::; 1741our @ISA = DC::UI::Container::;
1690 1742
1691sub _scale($$$) { 1743sub _scale($$$) {
1692 my ($rel, $val, $max) = @_; 1744 my ($rel, $val, $max) = @_;
1693 1745
1694 $rel ? $val * $max : $val 1746 $rel ? $val * $max : $val
… …
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H; 1790 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739 1791
1740 $x += $child->{c_halign} * $child->{req_w}; 1792 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h}; 1793 $y += $child->{c_valign} * $child->{req_h};
1742 1794
1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h}); 1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1744 } 1796 }
1745 1797
1746 1 1798 1
1747} 1799}
1748 1800
1749############################################################################# 1801#############################################################################
1750 1802
1751package CFPlus::UI::Box; 1803package DC::UI::Box;
1752 1804
1753our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1754 1806
1755sub size_request { 1807sub size_request {
1756 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1757 1811
1758 $self->{vertical} 1812 $self->{vertical}
1759 ? ( 1813 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1762 ) 1816 )
1763 : ( 1817 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1766 ) 1820 )
1767} 1821}
1768 1822
1769sub invoke_size_allocate { 1823sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1791 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1792 for 0 .. $#children; 1846 for 0 .. $#children;
1793 } 1847 }
1794 } 1848 }
1795 1849
1796 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1797 1851
1798 my $pos = 0; 1852 my $pos = 0;
1799 for (0 .. $#children) { 1853 for (0 .. $#children) {
1800 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1801 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1855 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1806 1 1860 1
1807} 1861}
1808 1862
1809############################################################################# 1863#############################################################################
1810 1864
1811package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1812 1866
1813our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1814 1868
1815sub new { 1869sub new {
1816 my $class = shift; 1870 my $class = shift;
1817 1871
1818 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1821 ) 1875 )
1822} 1876}
1823 1877
1824############################################################################# 1878#############################################################################
1825 1879
1826package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1827 1881
1828our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1829 1883
1830sub new { 1884sub new {
1831 my $class = shift; 1885 my $class = shift;
1832 1886
1833 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1836 ) 1890 )
1837} 1891}
1838 1892
1839############################################################################# 1893#############################################################################
1840 1894
1841package CFPlus::UI::Label; 1895package DC::UI::Label;
1842 1896
1843our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1844 1898
1845use CFPlus::OpenGL; 1899use DC::OpenGL;
1846 1900
1847sub new { 1901sub new {
1848 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1849 1903
1850 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1855 #text => initial text 1909 #text => initial text
1856 #markup => initial narkup 1910 #markup => initial narkup
1857 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1858 #style => 0, # render flags 1912 #style => 0, # render flags
1859 ellipsise => 3, # end 1913 ellipsise => 3, # end
1860 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1861 fontsize => 1, 1915 fontsize => 1,
1862 align => -1, 1916 align => 0.5,
1863 valign => -1, 1917 valign => 0.5,
1864 padding_x => 2, 1918 padding_x => 4,
1865 padding_y => 2, 1919 padding_y => 2,
1866 can_events => 0, 1920 can_events => 0,
1867 %arg 1921 %arg
1868 ); 1922 );
1869 1923
1870 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1871 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1872 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1873 $self->{template} = $layout; 1927 $self->{template} = $layout;
1874 } 1928 }
1875 1929
1876 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1894 1948
1895 delete $self->{ox}; 1949 delete $self->{ox};
1896 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1897} 1951}
1898 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1899sub set_text { 1959sub set_text {
1900 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1901 1961
1902 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1903 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
… …
1926 1986
1927sub size_request { 1987sub size_request {
1928 my ($self) = @_; 1988 my ($self) = @_;
1929 1989
1930 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1931 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1932 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1933 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1934 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1935 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1936 1998
1937 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1938 2000
1939 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1940 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
1941 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1943 2005
1944 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1945 2007
1946 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
2002 2064
2003 [$self->{layout}->size] 2065 [$self->{layout}->size]
2004 }; 2066 };
2005 2067
2006 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
2007 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2069 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2008 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2070 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2009 : ($self->{w} - $size->[0]) * 0.5);
2010 2071
2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2013 : ($self->{h} - $size->[1]) * 0.5);
2014 }; 2073 };
2015 2074
2016# unless ($self->{list}) { 2075# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList; 2076# $self->{list} = DC::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list}; 2077# DC::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList; 2079# DC::OpenGL::glEndList;
2021# } 2080# }
2022# 2081#
2023# CFPlus::OpenGL::glCallList $self->{list}; 2082# DC::OpenGL::glCallList $self->{list};
2024 2083
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2084 $self->{layout}->draw;
2026} 2085}
2027 2086
2028#sub destroy { 2087#sub destroy {
2029# my ($self) = @_; 2088# my ($self) = @_;
2030# 2089#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2090# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032# 2091#
2033# $self->SUPER::destroy; 2092# $self->SUPER::destroy;
2034#} 2093#}
2035 2094
2036############################################################################# 2095#############################################################################
2037 2096
2038package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
2039 2098
2040our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
2041 2100
2042use CFPlus::OpenGL; 2101use DC::OpenGL;
2043 2102
2044sub new { 2103sub new {
2045 my $class = shift; 2104 my $class = shift;
2046 2105
2047 $class->SUPER::new ( 2106 $class->SUPER::new (
2048 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2049 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
2050 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
2051 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
2052 can_hover => 1, 2113 can_hover => 1,
2053 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
2054 valign => 0, 2116 valign => 0.5,
2055 can_events => 1, 2117 can_events => 1,
2056 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
2057 #text => ... 2121 #text => ...
2058 #hidden => "*", 2122 #hidden => "*",
2059 @_ 2123 @_
2060 ) 2124 )
2061} 2125}
… …
2108 2172
2109 my $text = $self->get_text; 2173 my $text = $self->get_text;
2110 2174
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2112 2176
2113 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2115 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2116 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2117 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2118 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2119 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2120 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2121 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2122 # what a hack 2186 # what a hack
2123 $self->{cursor} = 2187 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1 2189 ? length $1
2126 : 0; 2190 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2128 # uh, again 2192 # uh, again
2129 $self->{cursor} = 2193 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2132 : length $self->{text}; 2196 : length $self->{text};
… …
2196 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2197 } 2261 }
2198 2262
2199 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glBegin GL_QUADS;
2202 glVertex 0 , 0;
2203 glVertex 0 , $self->{h};
2204 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2205 glVertex $self->{w}, 0;
2206 glEnd;
2207 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2208 2267
2209 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2210 2269
2211 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
2213 2272
2214 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
2215 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
2216 utf8::encode $text; 2275 utf8::encode $text;
2217 2276
2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2277 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2219 } 2278 }
2220 2279
2280 glColor_premultiply @{$self->{active_fg}};
2221 glBegin GL_LINES; 2281 glBegin GL_LINES;
2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2224 glEnd; 2284 glEnd;
2285
2286 glLineWidth 3;
2287 glColor @{$self->{active_outline}};
2288 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2289 glLineWidth 1;
2290
2291 } else {
2292 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2293 glBegin GL_LINE_STRIP;
2294 glVertex .5, $self->{h} * .5;
2295 glVertex .5, $self->{h} - 2.5;
2296 glVertex $self->{w} - .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} * .5;
2298 glEnd;
2225 } 2299 }
2226} 2300}
2227 2301
2228############################################################################# 2302#############################################################################
2229 2303
2230package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2231 2305
2232our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2233 2307
2234use CFPlus::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2235 2319
2236sub invoke_key_down { 2320sub invoke_key_down {
2237 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2238 2322
2239 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2245 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2246 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2247 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2248 $self->update; 2332 $self->update;
2249 2333
2250 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2251 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2252 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2253 } 2337 }
2254 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2255 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2257 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2258 } 2342 }
2259 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2260 } 2344 }
2261 2345
2262 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2263 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2265 2349
2266 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2267 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2268 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2269 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2270 } 2357 }
2271 2358
2272 } else { 2359 } else {
2273 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2274 } 2361 }
… …
2276 1 2363 1
2277} 2364}
2278 2365
2279############################################################################# 2366#############################################################################
2280 2367
2281package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2282 2369
2283our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2284 2371
2285use CFPlus::OpenGL; 2372use DC::OpenGL;
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 padding_y => 4,
2379
2380 @_
2381 )
2382}
2286 2383
2287sub move_cursor_ver { 2384sub move_cursor_ver {
2288 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2289 2386
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291 2388
2292 $y += $dy; 2389 $line += $dy;
2293 2390
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2391 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2295 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2296 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2297 $self->update; 2394 $self->update;
2298 return; 2395 return;
2299 } 2396 }
… …
2302sub invoke_key_down { 2399sub invoke_key_down {
2303 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2304 2401
2305 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2306 2403
2307 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2308 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2311 } else { 2408 } else {
2312 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2313 } 2410 }
2314 2411
2315 1 2412 1
2316} 2413}
2317 2414
2318############################################################################# 2415#############################################################################
2319 2416
2320package CFPlus::UI::Button; 2417package DC::UI::ButtonBin;
2321 2418
2322our @ISA = CFPlus::UI::Label::; 2419our @ISA = DC::UI::Bin::;
2323 2420
2324use CFPlus::OpenGL; 2421use DC::OpenGL;
2325 2422
2326my @tex = 2423my @tex =
2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2328 qw(b1_button_inactive.png b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2329 2426
2330sub new { 2427sub new {
2331 my $class = shift; 2428 my $class = shift;
2332 2429
2333 $class->SUPER::new ( 2430 $class->SUPER::new (
2431 can_hover => 1,
2432 align => 0.5,
2433 valign => 0.5,
2434 can_events => 1,
2435 @_
2436 )
2437}
2438
2439sub invoke_button_up {
2440 my ($self, $ev, $x, $y) = @_;
2441
2442 $self->emit ("activate")
2443 if $x >= 0 && $x < $self->{w}
2444 && $y >= 0 && $y < $self->{h};
2445
2446 1
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 glEnable GL_TEXTURE_2D;
2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2454 glColor 0, 0, 0, 1;
2455
2456 my $tex = $tex[$GRAB == $self];
2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2458
2459 glDisable GL_TEXTURE_2D;
2460
2461 $self->SUPER::_draw;
2462}
2463
2464#############################################################################
2465
2466package DC::UI::Button;
2467
2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
2471
2472my @tex =
2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2474 qw(b1_button_inactive.png b1_button_active.png);
2475
2476sub new {
2477 my $class = shift;
2478
2479 $class->SUPER::new (
2334 padding_x => 4, 2480 padding_x => 8,
2335 padding_y => 4, 2481 padding_y => 4,
2336 fg => [1.0, 1.0, 1.0], 2482 fg => [1.0, 1.0, 1.0],
2337 active_fg => [0.8, 0.8, 0.8], 2483 active_fg => [0.8, 0.8, 0.8],
2338 can_hover => 1, 2484 can_hover => 1,
2339 align => 0, 2485 align => 0.5,
2340 valign => 0, 2486 valign => 0.5,
2341 can_events => 1, 2487 can_events => 1,
2342 @_ 2488 @_
2343 ) 2489 )
2344} 2490}
2345 2491
… …
2370 $self->SUPER::_draw; 2516 $self->SUPER::_draw;
2371} 2517}
2372 2518
2373############################################################################# 2519#############################################################################
2374 2520
2375package CFPlus::UI::CheckBox; 2521package DC::UI::CheckBox;
2376 2522
2377our @ISA = CFPlus::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2378 2524
2379my @tex = 2525my @tex =
2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2381 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2382 2528
2383use CFPlus::OpenGL; 2529use DC::OpenGL;
2384 2530
2385sub new { 2531sub new {
2386 my $class = shift; 2532 my $class = shift;
2387 2533
2388 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2389 padding_x => 2, 2536 padding_x => 2,
2390 padding_y => 2, 2537 padding_y => 2,
2391 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2392 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2393 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2399} 2546}
2400 2547
2401sub size_request { 2548sub size_request {
2402 my ($self) = @_; 2549 my ($self) = @_;
2403 2550
2404 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2405} 2552}
2406 2553
2407sub toggle { 2554sub toggle {
2408 my ($self) = @_; 2555 my ($self) = @_;
2409 2556
… …
2428sub _draw { 2575sub _draw {
2429 my ($self) = @_; 2576 my ($self) = @_;
2430 2577
2431 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2432 2579
2433 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2434 2581
2435 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2436 2583
2437 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2584 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2438 2585
… …
2445 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2446} 2593}
2447 2594
2448############################################################################# 2595#############################################################################
2449 2596
2450package CFPlus::UI::Image; 2597package DC::UI::Image;
2451 2598
2452our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::Base::;
2453 2600
2454use CFPlus::OpenGL; 2601use DC::OpenGL;
2455 2602
2456our %texture_cache; 2603our %texture_cache;
2457 2604
2458sub new { 2605sub new {
2459 my $class = shift; 2606 my $class = shift;
2460 2607
2461 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2462 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2463 @_, 2611 @_,
2464 ); 2612 );
2465 2613
2466 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2468 2616
2469 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2471 2619
2472 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2473 2621
2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2475 2623
2476 $self 2624 $self
2477} 2625}
2478 2626
2479sub STORABLE_freeze { 2627sub STORABLE_freeze {
2480 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2481 2629
2482 $self->{path} 2630 $self->{path}
2483 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2484 2632
2485 $self->{path} 2633 $self->{path}
2486} 2634}
2487 2635
2488sub STORABLE_attach { 2636sub STORABLE_attach {
… …
2492} 2640}
2493 2641
2494sub size_request { 2642sub size_request {
2495 my ($self) = @_; 2643 my ($self) = @_;
2496 2644
2497 ($self->{tex}{w}, $self->{tex}{h}) 2645 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2498} 2646}
2499 2647
2500sub _draw { 2648sub _draw {
2501 my ($self) = @_; 2649 my ($self) = @_;
2502 2650
… …
2512 } 2660 }
2513 2661
2514 glEnable GL_TEXTURE_2D; 2662 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516 2664
2517 $tex->draw_quad (0, 0, $w, $h); 2665 $tex->draw_quad_alpha (0, 0, $w, $h);
2518 2666
2519 glDisable GL_TEXTURE_2D; 2667 glDisable GL_TEXTURE_2D;
2520} 2668}
2521 2669
2522############################################################################# 2670#############################################################################
2523 2671
2524package CFPlus::UI::ImageButton; 2672package DC::UI::ImageButton;
2525 2673
2526our @ISA = CFPlus::UI::Image::; 2674our @ISA = DC::UI::Image::;
2527 2675
2528use CFPlus::OpenGL; 2676use DC::OpenGL;
2529 2677
2530my %textures; 2678my %textures;
2531 2679
2532sub new { 2680sub new {
2533 my $class = shift; 2681 my $class = shift;
… …
2536 padding_x => 4, 2684 padding_x => 4,
2537 padding_y => 4, 2685 padding_y => 4,
2538 fg => [1, 1, 1], 2686 fg => [1, 1, 1],
2539 active_fg => [0, 0, 1], 2687 active_fg => [0, 0, 1],
2540 can_hover => 1, 2688 can_hover => 1,
2541 align => 0, 2689 align => 0.5,
2542 valign => 0, 2690 valign => 0.5,
2543 can_events => 1, 2691 can_events => 1,
2544 @_ 2692 @_
2545 ); 2693 );
2546} 2694}
2547 2695
2696sub invoke_button_down {
2697 my ($self, $ev, $x, $y) = @_;
2698
2699 1
2700}
2701
2548sub invoke_button_up { 2702sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_; 2703 my ($self, $ev, $x, $y) = @_;
2550 2704
2551 $self->emit ("activate") 2705 $self->emit ("activate")
2552 if $x >= 0 && $x < $self->{w} 2706 if $x >= 0 && $x < $self->{w}
… …
2555 1 2709 1
2556} 2710}
2557 2711
2558############################################################################# 2712#############################################################################
2559 2713
2560package CFPlus::UI::VGauge; 2714package DC::UI::VGauge;
2561 2715
2562our @ISA = CFPlus::UI::Base::; 2716our @ISA = DC::UI::Base::;
2563 2717
2564use List::Util qw(min max); 2718use List::Util qw(min max);
2565 2719
2566use CFPlus::OpenGL; 2720use DC::OpenGL;
2567 2721
2568my %tex = ( 2722my %tex = (
2569 food => [ 2723 food => [
2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2725 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2572 ], 2726 ],
2573 grace => [ 2727 grace => [
2574 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2728 map { new_from_resource DC::Texture $_, mipmap => 1 }
2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2729 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2576 ], 2730 ],
2577 hp => [ 2731 hp => [
2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2733 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2580 ], 2734 ],
2581 mana => [ 2735 mana => [
2582 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2737 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2584 ], 2738 ],
2585); 2739);
2586 2740
2587# eg. VGauge->new (gauge => 'food'), default gauge: food 2741# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2690 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2691} 2845}
2692 2846
2693############################################################################# 2847#############################################################################
2694 2848
2849package DC::UI::Progress;
2850
2851our @ISA = DC::UI::Label::;
2852
2853use DC::OpenGL;
2854
2855sub new {
2856 my ($class, %arg) = @_;
2857
2858 my $self = $class->SUPER::new (
2859 padding_x => 2,
2860 padding_y => 2,
2861 fg => [1, 1, 1],
2862 bg => [0, 0, 1, 0.2],
2863 bar => [0.7, 0.5, 0.1, 0.8],
2864 outline => [0.4, 0.3, 0],
2865 fontsize => 0.9,
2866 valign => 0.5,
2867 align => 0.5,
2868 can_events => 1,
2869 ellipsise => 1,
2870 label => "%d%%",
2871 %arg,
2872 );
2873
2874 $self->set_value ($arg{value} || -1);
2875
2876 $self
2877}
2878
2879sub set_label {
2880 my ($self, $label) = @_;
2881
2882 return if $self->{label} eq $label;
2883 $self->{label} = $label;
2884
2885 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2886}
2887
2888sub set_value {
2889 my ($self, $value) = @_;
2890
2891 if ($self->{value} ne $value) {
2892 $self->{value} = $value;
2893
2894 if ($value < 0) {
2895 $self->set_text ("-");
2896 } else {
2897 $self->set_text (sprintf $self->{label}, $value * 100);
2898 }
2899
2900 $self->update;
2901 }
2902}
2903
2904sub _draw {
2905 my ($self) = @_;
2906
2907 glEnable GL_BLEND;
2908 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2909
2910 my $px = $self->{padding_x};
2911 my $py = $self->{padding_y};
2912
2913 if ($self->{value} >= 0) {
2914 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2915
2916 glColor_premultiply @{$self->{bar}};
2917 glRect $px, $py, $s, $self->{h} - $py;
2918 glColor_premultiply @{$self->{bg}};
2919 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2920 }
2921
2922 glColor_premultiply @{$self->{outline}};
2923
2924 $px -= .5;
2925 $py -= .5;
2926
2927 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2928
2929 glDisable GL_BLEND;
2930
2931 {
2932 local $self->{bg}; # do not draw background
2933 $self->SUPER::_draw;
2934 }
2935}
2936
2937#############################################################################
2938
2939package DC::UI::ExperienceProgress;
2940
2941our @ISA = DC::UI::Progress::;
2942
2943sub new {
2944 my ($class, %arg) = @_;
2945
2946 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2947
2948 my $self = $class->SUPER::new (
2949 %arg,
2950 tooltip => sub {
2951 my ($self) = @_;
2952
2953 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2954 $tt,
2955 $self->{lvl},
2956 ::formsep ($self->{exp}),
2957 ::formsep ($self->{nxt}),
2958 ::formsep ($self->{nxt} - $self->{exp}),
2959 $self->_percent * 100,
2960 },
2961 );
2962
2963 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2964 if $::CONN;
2965
2966 $self
2967}
2968
2969sub DESTROY {
2970 my ($self) = @_;
2971
2972 delete $::CONN->{on_exp_update}{$self+0}
2973 if $::CONN;
2974
2975 $self->SUPER::DESTROY;
2976}
2977
2978sub _percent {
2979 my ($self) = @_;
2980
2981 my $table = $::CONN && $::CONN->{exp_table}
2982 or return -1;
2983
2984 my $l0 = $table->[$self->{lvl} - 1];
2985 my $l1 = $table->[$self->{lvl}];
2986
2987 $self->{nxt} = $l1;
2988
2989 ($self->{exp} - $l0) / ($l1 - $l0)
2990}
2991
2992sub set_value {
2993 my ($self, $lvl, $exp) = @_;
2994
2995 $self->{lvl} = $lvl;
2996 $self->{exp} = $exp;
2997
2998 $self->SUPER::set_value ($self->_percent);
2999}
3000
3001#############################################################################
3002
2695package CFPlus::UI::Gauge; 3003package DC::UI::Gauge;
2696 3004
2697our @ISA = CFPlus::UI::VBox::; 3005our @ISA = DC::UI::VBox::;
2698 3006
2699sub new { 3007sub new {
2700 my ($class, %arg) = @_; 3008 my ($class, %arg) = @_;
2701 3009
2702 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
… …
2704 can_hover => 1, 3012 can_hover => 1,
2705 can_events => 1, 3013 can_events => 1,
2706 %arg, 3014 %arg,
2707 ); 3015 );
2708 3016
2709 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3017 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2710 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3018 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2711 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3019 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2712 3020
2713 $self 3021 $self
2714} 3022}
2715 3023
2716sub set_fontsize { 3024sub set_fontsize {
… …
2737 $self->{value}->set_text ($val); 3045 $self->{value}->set_text ($val);
2738} 3046}
2739 3047
2740############################################################################# 3048#############################################################################
2741 3049
2742package CFPlus::UI::Slider; 3050package DC::UI::Slider;
2743 3051
2744use strict; 3052use strict;
2745 3053
2746use CFPlus::OpenGL; 3054use DC::OpenGL;
2747 3055
2748our @ISA = CFPlus::UI::DrawBG::; 3056our @ISA = DC::UI::DrawBG::;
2749 3057
2750my @tex = 3058my @tex =
2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3059 map { new_from_resource DC::Texture $_ }
2752 qw(s1_slider.png s1_slider_bg.png); 3060 qw(s1_slider.png s1_slider_bg.png);
2753 3061
2754sub new { 3062sub new {
2755 my $class = shift; 3063 my $class = shift;
2756 3064
… …
2793sub set_value { 3101sub set_value {
2794 my ($self, $value) = @_; 3102 my ($self, $value) = @_;
2795 3103
2796 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3104 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2797 3105
2798 $hi = $lo + 1 if $hi <= $lo; 3106 $hi = $lo if $hi < $lo;
2799 3107
2800 $page = $hi - $lo if $page > $hi - $lo; 3108 $value = $hi - $page if $value > $hi - $page;
2801
2802 $value = $lo if $value < $lo; 3109 $value = $lo if $value < $lo;
2803 $value = $hi - $page if $value > $hi - $page;
2804 3110
2805 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3111 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2806 if $unit; 3112 if $unit;
2807 3113
2808 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3114 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2852sub invoke_mouse_wheel { 3158sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_; 3159 my ($self, $ev) = @_;
2854 3160
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3161 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856 3162
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3163 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2858 3164
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3165 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860 3166
2861 1 3167 1
2862} 3168}
… …
2872 my ($self) = @_; 3178 my ($self) = @_;
2873 3179
2874 unless ($self->{knob_w}) { 3180 unless ($self->{knob_w}) {
2875 $self->set_value ($self->{range}[0]); 3181 $self->set_value ($self->{range}[0]);
2876 3182
2877 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3183 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2878 my $range = ($hi - $page - $lo) || 1e-100; 3184 my $range = ($hi - $page - $lo) || 1e-10;
2879 3185
2880 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3186 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2881 3187
2882 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3188 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2883 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3189 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2884 3190
2885 $value = ($value - $lo) / $range; 3191 $value = ($value - $lo) / $range;
… …
2915 glDisable GL_TEXTURE_2D; 3221 glDisable GL_TEXTURE_2D;
2916} 3222}
2917 3223
2918############################################################################# 3224#############################################################################
2919 3225
2920package CFPlus::UI::ValSlider; 3226package DC::UI::ValSlider;
2921 3227
2922our @ISA = CFPlus::UI::HBox::; 3228our @ISA = DC::UI::HBox::;
2923 3229
2924sub new { 3230sub new {
2925 my ($class, %arg) = @_; 3231 my ($class, %arg) = @_;
2926 3232
2927 my $range = delete $arg{range}; 3233 my $range = delete $arg{range};
2928 3234
2929 my $self = $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3236 slider => (new DC::UI::Slider expand => 1, range => $range),
2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3237 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2932 to_value => sub { shift }, 3238 to_value => sub { shift },
2933 from_value => sub { shift }, 3239 from_value => sub { shift },
2934 %arg, 3240 %arg,
2935 ); 3241 );
2936 3242
… …
2956sub set_range { shift->{slider}->set_range (@_) } 3262sub set_range { shift->{slider}->set_range (@_) }
2957sub set_value { shift->{slider}->set_value (@_) } 3263sub set_value { shift->{slider}->set_value (@_) }
2958 3264
2959############################################################################# 3265#############################################################################
2960 3266
2961package CFPlus::UI::TextScroller; 3267package DC::UI::TextScroller;
2962 3268
2963our @ISA = CFPlus::UI::HBox::; 3269our @ISA = DC::UI::HBox::;
2964 3270
2965use CFPlus::OpenGL; 3271use DC::OpenGL;
2966 3272
2967sub new { 3273sub new {
2968 my $class = shift; 3274 my $class = shift;
2969 3275
2970 my $self = $class->SUPER::new ( 3276 my $self = $class->SUPER::new (
… …
2972 can_events => 1, 3278 can_events => 1,
2973 indent => 0, 3279 indent => 0,
2974 #font => default_font 3280 #font => default_font
2975 @_, 3281 @_,
2976 3282
2977 layout => (new CFPlus::Layout), 3283 layout => (new DC::Layout),
2978 par => [], 3284 par => [],
2979 max_par => 0, 3285 max_par => 0,
2980 height => 0, 3286 height => 0,
2981 children => [ 3287 children => [
2982 (new CFPlus::UI::Empty expand => 1), 3288 (new DC::UI::Empty expand => 1),
2983 (new CFPlus::UI::Slider vertical => 1), 3289 (new DC::UI::Slider vertical => 1),
2984 ], 3290 ],
2985 ); 3291 );
2986 3292
2987 $self->{children}[1]->connect (changed => sub { $self->update }); 3293 $self->{children}[1]->connect (changed => sub { $self->update });
2988 3294
… …
2997} 3303}
2998 3304
2999sub size_request { 3305sub size_request {
3000 my ($self) = @_; 3306 my ($self) = @_;
3001 3307
3002 my ($empty, $slider) = @{ $self->{children} }; 3308 my ($empty, $slider) = $self->visible_children;
3003 3309
3004 local $self->{children} = [$empty, $slider]; 3310 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3311 $self->SUPER::size_request
3006} 3312}
3007 3313
… …
3044 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3350 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3045 $layout->set_markup ($para->{markup}); 3351 $layout->set_markup ($para->{markup});
3046 3352
3047 $layout->set_shapes ( 3353 $layout->set_shapes (
3048 map 3354 map
3049 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3355 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3050 @{$para->{widget}} 3356 @{$para->{widget}}
3051 ); 3357 );
3052 3358
3053 $layout 3359 $layout
3054} 3360}
… …
3171 $ROOT->on_post_alloc ($self => sub { 3477 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate; 3478 $self->force_uptodate;
3173 3479
3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3480 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3175 3481
3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3482 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3177 glClearColor 0, 0, 0, 0; 3483 glClearColor 0, 0, 0, 0;
3178 glClear GL_COLOR_BUFFER_BIT; 3484 glClear GL_COLOR_BUFFER_BIT;
3179 3485
3180 package CFPlus::UI::Base; 3486 package DC::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3487 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h}); 3488 (0, 0, $self->{w}, $self->{h});
3183 3489
3184 my $top = int $self->{children}[1]{range}[0]; 3490 my $top = int $self->{children}[1]{range}[0];
3185 3491
… …
3196 3502
3197 if ($y0 < $y + $h && $y < $y1) { 3503 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3504 my $layout = $self->get_layout ($para);
3199 3505
3200 $layout->render ($para->{indent}, $y - $y0); 3506 $layout->render ($para->{indent}, $y - $y0);
3507 $layout->draw;
3201 3508
3202 if (my @w = @{ $para->{widget} }) { 3509 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3510 my @s = $layout->get_shapes;
3204 3511
3205 for (@w) { 3512 for (@w) {
… …
3243 $self->{children}[1]->draw; 3550 $self->{children}[1]->draw;
3244} 3551}
3245 3552
3246############################################################################# 3553#############################################################################
3247 3554
3248package CFPlus::UI::Animator; 3555package DC::UI::Animator;
3249 3556
3250use CFPlus::OpenGL; 3557use DC::OpenGL;
3251 3558
3252our @ISA = CFPlus::UI::Bin::; 3559our @ISA = DC::UI::Bin::;
3253 3560
3254sub moveto { 3561sub moveto {
3255 my ($self, $x, $y) = @_; 3562 my ($self, $x, $y) = @_;
3256 3563
3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3564 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3285 glPopMatrix; 3592 glPopMatrix;
3286} 3593}
3287 3594
3288############################################################################# 3595#############################################################################
3289 3596
3290package CFPlus::UI::Flopper; 3597package DC::UI::Flopper;
3291 3598
3292our @ISA = CFPlus::UI::Button::; 3599our @ISA = DC::UI::Button::;
3293 3600
3294sub new { 3601sub new {
3295 my $class = shift; 3602 my $class = shift;
3296 3603
3297 my $self = $class->SUPER::new ( 3604 my $self = $class->SUPER::new (
… …
3309 $self->{other}->toggle_visibility; 3616 $self->{other}->toggle_visibility;
3310} 3617}
3311 3618
3312############################################################################# 3619#############################################################################
3313 3620
3314package CFPlus::UI::Tooltip; 3621package DC::UI::Tooltip;
3315 3622
3316our @ISA = CFPlus::UI::Bin::; 3623our @ISA = DC::UI::Bin::;
3317 3624
3318use CFPlus::OpenGL; 3625use DC::OpenGL;
3319 3626
3320sub new { 3627sub new {
3321 my $class = shift; 3628 my $class = shift;
3322 3629
3323 $class->SUPER::new ( 3630 $class->SUPER::new (
… …
3327} 3634}
3328 3635
3329sub set_tooltip_from { 3636sub set_tooltip_from {
3330 my ($self, $widget) = @_; 3637 my ($self, $widget) = @_;
3331 3638
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
3334
3335 my $tooltip = $widget->{tooltip}; 3639 my $tip = $widget->{tooltip};
3640 $tip = $tip->($widget) if "CODE" eq ref $tip;
3641
3642 $tip = DC::Pod::section_label tooltip => $1
3643 if $tip =~ /^#(.*)$/;
3336 3644
3337 if ($ENV{CFPLUS_DEBUG} & 2) { 3645 if ($ENV{CFPLUS_DEBUG} & 2) {
3338 $tooltip .= "\n\n" . (ref $widget) . "\n" 3646 $tip .= "\n\n" . (ref $widget) . "\n"
3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3647 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3340 . "req $widget->{req_w} $widget->{req_h}\n" 3648 . "req $widget->{req_w} $widget->{req_h}\n"
3341 . "visible $widget->{visible}"; 3649 . "visible $widget->{visible}";
3342 } 3650 }
3343 3651
3344 $tooltip =~ s/^\n+//; 3652 $tip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//; 3653 $tip =~ s/\n+$//;
3346 3654
3347 $self->add (new CFPlus::UI::Label 3655 $self->add (new DC::UI::Label
3656 fg => $DC::THEME{tooltip_fg},
3348 markup => $tooltip, 3657 markup => $tip,
3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3658 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3659 align => 0,
3350 fontsize => 0.8, 3660 fontsize => 0.8,
3351 style => 1, # FLAG_INVERSE 3661 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3352 ellipsise => 0, 3662 ellipsise => 0,
3353 font => ($widget->{tooltip_font} || $::FONT_PROP), 3663 font => ($widget->{tooltip_font} || $::FONT_PROP),
3354 ); 3664 );
3355} 3665}
3356 3666
… …
3391} 3701}
3392 3702
3393sub _draw { 3703sub _draw {
3394 my ($self) = @_; 3704 my ($self) = @_;
3395 3705
3396 glTranslate 0.375, 0.375;
3397
3398 my ($w, $h) = @$self{qw(w h)}; 3706 my ($w, $h) = @$self{qw(w h)};
3399 3707
3400 glColor 1, 0.8, 0.4; 3708 glColor @{ $DC::THEME{tooltip_bg} };
3401 glBegin GL_QUADS; 3709 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3710
3408 glColor 0, 0, 0; 3711 glColor @{ $DC::THEME{tooltip_border} };
3409 glBegin GL_LINE_LOOP; 3712 glRect_lineloop .5, .5, $w + .5, $h + .5;
3410 glVertex 0 , 0;
3411 glVertex 0 , $h;
3412 glVertex $w, $h;
3413 glVertex $w, 0;
3414 glEnd;
3415 3713
3416 glTranslate 2 - 0.375, 2 - 0.375; 3714 glTranslate 2, 2;
3417 3715
3418 $self->SUPER::_draw; 3716 $self->SUPER::_draw;
3419} 3717}
3420 3718
3421############################################################################# 3719#############################################################################
3422 3720
3423package CFPlus::UI::Face; 3721package DC::UI::Face;
3424 3722
3425our @ISA = CFPlus::UI::DrawBG::; 3723our @ISA = DC::UI::DrawBG::;
3426 3724
3427use CFPlus::OpenGL; 3725use DC::OpenGL;
3428 3726
3429sub new { 3727sub new {
3430 my $class = shift; 3728 my $class = shift;
3431 3729
3432 my $self = $class->SUPER::new ( 3730 my $self = $class->SUPER::new (
… …
3435 aspect => 1, 3733 aspect => 1,
3436 can_events => 0, 3734 can_events => 0,
3437 @_, 3735 @_,
3438 ); 3736 );
3439 3737
3440 if ($self->{anim} && $self->{animspeed}) {
3441 CFPlus::weaken (my $widget = $self);
3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer (
3446 parked => 1,
3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
3450 ++$widget->{frame};
3451 $widget->update_face;
3452 $widget->update;
3453
3454 $widget->update_timer;
3455 },
3456 );
3457
3458 $self->update_face;
3459 $self->update_timer; 3738 $self->update_anim;
3460 }
3461 3739
3462 $self 3740 $self
3463} 3741}
3464 3742
3465sub update_timer { 3743sub update_timer {
3466 my ($self) = @_; 3744 my ($self) = @_;
3467 3745
3468 return unless $self->{timer}; 3746 return unless $self->{timer};
3469 3747
3470 if ($self->{visible}) { 3748 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start; 3749 $self->{timer}->start;
3477 } else { 3750 } else {
3478 $self->{timer}->stop; 3751 $self->{timer}->stop;
3479 } 3752 }
3480} 3753}
3481 3754
3482sub update_face { 3755sub update_face {
3483 my ($self) = @_; 3756 my ($self) = @_;
3484 3757
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
3496sub size_request {
3497 my ($self) = @_;
3498
3499 if ($::CONN) { 3758 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3759 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3760 if ($anim && @$anim) {
3502 $self->{tex} = $tex; 3761 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3762 delete $self->{face_change_cb};
3504 } else { 3763
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3764 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3506 $self->realloc; 3765 unless ($tex->{name} || $tex->{loading}) {
3766 $tex->upload (sub { $self->reconfigure });
3767 }
3507 }); 3768 }
3508 } 3769 }
3509 } 3770 }
3510 } 3771 }
3772}
3773
3774sub update_anim {
3775 my ($self) = @_;
3776
3777 if ($self->{anim} && $self->{animspeed}) {
3778 DC::weaken (my $widget = $self);
3779
3780 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3781 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3782 return unless $::CONN;
3783
3784 my $w = $widget
3785 or return;
3786
3787 ++$w->{frame};
3788 $w->update_face;
3789
3790 # somehow, $widget can go away
3791 $w->update;
3792 $w->update_timer;
3793 };
3794
3795 $self->update_face;
3796 $self->update_timer;
3797 } else {
3798 delete $self->{timer};
3799 }
3800}
3801
3802sub size_request {
3803 my ($self) = @_;
3804
3805 if ($::CONN) {
3806 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3807 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3808 if ($tex->{name}) {
3809 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3810 } elsif (!$tex->{loading}) {
3811 $tex->upload (sub { $self->reconfigure });
3812 }
3813 }
3814
3815 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3816 }
3817 }
3511 3818
3512 ($self->{size_w} || 8, $self->{size_h} || 8) 3819 ($self->{size_w} || 8, $self->{size_h} || 8)
3513} 3820}
3514 3821
3515sub update { 3822sub update {
3516 my ($self) = @_; 3823 my ($self) = @_;
3517 3824
3518 return unless $self->{visible}; 3825 return unless $self->{visible};
3519 3826
3520 $self->SUPER::update; 3827 $self->SUPER::update;
3828}
3829
3830sub set_face {
3831 my ($self, $face) = @_;
3832
3833 $self->{face} = $face;
3834 $self->reconfigure;
3835}
3836
3837sub set_anim {
3838 my ($self, $anim) = @_;
3839
3840 $self->{anim} = $anim;
3841 $self->update_anim;
3842}
3843
3844sub set_animspeed {
3845 my ($self, $animspeed) = @_;
3846
3847 $self->{animspeed} = $animspeed;
3848 $self->update_anim;
3521} 3849}
3522 3850
3523sub invoke_visibility_change { 3851sub invoke_visibility_change {
3524 my ($self) = @_; 3852 my ($self) = @_;
3525 3853
… …
3551 $self->SUPER::destroy; 3879 $self->SUPER::destroy;
3552} 3880}
3553 3881
3554############################################################################# 3882#############################################################################
3555 3883
3556package CFPlus::UI::Buttonbar; 3884package DC::UI::Buttonbar;
3557 3885
3558our @ISA = CFPlus::UI::HBox::; 3886our @ISA = DC::UI::HBox::;
3559 3887
3560# TODO: should actually wrap buttons and other goodies. 3888# TODO: should actually wrap buttons and other goodies.
3561 3889
3562############################################################################# 3890#############################################################################
3563 3891
3564package CFPlus::UI::Menu; 3892package DC::UI::Menu;
3565 3893
3566our @ISA = CFPlus::UI::Toplevel::; 3894our @ISA = DC::UI::Toplevel::;
3567 3895
3568use CFPlus::OpenGL; 3896use DC::OpenGL;
3569 3897
3570sub new { 3898sub new {
3571 my $class = shift; 3899 my $class = shift;
3572 3900
3573 my $self = $class->SUPER::new ( 3901 my $self = $class->SUPER::new (
3574 items => [], 3902 items => [],
3575 z => 100, 3903 z => 100,
3576 @_, 3904 @_,
3577 ); 3905 );
3578 3906
3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3907 $self->add ($self->{vbox} = new DC::UI::VBox);
3580 3908
3581 for my $item (@{ $self->{items} }) { 3909 for my $item (@{ $self->{items} }) {
3582 my ($widget, $cb, $tooltip) = @$item; 3910 my ($widget, $cb, $tooltip) = @$item;
3583 3911
3584 # handle various types of items, only text for now 3912 # handle various types of items, only text for now
3585 if (!ref $widget) { 3913 if (!ref $widget) {
3586 if ($widget =~ /\t/) { 3914 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2; 3915 my ($left, $right) = split /\t/, $widget, 2;
3588 3916
3589 $widget = new CFPlus::UI::HBox 3917 $widget = new DC::UI::HBox
3590 can_hover => 1, 3918 can_hover => 1,
3591 can_events => 1, 3919 can_events => 1,
3592 tooltip => $tooltip, 3920 tooltip => $tooltip,
3593 children => [ 3921 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3922 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3923 (new DC::UI::Label markup => $right, align => 1),
3596 ], 3924 ],
3597 ; 3925 ;
3598 3926
3599 } else { 3927 } else {
3600 $widget = new CFPlus::UI::Label 3928 $widget = new DC::UI::Label
3601 can_hover => 1, 3929 can_hover => 1,
3602 can_events => 1, 3930 can_events => 1,
3931 align => 0,
3603 markup => $widget, 3932 markup => $widget,
3604 tooltip => $tooltip; 3933 tooltip => $tooltip;
3605 } 3934 }
3606 } 3935 }
3607 3936
… …
3622 # maybe save $GRAB? must be careful about events... 3951 # maybe save $GRAB? must be careful about events...
3623 $GRAB = $self; 3952 $GRAB = $self;
3624 $self->{button} = $ev->{button}; 3953 $self->{button} = $ev->{button};
3625 3954
3626 $self->show; 3955 $self->show;
3627 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3956
3957 my $x = $ev->{x};
3958 my $y = $ev->{y};
3959
3960 $self->{root}->on_post_alloc ($self => sub {
3961 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3962 });
3963
3964 1 # so it can be used inside event handlers
3628} 3965}
3629 3966
3630sub invoke_mouse_motion { 3967sub invoke_mouse_motion {
3631 my ($self, $ev, $x, $y) = @_; 3968 my ($self, $ev, $x, $y) = @_;
3632 3969
… …
3653 1 3990 1
3654} 3991}
3655 3992
3656############################################################################# 3993#############################################################################
3657 3994
3658package CFPlus::UI::Multiplexer; 3995package DC::UI::Multiplexer;
3659 3996
3660our @ISA = CFPlus::UI::Container::; 3997our @ISA = DC::UI::Container::;
3661 3998
3662sub new { 3999sub new {
3663 my $class = shift; 4000 my $class = shift;
3664 4001
3665 my $self = $class->SUPER::new ( 4002 my $self = $class->SUPER::new (
3666 @_, 4003 @_,
3667 ); 4004 );
3668 4005
3669 $self->{current} = $self->{children}[0] 4006 $self->set_current_page (0);
3670 if @{ $self->{children} };
3671 4007
3672 $self 4008 $self
3673} 4009}
3674 4010
3675sub add { 4011sub add {
3676 my ($self, @widgets) = @_; 4012 my ($self, @widgets) = @_;
3677 4013
3678 $self->SUPER::add (@widgets); 4014 $self->SUPER::add (@widgets);
3679 4015
3680 $self->{current} = $self->{children}[0] 4016 $self->set_current_page (0)
3681 if @{ $self->{children} }; 4017 if @widgets == @{ $self->{children} };
3682} 4018}
3683 4019
3684sub get_current_page { 4020sub get_current_page {
3685 my ($self) = @_; 4021 my ($self) = @_;
3686 4022
… …
3692 4028
3693 my $widget = ref $page_or_widget 4029 my $widget = ref $page_or_widget
3694 ? $page_or_widget 4030 ? $page_or_widget
3695 : $self->{children}[$page_or_widget]; 4031 : $self->{children}[$page_or_widget];
3696 4032
4033 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4034
3697 $self->{current} = $widget; 4035 if (($self->{current} = $widget)) {
4036 $self->{current}->set_visible if $self->{current} && $self->{visible};
3698 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4037 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3699 4038
3700 $self->emit (page_changed => $self->{current}); 4039 $self->emit (page_changed => $self->{current});
4040 }
3701 4041
3702 $self->realloc; 4042 $self->realloc;
3703} 4043}
3704 4044
3705sub visible_children { 4045sub visible_children {
3706 $_[0]{current} 4046 $_[0]{current} || ()
3707} 4047}
3708 4048
3709sub size_request { 4049sub size_request {
3710 my ($self) = @_; 4050 my ($self) = @_;
3711 4051
4052 $self->{current}
3712 $self->{current}->size_request 4053 ? $self->{current}->size_request
4054 : (0, 0)
3713} 4055}
3714 4056
3715sub invoke_size_allocate { 4057sub invoke_size_allocate {
3716 my ($self, $w, $h) = @_; 4058 my ($self, $w, $h) = @_;
3717 4059
3718 $self->{current}->configure (0, 0, $w, $h); 4060 $self->{current}->configure (0, 0, $w, $h)
4061 if $self->{current};
3719 4062
3720 1 4063 1
3721} 4064}
3722 4065
3723sub _draw { 4066sub _draw {
3724 my ($self) = @_; 4067 my ($self) = @_;
3725 4068
3726 $self->{current}->draw; 4069 $self->{current}->draw
4070 if $self->{current};
3727} 4071}
3728 4072
3729############################################################################# 4073#############################################################################
3730 4074
3731package CFPlus::UI::Notebook; 4075package DC::UI::Notebook;
3732 4076
4077use DC::OpenGL;
4078
3733our @ISA = CFPlus::UI::VBox::; 4079our @ISA = DC::UI::VBox::;
3734 4080
3735sub new { 4081sub new {
3736 my $class = shift; 4082 my $class = shift;
3737 4083
3738 my $self = $class->SUPER::new ( 4084 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar), 4085 buttonbar => (new DC::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4086 multiplexer => (new DC::UI::Multiplexer expand => 1),
4087 active_outline => [.7, .7, 0.2],
3741 # filter => # will be put between multiplexer and $self 4088 # filter => # will be put between multiplexer and $self
3742 @_, 4089 @_,
3743 ); 4090 );
3744 4091
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4092 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4093 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 4094
4095 {
4096 Scalar::Util::weaken (my $wself = $self);
4097
4098 $self->{multiplexer}->connect (c_add => sub {
4099 my ($mplex, $widgets) = @_;
4100
4101 for my $child (@$widgets) {
4102 Scalar::Util::weaken $child;
4103 $child->{c_tab_} ||= do {
4104 my $tab =
4105 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4106 ? $child->{c_tab}
4107 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4108
4109 $tab->connect (activate => sub {
4110 $wself->set_current_page ($child);
4111 });
4112
4113 $tab
4114 };
4115
4116 $self->{buttonbar}->add ($child->{c_tab_});
4117 }
4118 });
4119
4120 $self->{multiplexer}->connect (c_remove => sub {
4121 my ($mplex, $widgets) = @_;
4122
4123 for my $child (@$widgets) {
4124 $wself->{buttonbar}->remove ($child->{c_tab_});
4125 }
4126 });
4127 }
4128
3748 $self 4129 $self
3749} 4130}
3750 4131
3751sub add { 4132sub add {
4133 my ($self, @widgets) = @_;
4134
4135 $self->{multiplexer}->add (@widgets)
4136}
4137
4138sub remove {
4139 my ($self, @widgets) = @_;
4140
4141 $self->{multiplexer}->remove (@widgets)
4142}
4143
4144sub pages {
4145 my ($self) = @_;
4146 $self->{multiplexer}->children
4147}
4148
4149sub page_index {
4150 my ($self, $widget) = @_;
4151
4152 my $i = 0;
4153 for ($self->pages) {
4154 if ($_ eq $widget) { return $i };
4155 $i++;
4156 }
4157
4158 undef
4159}
4160
4161sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 4162 my ($self, $title, $widget, $tooltip) = @_;
3753 4163
3754 CFPlus::weaken $self; 4164 $title = [$title, $tooltip] unless ref $title;
4165 $widget->{c_tab} = $title;
3755 4166
3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3758 markup => $title,
3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3764 $self->{buttonbar}->add ($title);
3765
3766 $self->{multiplexer}->add ($widget); 4167 $self->add ($widget);
3767} 4168}
3768 4169
3769sub get_current_page { 4170sub get_current_page {
3770 my ($self) = @_; 4171 my ($self) = @_;
3771 4172
… …
3777 4178
3778 $self->{multiplexer}->set_current_page ($page); 4179 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current}); 4180 $self->emit (page_changed => $self->{multiplexer}{current});
3780} 4181}
3781 4182
4183sub _draw {
4184 my ($self) = @_;
4185
4186 $self->SUPER::_draw ();
4187
4188 if (my $cur = $self->{multiplexer}{current}) {
4189 if ($cur = $cur->{c_tab_}) {
4190 glTranslate $self->{buttonbar}{x} + $cur->{x},
4191 $self->{buttonbar}{y} + $cur->{y};
4192 glLineWidth 3;
4193 #glEnable GL_BLEND;
4194 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4195 glColor @{$self->{active_outline}};
4196 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4197 glLineWidth 1;
4198 #glDisable GL_BLEND;
4199 }
4200 }
4201}
4202
3782############################################################################# 4203#############################################################################
3783 4204
3784package CFPlus::UI::Selector; 4205package DC::UI::Selector;
3785 4206
3786use utf8; 4207use utf8;
3787 4208
3788our @ISA = CFPlus::UI::Button::; 4209our @ISA = DC::UI::Button::;
3789 4210
3790sub new { 4211sub new {
3791 my $class = shift; 4212 my $class = shift;
3792 4213
3793 my $self = $class->SUPER::new ( 4214 my $self = $class->SUPER::new (
… …
3810 my ($value, $title, $tooltip) = @$_; 4231 my ($value, $title, $tooltip) = @$_;
3811 4232
3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4233 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3813 } 4234 }
3814 4235
3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4236 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3816} 4237}
3817 4238
3818sub _set_value { 4239sub _set_value {
3819 my ($self, $value) = @_; 4240 my ($self, $value) = @_;
3820 4241
3821 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4242 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4243 $item ||= $self->{options}[0]
3822 or return; 4244 or return;
3823 4245
3824 $self->{value} = $item->[0]; 4246 $self->{value} = $item->[0];
3825 $self->set_markup ("$item->[1] ⇓"); 4247 $self->set_markup ("$item->[1] ⇓");
3826 $self->set_tooltip ($item->[2]); 4248# $self->set_tooltip ($item->[2]);
3827} 4249}
3828 4250
3829sub set_value { 4251sub set_value {
3830 my ($self, $value) = @_; 4252 my ($self, $value) = @_;
3831 4253
… …
3833 4255
3834 $self->_set_value ($value); 4256 $self->_set_value ($value);
3835 $self->emit (changed => $value); 4257 $self->emit (changed => $value);
3836} 4258}
3837 4259
4260sub set_options {
4261 my ($self, $options) = @_;
4262
4263 $self->{options} = $options;
4264 $self->_set_value ($self->{value});
4265}
4266
3838############################################################################# 4267#############################################################################
3839 4268
3840package CFPlus::UI::Statusbox; 4269package DC::UI::Statusbox;
3841 4270
3842our @ISA = CFPlus::UI::VBox::; 4271our @ISA = DC::UI::VBox::;
3843 4272
3844sub new { 4273sub new {
3845 my $class = shift; 4274 my $class = shift;
3846 4275
3847 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
3848 fontsize => 0.8, 4277 fontsize => 0.8,
3849 @_, 4278 @_,
3850 ); 4279 );
3851 4280
3852 CFPlus::weaken (my $this = $self); 4281 DC::weaken (my $this = $self);
3853 4282
3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4283 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3855 4284
3856 $self 4285 $self
3857} 4286}
3858 4287
3859sub reorder { 4288sub reorder {
3860 my ($self) = @_; 4289 my ($self) = @_;
3861 my $NOW = Time::HiRes::time; 4290 my $NOW = EV::time;
3862 4291
3863 # freeze display when hovering over any label 4292 # freeze display when hovering over any label
3864 return if $CFPlus::UI::TOOLTIP->{owner} 4293 return if $DC::UI::TOOLTIP->{owner}
3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4294 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3866 values %{ $self->{item} }; 4295 values %{ $self->{item} };
3867 4296
3868 while (my ($k, $v) = each %{ $self->{item} }) { 4297 while (my ($k, $v) = each %{ $self->{item} }) {
3869 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4298 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3870 } 4299 }
4300
4301 $self->{timer}->set (1, 1);
3871 4302
3872 my @widgets; 4303 my @widgets;
3873 4304
3874 my @items = sort { 4305 my @items = sort {
3875 $a->{pri} <=> $b->{pri} 4306 $a->{pri} <=> $b->{pri}
3876 or $b->{id} <=> $a->{id} 4307 or $b->{id} <=> $a->{id}
3877 } values %{ $self->{item} }; 4308 } values %{ $self->{item} };
3878
3879 $self->{timer}->interval (1);
3880 4309
3881 my $count = 10 + 1; 4310 my $count = 10 + 1;
3882 for my $item (@items) { 4311 for my $item (@items) {
3883 last unless --$count; 4312 last unless --$count;
3884 4313
… …
3891 for ($short) { 4320 for ($short) {
3892 s/^\s+//; 4321 s/^\s+//;
3893 s/\s+/ /g; 4322 s/\s+/ /g;
3894 } 4323 }
3895 4324
3896 new CFPlus::UI::Label 4325 new DC::UI::Label
3897 markup => $short, 4326 markup => $short,
3898 tooltip => $item->{tooltip}, 4327 tooltip => $item->{tooltip},
3899 tooltip_font => $::FONT_PROP, 4328 tooltip_font => $::FONT_PROP,
3900 tooltip_width => 0.67, 4329 tooltip_width => 0.67,
3901 fontsize => $item->{fontsize} || $self->{fontsize}, 4330 fontsize => $item->{fontsize} || $self->{fontsize},
3902 max_w => $::WIDTH * 0.44, 4331 max_w => $::WIDTH * 0.44,
4332 align => 0,
3903 fg => [@{ $item->{fg} }], 4333 fg => [@{ $item->{fg} }],
3904 can_events => 1, 4334 can_events => 1,
3905 can_hover => 1 4335 can_hover => 1
3906 }; 4336 };
3907 4337
3908 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4338 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3909 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4339 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3910 $label->update; 4340 $label->update;
3911 $label->set_max_size (undef, $label->{req_h} * $diff) 4341 $label->set_max_size (undef, $label->{req_h} * $diff)
3912 if $diff < 1; 4342 if $diff < 1;
3913 $self->{timer}->interval (1/30); 4343 $self->{timer}->set (1/30, 1/30);
3914 } else { 4344 } else {
3915 $label->{fg}[3] = $item->{fg}[3] || 1; 4345 $label->{fg}[3] = $item->{fg}[3] || 1;
3916 } 4346 }
3917 4347
3918 push @widgets, $label; 4348 push @widgets, $label;
3919 } 4349 }
4350
4351 my $hash = join ",", @widgets;
4352 return if $hash eq $self->{last_widget_hash};
4353 $self->{last_widget_hash} = $hash;
3920 4354
3921 $self->clear; 4355 $self->clear;
3922 $self->SUPER::add (reverse @widgets); 4356 $self->SUPER::add (reverse @widgets);
3923} 4357}
3924 4358
… …
3980 $self->SUPER::destroy; 4414 $self->SUPER::destroy;
3981} 4415}
3982 4416
3983############################################################################# 4417#############################################################################
3984 4418
3985package CFPlus::UI::Root; 4419package DC::UI::Root;
3986 4420
3987our @ISA = CFPlus::UI::Container::; 4421our @ISA = DC::UI::Container::;
3988 4422
3989use List::Util qw(min max); 4423use List::Util qw(min max);
3990 4424
3991use CFPlus::OpenGL; 4425use DC::OpenGL;
3992 4426
3993sub new { 4427sub new {
3994 my $class = shift; 4428 my $class = shift;
3995 4429
3996 my $self = $class->SUPER::new ( 4430 my $self = $class->SUPER::new (
3997 visible => 1, 4431 visible => 1,
3998 @_, 4432 @_,
3999 ); 4433 );
4000 4434
4001 CFPlus::weaken ($self->{root} = $self); 4435 DC::weaken ($self->{root} = $self);
4002 4436
4003 $self 4437 $self
4004} 4438}
4005 4439
4006sub size_request { 4440sub size_request {
… …
4054} 4488}
4055 4489
4056sub update { 4490sub update {
4057 my ($self) = @_; 4491 my ($self) = @_;
4058 4492
4059 $::WANT_REFRESH++; 4493 $::WANT_REFRESH = 1;
4060} 4494}
4061 4495
4062sub add { 4496sub add {
4063 my ($self, @children) = @_; 4497 my ($self, @children) = @_;
4064 4498
… …
4131 4565
4132 delete $queue{$widget+0}; 4566 delete $queue{$widget+0};
4133 4567
4134 my ($w, $h) = $widget->size_request; 4568 my ($w, $h) = $widget->size_request;
4135 4569
4136 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4570 $w += $widget->{padding_x} * 2;
4137 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4571 $h += $widget->{padding_y} * 2;
4572
4573 $w = max $widget->{min_w}, $w;
4574 $h = max $widget->{min_h}, $h;
4138 4575
4139 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4576 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4140 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4577 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4141 4578
4142 $w = $widget->{force_w} if exists $widget->{force_w}; 4579 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4646 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4210 glMatrixMode GL_MODELVIEW; 4647 glMatrixMode GL_MODELVIEW;
4211 glLoadIdentity; 4648 glLoadIdentity;
4212 4649
4213 { 4650 {
4214 package CFPlus::UI::Base; 4651 package DC::UI::Base;
4215 4652
4216 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4653 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4217 (0, 0, $self->{w}, $self->{h}); 4654 (0, 0, $self->{w}, $self->{h});
4218 4655
4219 $self->_draw; 4656 $self->_draw;
4220 } 4657 }
4221} 4658}
4222 4659
4223############################################################################# 4660#############################################################################
4224 4661
4225package CFPlus::UI; 4662package DC::UI;
4226 4663
4227$ROOT = new CFPlus::UI::Root; 4664$ROOT = new DC::UI::Root;
4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4665$TOOLTIP = new DC::UI::Tooltip z => 900;
4229 4666
42301 46671
4231

Diff Legend

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