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.408 by root, Sun Jul 22 15:26:01 2007 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Event; 7use AnyEvent ();
8use Guard ();
8 9
9use CFPlus; 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 common::sense;
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 common::sense;
649
625use CFPlus::OpenGL; 650use DC::OpenGL;
626 651
627sub new { 652sub new {
628 my $class = shift; 653 my $class = shift;
629
630 # range [value, low, high, page]
631 654
632 $class->SUPER::new ( 655 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 656 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
635 @_ 658 @_
636 ) 659 )
637} 660}
638 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
639sub _draw { 669sub _draw {
640 my ($self) = @_; 670 my ($self) = @_;
641 671
642 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
643 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
644 : $self->{bg}; 674 : $self->{bg};
645 675
646 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
647 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
648 678
649 glEnable GL_BLEND; 679 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 681 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 682 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 683 glDisable GL_BLEND;
661 } 684 }
662} 685}
663 686
664############################################################################# 687#############################################################################
665 688
666package CFPlus::UI::Empty; 689package DC::UI::Empty;
667 690
668our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
669 692
670sub new { 693sub new {
671 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
673} 696}
680 703
681sub draw { } 704sub draw { }
682 705
683############################################################################# 706#############################################################################
684 707
685package CFPlus::UI::Container; 708package DC::UI::Container;
686 709
687our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
688 711
689sub new { 712sub new {
690 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
691 714
692 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
725 @{$self->{children}}, @widgets 748 @{$self->{children}}, @widgets
726 ]; 749 ];
727 750
728 $self->realloc; 751 $self->realloc;
729 752
753 $self->emit (c_add => \@widgets);
754
730 map $_+0, @widgets 755 map $_+0, @widgets
731} 756}
732 757
733sub children { 758sub children {
734 @{ $_[0]{children} } 759 @{ $_[0]{children} }
735} 760}
736 761
737sub remove { 762sub remove {
738 my ($self, $child) = @_; 763 my ($self, @widgets) = @_;
739 764
765 $self->emit (c_remove => \@widgets);
766
767 for my $child (@widgets) {
740 delete $child->{parent}; 768 delete $child->{parent};
741 $child->hide; 769 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
771 }
744 772
745 $self->realloc; 773 $self->realloc;
746} 774}
747 775
748sub clear { 776sub clear {
776} 804}
777 805
778sub _draw { 806sub _draw {
779 my ($self) = @_; 807 my ($self) = @_;
780 808
781 $_->draw for @{$self->{children}}; 809 $_->draw for $self->visible_children;
782} 810}
783 811
784############################################################################# 812#############################################################################
785 813
786package CFPlus::UI::Bin; 814package DC::UI::Bin;
787 815
788our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
789 817
790sub new { 818sub new {
791 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
792 820
793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
794 822
795 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
796} 824}
797 825
798sub add { 826sub add {
799 my ($self, $child) = @_; 827 my ($self, $child) = @_;
800 828
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 829 $self->clear;
802 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
803} 831}
804 832
805sub remove { 833sub remove {
806 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
807 835
808 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
809 837
810 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
811 unless @{$self->{children}}; 839 unless @{$self->{children}};
812} 840}
813 841
814sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
815 843
824 852
825 1 853 1
826} 854}
827 855
828############################################################################# 856#############################################################################
829
830# back-buffered drawing area 857# back-buffered drawing area
831 858
832package CFPlus::UI::Window; 859package DC::UI::Window;
833 860
834our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
835 862
836use CFPlus::OpenGL; 863use DC::OpenGL;
837 864
838sub new { 865sub new {
839 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
840 867
841 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
863} 890}
864 891
865sub render_child { 892sub render_child {
866 my ($self) = @_; 893 my ($self) = @_;
867 894
868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
870 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
871 898
872 { 899 {
873 package CFPlus::UI::Base; 900 package DC::UI::Base;
874 901
875 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
877 904
878 $self->_render; 905 $self->_render;
895 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
896} 923}
897 924
898############################################################################# 925#############################################################################
899 926
900package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
901 928
902use List::Util qw(min max); 929use List::Util qw(min max);
903 930
904our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
905 932
906sub new { 933sub new {
907 my $class = shift; 934 my $class = shift;
908 935
909 $class->SUPER::new ( 936 $class->SUPER::new (
951 $self->emit (changed => $x, $y); 978 $self->emit (changed => $x, $y);
952 $self->update; 979 $self->update;
953 } 980 }
954} 981}
955 982
983sub set_center {
984 my ($self, $x, $y) = @_;
985
986 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
987}
988
989sub make_visible {
990 my ($self, $x, $y, $border) = @_;
991
992 if ( $x < $self->{view_x} + $self->{w} * $border
993 || $x > $self->{view_x} + $self->{w} * (1 - $border)
994 || $y < $self->{view_y} + $self->{h} * $border
995 || $y > $self->{view_y} + $self->{h} * (1 - $border)
996 ) {
997 $self->set_center ($x, $y);
998 }
999}
1000
956# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 1002sub coord2local {
958 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
959 1004
960 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1005 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
977 ) { 1022 ) {
978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979 } else { 1024 } else {
980 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
981 } 1026 }
982} 1027}
983 1028
984sub _render { 1029sub _render {
985 my ($self) = @_; 1030 my ($self) = @_;
986 1031
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 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}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989 1034
990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991 1036
992 $self->SUPER::_render; 1037 $self->SUPER::_render;
993} 1038}
994 1039
995############################################################################# 1040#############################################################################
996 1041
997package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
998 1043
999our @ISA = CFPlus::UI::Table::; 1044our @ISA = DC::UI::Table::;
1000 1045
1001sub new { 1046sub new {
1002 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1003 1048
1004 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1005 1050
1006 my $self; 1051 my $self;
1007 1052
1008 my $hslider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1009 col => 0, 1054 c_col => 0,
1010 row => 1, 1055 c_row => 1,
1011 vertical => 0, 1056 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1058 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1059 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1061 },
1017 ; 1062 ;
1018 1063
1019 my $vslider = new CFPlus::UI::Slider 1064 my $vslider = new DC::UI::Slider
1020 col => 1, 1065 c_col => 1,
1021 row => 0, 1066 c_row => 0,
1022 vertical => 1, 1067 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1069 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1070 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 col_expand => [1, 0], 1081 col_expand => [1, 0],
1037 row_expand => [1, 0], 1082 row_expand => [1, 0],
1038 %arg, 1083 %arg,
1039 ); 1084 );
1040 1085
1041 $self->{vp} = new CFPlus::UI::ViewPort 1086 $self->{vp} = new DC::UI::ViewPort
1042 col => 0, 1087 c_col => 0,
1043 row => 0, 1088 c_row => 0,
1044 expand => 1, 1089 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1090 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1091 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1092 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1093 my ($vp, $x, $y) = @_;
1070 my ($self, $widget) = @_; 1115 my ($self, $widget) = @_;
1071 1116
1072 $self->{vp}->add ($self->{child} = $widget); 1117 $self->{vp}->add ($self->{child} = $widget);
1073} 1118}
1074 1119
1120sub set_offset { shift->{vp}->set_offset (@_) }
1121sub set_center { shift->{vp}->set_center (@_) }
1122sub make_visible { shift->{vp}->make_visible (@_) }
1123
1075sub update_slider { 1124sub update_slider {
1076 my ($self) = @_; 1125 my ($self) = @_;
1077 1126
1078 my $child = ($self->{vp} or return)->child; 1127 my $child = ($self->{vp} or return)->child;
1079 1128
1168 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1169} 1218}
1170 1219
1171############################################################################# 1220#############################################################################
1172 1221
1173package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1174 1223
1175our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1176 1225
1177use CFPlus::OpenGL; 1226use DC::OpenGL;
1178 1227
1179sub new { 1228sub new {
1180 my $class = shift; 1229 my $class = shift;
1181 1230
1182 $class->SUPER::new ( 1231 $class->SUPER::new (
1192 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1193 1242
1194 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1206 } 1248 }
1207 1249
1208 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1209} 1251}
1210 1252
1211############################################################################# 1253#############################################################################
1212 1254
1213package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1214 1256
1215our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1216 1258
1217use CFPlus::OpenGL; 1259use DC::OpenGL;
1218 1260
1219sub new { 1261sub new {
1220 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1221 1263
1222 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1224 align => 1, 1266 align => 1,
1225 valign => 0, 1267 valign => 0.5,
1226 text => $arg{label}, 1268 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1228 } 1270 }
1229 1271
1230 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1231 # label => "", 1273 # label => "",
1232 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1233 border => 0.8, 1275 border => 0.8,
1234 style => 'single', 1276 style => 'single',
1235 %arg, 1277 %arg,
1236 ); 1278 );
1237 1279
1240 1282
1241sub add { 1283sub add {
1242 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1243 1285
1244 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246} 1288}
1247 1289
1248sub border { 1290sub border {
1249 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1250} 1292}
1290 my $border = $self->border; 1332 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1292 1334
1293 $child->draw; 1335 $child->draw;
1294 1336
1295 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 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; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1308 } 1350 }
1309} 1351}
1310 1352
1311############################################################################# 1353#############################################################################
1312 1354
1313package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1314 1356
1315our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1316 1358
1317use CFPlus::OpenGL; 1359use DC::OpenGL;
1318 1360
1319my $bg = 1361my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1321 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1322 1364
1323my @border = 1365my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 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); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326 1368
1327my @icon = 1369my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png); 1371 qw(x1_move.png x1_resize.png);
1330 1372
1331sub new { 1373sub new {
1332 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1333 1375
1334 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1337 border => 0.6, 1379 border => 0.8,
1338 can_events => 1, 1380 can_events => 1,
1339 min_w => 64, 1381 min_w => 64,
1340 min_h => 32, 1382 min_h => 32,
1341 %arg, 1383 %arg,
1342 ); 1384 );
1343 1385
1344 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1345 align => 0, 1387 align => 0.5,
1346 valign => 1, 1388 valign => 1,
1347 text => $self->{title}, 1389 text => $self->{title},
1348 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1349 if exists $self->{title}; 1391 if exists $self->{title};
1350 1392
1351 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1352 $self->{close_button} = 1394 $self->{close_button} =
1353 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1354 path => 'x1_close.png', 1396 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1356 1398
1357 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1358 } 1400 }
1359 1401
1360 $self 1402 $self
1361} 1403}
1362 1404
1363sub add { 1405sub add {
1364 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1365 1407
1366 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $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}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369} 1411}
1370 1412
1371sub border { 1413sub border {
1372 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1415}
1416
1417sub get_max_wh {
1418 my ($self) = @_;
1419
1420 return ($self->{w}, $self->{h})
1421 if $self->{visible} && $self->{w};
1422
1423 $self->SUPER::get_max_wh
1373} 1424}
1374 1425
1375sub size_request { 1426sub size_request {
1376 my ($self) = @_; 1427 my ($self) = @_;
1377 1428
1502 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504 1555
1505 my $border = $self->border; 1556 my $border = $self->border;
1506 1557
1558 if ($border) {
1507 glColor @{ $self->{border_bg} }; 1559 glColor @{ $self->{border_bg} };
1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1560 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1561 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1562 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1563 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512 1564
1513 # move 1565 # move
1514 my $w2 = ($w - $border) * .5; 1566 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5; 1567 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1570 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519 1571
1520 # resize 1572 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1573 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1574 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button}; 1575 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1577 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1578 }
1526 1579
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1580 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1581 glColor @{ $self->{bg} };
1529 1582
1530 # TODO: repeat texture not scale 1583 # TODO: repeat texture not scale
1549 if $self->{close_button}; 1602 if $self->{close_button};
1550} 1603}
1551 1604
1552############################################################################# 1605#############################################################################
1553 1606
1554package CFPlus::UI::Table; 1607package DC::UI::Table;
1555 1608
1556our @ISA = CFPlus::UI::Container::; 1609our @ISA = DC::UI::Container::;
1557 1610
1558use List::Util qw(max sum); 1611use List::Util qw(max sum);
1559 1612
1560use CFPlus::OpenGL; 1613use DC::OpenGL;
1561 1614
1562sub new { 1615sub new {
1563 my $class = shift; 1616 my $class = shift;
1564 1617
1565 $class->SUPER::new ( 1618 $class->SUPER::new (
1571 1624
1572sub add { 1625sub add {
1573 my ($self, @widgets) = @_; 1626 my ($self, @widgets) = @_;
1574 1627
1575 for my $child (@widgets) { 1628 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1629 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1630 $child->{c_colspan} ||= 1;
1578 } 1631 }
1579 1632
1580 $self->SUPER::add (@widgets); 1633 $self->SUPER::add (@widgets);
1581} 1634}
1582 1635
1586 my @widgets; 1639 my @widgets;
1587 1640
1588 while (@_) { 1641 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1642 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1643
1591 $child->{row} = $row; 1644 $child->{c_row} = $row;
1592 $child->{col} = $col; 1645 $child->{c_col} = $col;
1593 1646
1594 push @widgets, $child; 1647 push @widgets, $child;
1595 } 1648 }
1596 1649
1597 $self->add (@widgets); 1650 $self->add (@widgets);
1603 my (@w, @h); 1656 my (@w, @h);
1604 1657
1605 my @children = $self->children; 1658 my @children = $self->children;
1606 1659
1607 # first pass, columns 1660 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1661 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1662 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1663
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1664 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1665
1613 if ($w > $sw) { 1666 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1667 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1668 }
1616 } 1669 }
1617 1670
1618 # second pass, rows 1671 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1672 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1673 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1674
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1675 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1676
1624 if ($h > $sh) { 1677 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1678 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626 } 1679 }
1627 } 1680 }
1628 1681
1629 (\@w, \@h) 1682 (\@w, \@h)
1630} 1683}
1653 @col_expand = (1) x @$ws unless @col_expand; 1706 @col_expand = (1) x @$ws unless @col_expand;
1654 my $col_expand = (sum @col_expand) || 1; 1707 my $col_expand = (sum @col_expand) || 1;
1655 1708
1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1709 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657 1710
1658 CFPlus::UI::harmonize $ws; 1711 DC::UI::harmonize $ws;
1659 1712
1660 my @row_expand = @{$self->{row_expand}}; 1713 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand; 1714 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1; 1715 my $row_expand = (sum @row_expand) || 1;
1663 1716
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1717 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665 1718
1666 CFPlus::UI::harmonize $hs; 1719 DC::UI::harmonize $hs;
1667 1720
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1721 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1722 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1723
1671 for my $widget ($self->children) { 1724 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1725 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1726
1674 $widget->configure ( 1727 $widget->configure (
1675 $x[$c], $y[$r], 1728 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1729 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1730 );
1680 1 1733 1
1681} 1734}
1682 1735
1683############################################################################# 1736#############################################################################
1684 1737
1685package CFPlus::UI::Fixed; 1738package DC::UI::Fixed;
1686 1739
1687use List::Util qw(min max); 1740use List::Util qw(min max);
1688 1741
1689our @ISA = CFPlus::UI::Container::; 1742our @ISA = DC::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697 1743
1698sub _scale($$$) { 1744sub _scale($$$) {
1699 my ($mode, $val, $max) = @_; 1745 my ($rel, $val, $max) = @_;
1700 1746
1701 $mode eq "abs" ? $val 1747 $rel ? $val * $max : $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704} 1748}
1705 1749
1706sub size_request { 1750sub size_request {
1707 my ($self) = @_; 1751 my ($self) = @_;
1708 1752
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710 1754
1711 # determine overall size by querying abs widgets 1755 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) { 1756 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1757 unless ($child->{c_rel}) {
1758 my $x = $child->{c_x};
1759 my $y = $child->{c_y};
1714 1760
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1761 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1762 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721 } 1763 }
1722 } 1764 }
1723 1765
1724 my $W = $x2 - $x1; 1766 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1; 1767 my $H = $y2 - $y1;
1726 1768
1727 # now layout remaining widgets 1769 # now layout remaining widgets
1728 for my $child ($self->visible_children) { 1770 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1771 if ($child->{c_rel}) {
1772 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1773 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730 1774
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739 } 1777 }
1740 } 1778 }
1741 1779
1742 my $W = $x2 - $x1; 1780 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1; 1781 my $H = $y2 - $y1;
1747 1785
1748sub invoke_size_allocate { 1786sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_; 1787 my ($self, $W, $H) = @_;
1750 1788
1751 for my $child ($self->visible_children) { 1789 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1790 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1791 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753 1792
1754 $x = _scale $pos, $x, $W; 1793 $x += $child->{c_halign} * $child->{req_w};
1755 $y = _scale $pos, $x, $H; 1794 $y += $child->{c_valign} * $child->{req_h};
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758 1795
1759 $child->configure ($x, $y, $w, $h); 1796 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760 } 1797 }
1761 1798
1762 1 1799 1
1763} 1800}
1764 1801
1765############################################################################# 1802#############################################################################
1766 1803
1767package CFPlus::UI::Box; 1804package DC::UI::Box;
1768 1805
1769our @ISA = CFPlus::UI::Container::; 1806our @ISA = DC::UI::Container::;
1770 1807
1771sub size_request { 1808sub size_request {
1772 my ($self) = @_; 1809 my ($self) = @_;
1810
1811 my @children = $self->visible_children;
1773 1812
1774 $self->{vertical} 1813 $self->{vertical}
1775 ? ( 1814 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1815 (List::Util::max map $_->{req_w}, @children),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1816 (List::Util::sum map $_->{req_h}, @children),
1778 ) 1817 )
1779 : ( 1818 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1819 (List::Util::sum map $_->{req_w}, @children),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1820 (List::Util::max map $_->{req_h}, @children),
1782 ) 1821 )
1783} 1822}
1784 1823
1785sub invoke_size_allocate { 1824sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_; 1825 my ($self, $w, $h) = @_;
1807 $req[$_] += $space * $children[$_]{expand} 1846 $req[$_] += $space * $children[$_]{expand}
1808 for 0 .. $#children; 1847 for 0 .. $#children;
1809 } 1848 }
1810 } 1849 }
1811 1850
1812 CFPlus::UI::harmonize \@req; 1851 DC::UI::harmonize \@req;
1813 1852
1814 my $pos = 0; 1853 my $pos = 0;
1815 for (0 .. $#children) { 1854 for (0 .. $#children) {
1816 my $alloc = $req[$_]; 1855 my $alloc = $req[$_];
1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1856 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1822 1 1861 1
1823} 1862}
1824 1863
1825############################################################################# 1864#############################################################################
1826 1865
1827package CFPlus::UI::HBox; 1866package DC::UI::HBox;
1828 1867
1829our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1830 1869
1831sub new { 1870sub new {
1832 my $class = shift; 1871 my $class = shift;
1833 1872
1834 $class->SUPER::new ( 1873 $class->SUPER::new (
1837 ) 1876 )
1838} 1877}
1839 1878
1840############################################################################# 1879#############################################################################
1841 1880
1842package CFPlus::UI::VBox; 1881package DC::UI::VBox;
1843 1882
1844our @ISA = CFPlus::UI::Box::; 1883our @ISA = DC::UI::Box::;
1845 1884
1846sub new { 1885sub new {
1847 my $class = shift; 1886 my $class = shift;
1848 1887
1849 $class->SUPER::new ( 1888 $class->SUPER::new (
1852 ) 1891 )
1853} 1892}
1854 1893
1855############################################################################# 1894#############################################################################
1856 1895
1857package CFPlus::UI::Label; 1896package DC::UI::Label;
1858 1897
1859our @ISA = CFPlus::UI::DrawBG::; 1898our @ISA = DC::UI::DrawBG::;
1860 1899
1861use CFPlus::OpenGL; 1900use DC::OpenGL;
1862 1901
1863sub new { 1902sub new {
1864 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1865 1904
1866 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
1871 #text => initial text 1910 #text => initial text
1872 #markup => initial narkup 1911 #markup => initial narkup
1873 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1874 #style => 0, # render flags 1913 #style => 0, # render flags
1875 ellipsise => 3, # end 1914 ellipsise => 3, # end
1876 layout => (new CFPlus::Layout), 1915 layout => (new DC::Layout),
1877 fontsize => 1, 1916 fontsize => 1,
1878 align => -1, 1917 align => 0.5,
1879 valign => -1, 1918 valign => 0.5,
1880 padding_x => 2, 1919 padding_x => 4,
1881 padding_y => 2, 1920 padding_y => 2,
1882 can_events => 0, 1921 can_events => 0,
1883 %arg 1922 %arg
1884 ); 1923 );
1885 1924
1886 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1887 my $layout = new CFPlus::Layout; 1926 my $layout = new DC::Layout;
1888 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1889 $self->{template} = $layout; 1928 $self->{template} = $layout;
1890 } 1929 }
1891 1930
1892 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
1910 1949
1911 delete $self->{ox}; 1950 delete $self->{ox};
1912 $self->SUPER::realloc; 1951 $self->SUPER::realloc;
1913} 1952}
1914 1953
1954sub clear {
1955 my ($self) = @_;
1956
1957 $self->set_text ("");
1958}
1959
1915sub set_text { 1960sub set_text {
1916 my ($self, $text) = @_; 1961 my ($self, $text) = @_;
1917 1962
1918 return if $self->{text} eq "T$text"; 1963 return if $self->{text} eq "T$text";
1919 $self->{text} = "T$text"; 1964 $self->{text} = "T$text";
1942 1987
1943sub size_request { 1988sub size_request {
1944 my ($self) = @_; 1989 my ($self) = @_;
1945 1990
1946 $self->{size_req} ||= do { 1991 $self->{size_req} ||= do {
1992 my ($max_w, $max_h) = $self->get_max_wh;
1993
1947 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1994 $self->{layout}->set_font ($self->{font}) if $self->{font};
1948 $self->{layout}->set_width ($self->{max_w} || -1); 1995 $self->{layout}->set_width ($max_w);
1949 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1996 $self->{layout}->set_ellipsise ($self->{ellipsise});
1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1997 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1998 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1952 1999
1953 my ($w, $h) = $self->{layout}->size; 2000 my ($w, $h) = $self->{layout}->size;
1954 2001
1955 if (exists $self->{template}) { 2002 if (exists $self->{template}) {
1956 $self->{template}->set_font ($self->{font}) if $self->{font}; 2003 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1); 2004 $self->{template}->set_width ($max_w);
1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2005 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1959 2006
1960 my ($w2, $h2) = $self->{template}->size; 2007 my ($w2, $h2) = $self->{template}->size;
1961 2008
1962 $w = List::Util::max $w, $w2; 2009 $w = List::Util::max $w, $w2;
2018 2065
2019 [$self->{layout}->size] 2066 [$self->{layout}->size]
2020 }; 2067 };
2021 2068
2022 unless (exists $self->{ox}) { 2069 unless (exists $self->{ox}) {
2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2070 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2071 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2025 : ($self->{w} - $size->[0]) * 0.5);
2026 2072
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2073 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5);
2030 }; 2074 };
2031 2075
2032# unless ($self->{list}) { 2076# unless ($self->{list}) {
2033# $self->{list} = CFPlus::OpenGL::glGenList; 2077# $self->{list} = DC::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list}; 2078# DC::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2079# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList; 2080# DC::OpenGL::glEndList;
2037# } 2081# }
2038# 2082#
2039# CFPlus::OpenGL::glCallList $self->{list}; 2083# DC::OpenGL::glCallList $self->{list};
2040 2084
2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2085 $self->{layout}->draw;
2042} 2086}
2043 2087
2044#sub destroy { 2088#sub destroy {
2045# my ($self) = @_; 2089# my ($self) = @_;
2046# 2090#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2091# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048# 2092#
2049# $self->SUPER::destroy; 2093# $self->SUPER::destroy;
2050#} 2094#}
2051 2095
2052############################################################################# 2096#############################################################################
2053 2097
2054package CFPlus::UI::EntryBase; 2098package DC::UI::EntryBase;
2055 2099
2056our @ISA = CFPlus::UI::Label::; 2100our @ISA = DC::UI::Label::;
2057 2101
2058use CFPlus::OpenGL; 2102use DC::OpenGL;
2059 2103
2060sub new { 2104sub new {
2061 my $class = shift; 2105 my $class = shift;
2062 2106
2063 $class->SUPER::new ( 2107 $class->SUPER::new (
2064 fg => [1, 1, 1], 2108 fg => [1, 1, 1],
2065 bg => [0, 0, 0, 0.2], 2109 bg => [0, 0, 0, 0.2],
2110 outline => undef,
2066 active_bg => [1, 1, 1, 0.5], 2111 active_bg => [0, 0, 1, .2],
2067 active_fg => [0, 0, 0], 2112 active_fg => [1, 1, 1],
2113 active_outline => [1, 1, 0],
2068 can_hover => 1, 2114 can_hover => 1,
2069 can_focus => 1, 2115 can_focus => 1,
2116 align => 0,
2070 valign => 0, 2117 valign => 0.5,
2071 can_events => 1, 2118 can_events => 1,
2072 ellipsise => 0, 2119 ellipsise => 0,
2120 padding_x => 4,
2121 padding_y => 2,
2073 #text => ... 2122 #text => ...
2074 #hidden => "*", 2123 #hidden => "*",
2075 @_ 2124 @_
2076 ) 2125 )
2077} 2126}
2124 2173
2125 my $text = $self->get_text; 2174 my $text = $self->get_text;
2126 2175
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2176 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128 2177
2129 if ($uni == 8) { 2178 if ($sym == DC::SDLK_BACKSPACE) {
2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2179 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2131 } elsif ($uni == 127) { 2180 } elsif ($sym == DC::SDLK_DELETE) {
2132 substr $text, $self->{cursor}, 1, ""; 2181 substr $text, $self->{cursor}, 1, "";
2133 } elsif ($sym == CFPlus::SDLK_LEFT) { 2182 } elsif ($sym == DC::SDLK_LEFT) {
2134 --$self->{cursor} if $self->{cursor}; 2183 --$self->{cursor} if $self->{cursor};
2135 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2184 } elsif ($sym == DC::SDLK_RIGHT) {
2136 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2185 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2137 } elsif ($sym == CFPlus::SDLK_HOME) { 2186 } elsif ($sym == DC::SDLK_HOME) {
2138 # what a hack 2187 # what a hack
2139 $self->{cursor} = 2188 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2189 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1 2190 ? length $1
2142 : 0; 2191 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) { 2192 } elsif ($sym == DC::SDLK_END) {
2144 # uh, again 2193 # uh, again
2145 $self->{cursor} = 2194 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2195 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1 2196 ? $self->{cursor} + length $1
2148 : length $self->{text}; 2197 : length $self->{text};
2212 glColor_premultiply @{$self->{bg}}; 2261 glColor_premultiply @{$self->{bg}};
2213 } 2262 }
2214 2263
2215 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2265 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glBegin GL_QUADS;
2218 glVertex 0 , 0;
2219 glVertex 0 , $self->{h};
2220 glVertex $self->{w}, $self->{h}; 2266 glRect 0, 0, $self->{w}, $self->{h};
2221 glVertex $self->{w}, 0;
2222 glEnd;
2223 glDisable GL_BLEND; 2267 glDisable GL_BLEND;
2224 2268
2225 $self->SUPER::_draw; 2269 $self->SUPER::_draw;
2226 2270
2227 #TODO: force update every cursor change :( 2271 #TODO: force update every cursor change :(
2229 2273
2230 unless (exists $self->{cur_h}) { 2274 unless (exists $self->{cur_h}) {
2231 my $text = substr $self->{text}, 0, $self->{cursor}; 2275 my $text = substr $self->{text}, 0, $self->{cursor};
2232 utf8::encode $text; 2276 utf8::encode $text;
2233 2277
2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2278 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2235 } 2279 }
2236 2280
2281 glColor_premultiply @{$self->{active_fg}};
2237 glBegin GL_LINES; 2282 glBegin GL_LINES;
2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2284 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240 glEnd; 2285 glEnd;
2286
2287 glLineWidth 3;
2288 glColor @{$self->{active_outline}};
2289 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2290 glLineWidth 1;
2291
2292 } else {
2293 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2294 glBegin GL_LINE_STRIP;
2295 glVertex .5, $self->{h} * .5;
2296 glVertex .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} - 2.5;
2298 glVertex $self->{w} - .5, $self->{h} * .5;
2299 glEnd;
2241 } 2300 }
2242} 2301}
2243 2302
2244############################################################################# 2303#############################################################################
2245 2304
2246package CFPlus::UI::Entry; 2305package DC::UI::Entry;
2247 2306
2248our @ISA = CFPlus::UI::EntryBase::; 2307our @ISA = DC::UI::EntryBase::;
2249 2308
2250use CFPlus::OpenGL; 2309use DC::OpenGL;
2310
2311sub new {
2312 my $class = shift;
2313
2314 $class->SUPER::new (
2315 history_pointer => -1,
2316 @_
2317 )
2318}
2319
2251 2320
2252sub invoke_key_down { 2321sub invoke_key_down {
2253 my ($self, $ev) = @_; 2322 my ($self, $ev) = @_;
2254 2323
2255 my $sym = $ev->{sym}; 2324 my $sym = $ev->{sym};
2261 $self->{history_pointer} = -1; 2330 $self->{history_pointer} = -1;
2262 $self->{history_saveback} = ''; 2331 $self->{history_saveback} = '';
2263 $self->emit (activate => $txt); 2332 $self->emit (activate => $txt);
2264 $self->update; 2333 $self->update;
2265 2334
2266 } elsif ($sym == CFPlus::SDLK_UP) { 2335 } elsif ($sym == DC::SDLK_UP) {
2267 if ($self->{history_pointer} < 0) { 2336 if ($self->{history_pointer} < 0) {
2268 $self->{history_saveback} = $self->get_text; 2337 $self->{history_saveback} = $self->get_text;
2269 } 2338 }
2270 if (@{$self->{history} || []} > 0) { 2339 if (@{$self->{history} || []} > 0) {
2271 $self->{history_pointer}++; 2340 $self->{history_pointer}++;
2273 $self->{history_pointer} = @{$self->{history} || []} - 1; 2342 $self->{history_pointer} = @{$self->{history} || []} - 1;
2274 } 2343 }
2275 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2276 } 2345 }
2277 2346
2278 } elsif ($sym == CFPlus::SDLK_DOWN) { 2347 } elsif ($sym == DC::SDLK_DOWN) {
2279 $self->{history_pointer}--; 2348 $self->{history_pointer}--;
2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2349 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2281 2350
2282 if ($self->{history_pointer} >= 0) { 2351 if ($self->{history_pointer} >= 0) {
2283 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2352 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2284 } else { 2353 } else {
2354 if (defined $self->{history_saveback}) {
2285 $self->set_text ($self->{history_saveback}); 2355 $self->set_text ($self->{history_saveback});
2356 $self->{history_saveback} = undef;
2357 }
2286 } 2358 }
2287 2359
2288 } else { 2360 } else {
2289 return $self->SUPER::invoke_key_down ($ev) 2361 return $self->SUPER::invoke_key_down ($ev)
2290 } 2362 }
2292 1 2364 1
2293} 2365}
2294 2366
2295############################################################################# 2367#############################################################################
2296 2368
2297package CFPlus::UI::TextEdit; 2369package DC::UI::TextEdit;
2298 2370
2299our @ISA = CFPlus::UI::EntryBase::; 2371our @ISA = DC::UI::EntryBase::;
2300 2372
2301use CFPlus::OpenGL; 2373use DC::OpenGL;
2374
2375sub new {
2376 my $class = shift;
2377
2378 $class->SUPER::new (
2379 padding_y => 4,
2380
2381 @_
2382 )
2383}
2302 2384
2303sub move_cursor_ver { 2385sub move_cursor_ver {
2304 my ($self, $dy) = @_; 2386 my ($self, $dy) = @_;
2305 2387
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2388 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307 2389
2308 $y += $dy; 2390 $line += $dy;
2309 2391
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2392 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2311 $self->{cursor} = $index; 2393 $self->{cursor} = $index;
2312 delete $self->{cur_h}; 2394 delete $self->{cur_h};
2313 $self->update; 2395 $self->update;
2314 return; 2396 return;
2315 } 2397 }
2318sub invoke_key_down { 2400sub invoke_key_down {
2319 my ($self, $ev) = @_; 2401 my ($self, $ev) = @_;
2320 2402
2321 my $sym = $ev->{sym}; 2403 my $sym = $ev->{sym};
2322 2404
2323 if ($sym == CFPlus::SDLK_UP) { 2405 if ($sym == DC::SDLK_UP) {
2324 $self->move_cursor_ver (-1); 2406 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) { 2407 } elsif ($sym == DC::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1); 2408 $self->move_cursor_ver (+1);
2327 } else { 2409 } else {
2328 return $self->SUPER::invoke_key_down ($ev) 2410 return $self->SUPER::invoke_key_down ($ev)
2329 } 2411 }
2330 2412
2331 1 2413 1
2332} 2414}
2333 2415
2334############################################################################# 2416#############################################################################
2335 2417
2336package CFPlus::UI::Button; 2418package DC::UI::ButtonBin;
2337 2419
2338our @ISA = CFPlus::UI::Label::; 2420our @ISA = DC::UI::Bin::;
2339 2421
2340use CFPlus::OpenGL; 2422use DC::OpenGL;
2341 2423
2342my @tex = 2424my @tex =
2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2425 map { new_from_resource DC::Texture $_, mipmap => 1 }
2344 qw(b1_button_inactive.png b1_button_active.png); 2426 qw(b1_button_inactive.png b1_button_active.png);
2345 2427
2346sub new { 2428sub new {
2347 my $class = shift; 2429 my $class = shift;
2348 2430
2349 $class->SUPER::new ( 2431 $class->SUPER::new (
2432 can_hover => 1,
2433 align => 0.5,
2434 valign => 0.5,
2435 can_events => 1,
2436 @_
2437 )
2438}
2439
2440sub invoke_button_up {
2441 my ($self, $ev, $x, $y) = @_;
2442
2443 $self->emit ("activate")
2444 if $x >= 0 && $x < $self->{w}
2445 && $y >= 0 && $y < $self->{h};
2446
2447 1
2448}
2449
2450sub _draw {
2451 my ($self) = @_;
2452
2453 glEnable GL_TEXTURE_2D;
2454 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2455 glColor 0, 0, 0, 1;
2456
2457 my $tex = $tex[$GRAB == $self];
2458 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2459
2460 glDisable GL_TEXTURE_2D;
2461
2462 $self->SUPER::_draw;
2463}
2464
2465#############################################################################
2466
2467package DC::UI::Button;
2468
2469our @ISA = DC::UI::Label::;
2470
2471use DC::OpenGL;
2472
2473my @tex =
2474 map { new_from_resource DC::Texture $_, mipmap => 1 }
2475 qw(b1_button_inactive.png b1_button_active.png);
2476
2477sub new {
2478 my $class = shift;
2479
2480 $class->SUPER::new (
2350 padding_x => 4, 2481 padding_x => 8,
2351 padding_y => 4, 2482 padding_y => 4,
2352 fg => [1.0, 1.0, 1.0], 2483 fg => [1.0, 1.0, 1.0],
2353 active_fg => [0.8, 0.8, 0.8], 2484 active_fg => [0.8, 0.8, 0.8],
2354 can_hover => 1, 2485 can_hover => 1,
2355 align => 0, 2486 align => 0.5,
2356 valign => 0, 2487 valign => 0.5,
2357 can_events => 1, 2488 can_events => 1,
2358 @_ 2489 @_
2359 ) 2490 )
2360} 2491}
2361 2492
2386 $self->SUPER::_draw; 2517 $self->SUPER::_draw;
2387} 2518}
2388 2519
2389############################################################################# 2520#############################################################################
2390 2521
2391package CFPlus::UI::CheckBox; 2522package DC::UI::CheckBox;
2392 2523
2393our @ISA = CFPlus::UI::DrawBG::; 2524our @ISA = DC::UI::DrawBG::;
2394 2525
2395my @tex = 2526my @tex =
2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2527 map { new_from_resource DC::Texture $_, mipmap => 1 }
2397 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2528 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2398 2529
2399use CFPlus::OpenGL; 2530use DC::OpenGL;
2400 2531
2401sub new { 2532sub new {
2402 my $class = shift; 2533 my $class = shift;
2403 2534
2404 $class->SUPER::new ( 2535 $class->SUPER::new (
2536 fontsize => 1,
2405 padding_x => 2, 2537 padding_x => 2,
2406 padding_y => 2, 2538 padding_y => 2,
2407 fg => [1, 1, 1], 2539 fg => [1, 1, 1],
2408 active_fg => [1, 1, 0], 2540 active_fg => [1, 1, 0],
2409 bg => [0, 0, 0, 0.2], 2541 bg => [0, 0, 0, 0.2],
2415} 2547}
2416 2548
2417sub size_request { 2549sub size_request {
2418 my ($self) = @_; 2550 my ($self) = @_;
2419 2551
2420 (6) x 2 2552 ($self->{fontsize} * $::FONTSIZE) x 2
2421} 2553}
2422 2554
2423sub toggle { 2555sub toggle {
2424 my ($self) = @_; 2556 my ($self) = @_;
2425 2557
2444sub _draw { 2576sub _draw {
2445 my ($self) = @_; 2577 my ($self) = @_;
2446 2578
2447 $self->SUPER::_draw; 2579 $self->SUPER::_draw;
2448 2580
2449 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2581 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2450 2582
2451 my ($w, $h) = @$self{qw(w h)}; 2583 my ($w, $h) = @$self{qw(w h)};
2452 2584
2453 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2585 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2454 2586
2461 glDisable GL_TEXTURE_2D; 2593 glDisable GL_TEXTURE_2D;
2462} 2594}
2463 2595
2464############################################################################# 2596#############################################################################
2465 2597
2466package CFPlus::UI::Image; 2598package DC::UI::Image;
2467 2599
2468our @ISA = CFPlus::UI::Base::; 2600our @ISA = DC::UI::DrawBG::;
2469 2601
2470use CFPlus::OpenGL; 2602use DC::OpenGL;
2471 2603
2472our %texture_cache; 2604our %texture_cache;
2473 2605
2474sub new { 2606sub new {
2475 my $class = shift; 2607 my $class = shift;
2476 2608
2477 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2478 can_events => 0, 2610 can_events => 0,
2611 scale => 1,
2479 @_, 2612 @_,
2480 ); 2613 );
2481 2614
2482 $self->{path} || $self->{tex} 2615 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required"; 2616 or Carp::croak "'path' or 'tex' attributes required";
2484 2617
2485 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2618 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2619 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2487 2620
2488 CFPlus::weaken $texture_cache{$self->{path}}; 2621 DC::weaken $texture_cache{$self->{path}};
2489 2622
2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2623 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2491 2624
2492 $self 2625 $self
2493} 2626}
2494 2627
2495sub STORABLE_freeze { 2628sub STORABLE_freeze {
2496 my ($self, $cloning) = @_; 2629 my ($self, $cloning) = @_;
2497 2630
2498 $self->{path} 2631 $self->{path}
2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2632 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2500 2633
2501 $self->{path} 2634 $self->{path}
2502} 2635}
2503 2636
2504sub STORABLE_attach { 2637sub STORABLE_attach {
2505 my ($self, $cloning, $path) = @_; 2638 my ($self, $cloning, $path) = @_;
2506 2639
2507 $self->new (path => $path) 2640 $self->new (path => $path)
2508} 2641}
2509 2642
2643sub set_texture {
2644 my ($self, $tex) = @_;
2645
2646 $self->{tex} = $tex;
2647 $self->update;
2648}
2649
2510sub size_request { 2650sub size_request {
2511 my ($self) = @_; 2651 my ($self) = @_;
2512 2652
2513 ($self->{tex}{w}, $self->{tex}{h}) 2653 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2514} 2654}
2515 2655
2516sub _draw { 2656sub _draw {
2517 my ($self) = @_; 2657 my ($self) = @_;
2658
2659 $self->SUPER::_draw;
2518 2660
2519 my $tex = $self->{tex}; 2661 my $tex = $self->{tex};
2520 2662
2521 my ($w, $h) = ($self->{w}, $self->{h}); 2663 my ($w, $h) = ($self->{w}, $self->{h});
2522 2664
2528 } 2670 }
2529 2671
2530 glEnable GL_TEXTURE_2D; 2672 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 2674
2533 $tex->draw_quad (0, 0, $w, $h); 2675 $tex->draw_quad_alpha (0, 0, $w, $h);
2534 2676
2535 glDisable GL_TEXTURE_2D; 2677 glDisable GL_TEXTURE_2D;
2536} 2678}
2537 2679
2538############################################################################# 2680#############################################################################
2539 2681
2540package CFPlus::UI::ImageButton; 2682package DC::UI::ImageButton;
2541 2683
2542our @ISA = CFPlus::UI::Image::; 2684our @ISA = DC::UI::Image::;
2543 2685
2544use CFPlus::OpenGL; 2686use DC::OpenGL;
2545
2546my %textures;
2547 2687
2548sub new { 2688sub new {
2549 my $class = shift; 2689 my $class = shift;
2550 2690
2551 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2552 padding_x => 4, 2692 padding_x => 4,
2553 padding_y => 4, 2693 padding_y => 4,
2554 fg => [1, 1, 1], 2694 fg => [1, 1, 1],
2555 active_fg => [0, 0, 1], 2695 active_fg => [0, 0, 1],
2556 can_hover => 1, 2696 can_hover => 1,
2557 align => 0, 2697 align => 0.5,
2558 valign => 0, 2698 valign => 0.5,
2559 can_events => 1, 2699 can_events => 1,
2560 @_ 2700 @_
2561 ); 2701 );
2562} 2702}
2563 2703
2704sub invoke_button_down {
2705 my ($self, $ev, $x, $y) = @_;
2706
2707 1
2708}
2709
2564sub invoke_button_up { 2710sub invoke_button_up {
2565 my ($self, $ev, $x, $y) = @_; 2711 my ($self, $ev, $x, $y) = @_;
2566 2712
2567 $self->emit ("activate") 2713 $self->emit ("activate")
2568 if $x >= 0 && $x < $self->{w} 2714 if $x >= 0 && $x < $self->{w}
2571 1 2717 1
2572} 2718}
2573 2719
2574############################################################################# 2720#############################################################################
2575 2721
2576package CFPlus::UI::VGauge; 2722package DC::UI::VGauge;
2577 2723
2578our @ISA = CFPlus::UI::Base::; 2724our @ISA = DC::UI::Base::;
2579 2725
2580use List::Util qw(min max); 2726use List::Util qw(min max);
2581 2727
2582use CFPlus::OpenGL; 2728use DC::OpenGL;
2583 2729
2584my %tex = ( 2730my %tex = (
2585 food => [ 2731 food => [
2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2733 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2588 ], 2734 ],
2589 grace => [ 2735 grace => [
2590 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2737 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2592 ], 2738 ],
2593 hp => [ 2739 hp => [
2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2740 map { new_from_resource DC::Texture $_, mipmap => 1 }
2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2741 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2596 ], 2742 ],
2597 mana => [ 2743 mana => [
2598 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2744 map { new_from_resource DC::Texture $_, mipmap => 1 }
2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2745 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2600 ], 2746 ],
2601); 2747);
2602 2748
2603# eg. VGauge->new (gauge => 'food'), default gauge: food 2749# eg. VGauge->new (gauge => 'food'), default gauge: food
2706 glDisable GL_TEXTURE_2D; 2852 glDisable GL_TEXTURE_2D;
2707} 2853}
2708 2854
2709############################################################################# 2855#############################################################################
2710 2856
2857package DC::UI::Progress;
2858
2859our @ISA = DC::UI::Label::;
2860
2861use DC::OpenGL;
2862
2863sub new {
2864 my ($class, %arg) = @_;
2865
2866 my $self = $class->SUPER::new (
2867 padding_x => 2,
2868 padding_y => 2,
2869 fg => [1, 1, 1],
2870 bg => [0, 0, 1, 0.2],
2871 bar => [0.7, 0.5, 0.1, 0.8],
2872 outline => [0.4, 0.3, 0],
2873 fontsize => 0.9,
2874 valign => 0.5,
2875 align => 0.5,
2876 can_events => 1,
2877 ellipsise => 1,
2878 label => "%d%%",
2879 %arg,
2880 );
2881
2882 $self->set_value ($arg{value} || -1);
2883
2884 $self
2885}
2886
2887sub set_label {
2888 my ($self, $label) = @_;
2889
2890 return if $self->{label} eq $label;
2891 $self->{label} = $label;
2892
2893 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2894}
2895
2896sub set_value {
2897 my ($self, $value) = @_;
2898
2899 if ($self->{value} ne $value) {
2900 $self->{value} = $value;
2901
2902 if ($value < 0) {
2903 $self->set_text ("-");
2904 } else {
2905 $self->set_text (sprintf $self->{label}, $value * 100);
2906 }
2907
2908 $self->update;
2909 }
2910}
2911
2912sub _draw {
2913 my ($self) = @_;
2914
2915 glEnable GL_BLEND;
2916 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2917
2918 my $px = $self->{padding_x};
2919 my $py = $self->{padding_y};
2920
2921 if ($self->{value} >= 0) {
2922 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2923
2924 glColor_premultiply @{$self->{bar}};
2925 glRect $px, $py, $s, $self->{h} - $py;
2926 glColor_premultiply @{$self->{bg}};
2927 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2928 }
2929
2930 glColor_premultiply @{$self->{outline}};
2931
2932 $px -= .5;
2933 $py -= .5;
2934
2935 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2936
2937 glDisable GL_BLEND;
2938
2939 {
2940 local $self->{bg}; # do not draw background
2941 $self->SUPER::_draw;
2942 }
2943}
2944
2945#############################################################################
2946
2947package DC::UI::ExperienceProgress;
2948
2949our @ISA = DC::UI::Progress::;
2950
2951sub new {
2952 my ($class, %arg) = @_;
2953
2954 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2955
2956 my $self = $class->SUPER::new (
2957 %arg,
2958 tooltip => sub {
2959 my ($self) = @_;
2960
2961 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2962 $tt,
2963 $self->{lvl},
2964 ::formsep ($self->{exp}),
2965 ::formsep ($self->{nxt}),
2966 ::formsep ($self->{nxt} - $self->{exp}),
2967 $self->_percent * 100,
2968 },
2969 );
2970
2971 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2972 if $::CONN;
2973
2974 $self
2975}
2976
2977sub DESTROY {
2978 my ($self) = @_;
2979
2980 delete $::CONN->{on_exp_update}{$self+0}
2981 if $::CONN;
2982
2983 $self->SUPER::DESTROY;
2984}
2985
2986sub _percent {
2987 my ($self) = @_;
2988
2989 my $table = $::CONN && $::CONN->{exp_table}
2990 or return -1;
2991
2992 my $l0 = $table->[$self->{lvl} - 1];
2993 my $l1 = $table->[$self->{lvl}];
2994
2995 $self->{nxt} = $l1;
2996
2997 ($self->{exp} - $l0) / ($l1 - $l0)
2998}
2999
3000sub set_value {
3001 my ($self, $lvl, $exp) = @_;
3002
3003 $self->{lvl} = $lvl;
3004 $self->{exp} = $exp;
3005
3006 $self->SUPER::set_value ($self->_percent);
3007}
3008
3009#############################################################################
3010
2711package CFPlus::UI::Gauge; 3011package DC::UI::Gauge;
2712 3012
2713our @ISA = CFPlus::UI::VBox::; 3013our @ISA = DC::UI::VBox::;
2714 3014
2715sub new { 3015sub new {
2716 my ($class, %arg) = @_; 3016 my ($class, %arg) = @_;
2717 3017
2718 my $self = $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
2720 can_hover => 1, 3020 can_hover => 1,
2721 can_events => 1, 3021 can_events => 1,
2722 %arg, 3022 %arg,
2723 ); 3023 );
2724 3024
2725 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3025 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2726 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3026 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3027 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2728 3028
2729 $self 3029 $self
2730} 3030}
2731 3031
2732sub set_fontsize { 3032sub set_fontsize {
2753 $self->{value}->set_text ($val); 3053 $self->{value}->set_text ($val);
2754} 3054}
2755 3055
2756############################################################################# 3056#############################################################################
2757 3057
2758package CFPlus::UI::Slider; 3058package DC::UI::Slider;
2759 3059
2760use strict; 3060use common::sense;
2761 3061
2762use CFPlus::OpenGL; 3062use DC::OpenGL;
2763 3063
2764our @ISA = CFPlus::UI::DrawBG::; 3064our @ISA = DC::UI::DrawBG::;
2765 3065
2766my @tex = 3066my @tex =
2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3067 map { new_from_resource DC::Texture $_ }
2768 qw(s1_slider.png s1_slider_bg.png); 3068 qw(s1_slider.png s1_slider_bg.png);
2769 3069
2770sub new { 3070sub new {
2771 my $class = shift; 3071 my $class = shift;
2772 3072
2809sub set_value { 3109sub set_value {
2810 my ($self, $value) = @_; 3110 my ($self, $value) = @_;
2811 3111
2812 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3112 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2813 3113
2814 $hi = $lo + 1 if $hi <= $lo; 3114 $hi = $lo if $hi < $lo;
2815 3115
2816 $page = $hi - $lo if $page > $hi - $lo; 3116 $value = $hi - $page if $value > $hi - $page;
2817
2818 $value = $lo if $value < $lo; 3117 $value = $lo if $value < $lo;
2819 $value = $hi - $page if $value > $hi - $page;
2820 3118
2821 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2822 if $unit; 3120 if $unit;
2823 3121
2824 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2840 3138
2841 $self->SUPER::invoke_button_down ($ev, $x, $y); 3139 $self->SUPER::invoke_button_down ($ev, $x, $y);
2842 3140
2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3141 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2844 3142
2845 $self->invoke_mouse_motion ($ev, $x, $y) 3143 $self->invoke_mouse_motion ($ev, $x, $y);
3144
3145 1
2846} 3146}
2847 3147
2848sub invoke_mouse_motion { 3148sub invoke_mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 3149 my ($self, $ev, $x, $y) = @_;
2850 3150
2851 if ($GRAB == $self) { 3151 if ($GRAB == $self) {
2852 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3152 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2853 3153
2854 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3154 my (undef, $lo, $hi, $page) = @{$self->{range}};
2855 3155
2856 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3156 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2857 3157
2858 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3158 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2859 } else { 3159 } else {
2860 return 0; 3160 return 0;
2861 } 3161 }
2866sub invoke_mouse_wheel { 3166sub invoke_mouse_wheel {
2867 my ($self, $ev) = @_; 3167 my ($self, $ev) = @_;
2868 3168
2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3169 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870 3170
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3171 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2872 3172
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3173 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874 3174
2875 ! ! $delta 3175 1
2876} 3176}
2877 3177
2878sub update { 3178sub update {
2879 my ($self) = @_; 3179 my ($self) = @_;
2880 3180
2886 my ($self) = @_; 3186 my ($self) = @_;
2887 3187
2888 unless ($self->{knob_w}) { 3188 unless ($self->{knob_w}) {
2889 $self->set_value ($self->{range}[0]); 3189 $self->set_value ($self->{range}[0]);
2890 3190
2891 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3191 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2892 my $range = ($hi - $page - $lo) || 1e-100; 3192 my $range = ($hi - $page - $lo) || 1e-10;
2893 3193
2894 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3194 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2895 3195
2896 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2897 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2898 3198
2899 $value = ($value - $lo) / $range; 3199 $value = ($value - $lo) / $range;
2929 glDisable GL_TEXTURE_2D; 3229 glDisable GL_TEXTURE_2D;
2930} 3230}
2931 3231
2932############################################################################# 3232#############################################################################
2933 3233
2934package CFPlus::UI::ValSlider; 3234package DC::UI::ValSlider;
2935 3235
2936our @ISA = CFPlus::UI::HBox::; 3236our @ISA = DC::UI::HBox::;
2937 3237
2938sub new { 3238sub new {
2939 my ($class, %arg) = @_; 3239 my ($class, %arg) = @_;
2940 3240
2941 my $range = delete $arg{range}; 3241 my $range = delete $arg{range};
2942 3242
2943 my $self = $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3244 slider => (new DC::UI::Slider expand => 1, range => $range),
2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3245 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2946 to_value => sub { shift }, 3246 to_value => sub { shift },
2947 from_value => sub { shift }, 3247 from_value => sub { shift },
2948 %arg, 3248 %arg,
2949 ); 3249 );
2950 3250
2970sub set_range { shift->{slider}->set_range (@_) } 3270sub set_range { shift->{slider}->set_range (@_) }
2971sub set_value { shift->{slider}->set_value (@_) } 3271sub set_value { shift->{slider}->set_value (@_) }
2972 3272
2973############################################################################# 3273#############################################################################
2974 3274
2975package CFPlus::UI::TextScroller; 3275package DC::UI::TextScroller;
2976 3276
2977our @ISA = CFPlus::UI::HBox::; 3277our @ISA = DC::UI::HBox::;
2978 3278
2979use CFPlus::OpenGL; 3279use DC::OpenGL;
2980 3280
2981sub new { 3281sub new {
2982 my $class = shift; 3282 my $class = shift;
2983 3283
2984 my $self = $class->SUPER::new ( 3284 my $self = $class->SUPER::new (
2986 can_events => 1, 3286 can_events => 1,
2987 indent => 0, 3287 indent => 0,
2988 #font => default_font 3288 #font => default_font
2989 @_, 3289 @_,
2990 3290
2991 layout => (new CFPlus::Layout), 3291 layout => (new DC::Layout),
2992 par => [],
2993 max_par => 0, 3292 max_par => 0,
2994 height => 0, 3293 height => 0,
2995 children => [ 3294 children => [
2996 (new CFPlus::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
2997 (new CFPlus::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
2998 ], 3297 ],
2999 ); 3298 );
3000 3299
3001 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
3002 3301
3302 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3303
3003 $self 3304 $self
3004} 3305}
3005 3306
3006sub set_fontsize { 3307sub set_fontsize {
3007 my ($self, $fontsize) = @_; 3308 my ($self, $fontsize) = @_;
3011} 3312}
3012 3313
3013sub size_request { 3314sub size_request {
3014 my ($self) = @_; 3315 my ($self) = @_;
3015 3316
3016 my ($empty, $slider) = @{ $self->{children} }; 3317 my ($empty, $slider) = $self->visible_children;
3017 3318
3018 local $self->{children} = [$empty, $slider]; 3319 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::size_request 3320 $self->SUPER::size_request
3020} 3321}
3021 3322
3058 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3359 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3059 $layout->set_markup ($para->{markup}); 3360 $layout->set_markup ($para->{markup});
3060 3361
3061 $layout->set_shapes ( 3362 $layout->set_shapes (
3062 map 3363 map
3063 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3364 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3064 @{$para->{widget}} 3365 @{$para->{widget}}
3065 ); 3366 );
3066 3367
3067 $layout 3368 $layout
3068} 3369}
3185 $ROOT->on_post_alloc ($self => sub { 3486 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate; 3487 $self->force_uptodate;
3187 3488
3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3489 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3189 3490
3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3491 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3191 glClearColor 0, 0, 0, 0; 3492 glClearColor 0, 0, 0, 0;
3192 glClear GL_COLOR_BUFFER_BIT; 3493 glClear GL_COLOR_BUFFER_BIT;
3193 3494
3194 package CFPlus::UI::Base; 3495 package DC::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3496 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h}); 3497 (0, 0, $self->{w}, $self->{h});
3197 3498
3198 my $top = int $self->{children}[1]{range}[0]; 3499 my $top = int $self->{children}[1]{range}[0];
3199 3500
3210 3511
3211 if ($y0 < $y + $h && $y < $y1) { 3512 if ($y0 < $y + $h && $y < $y1) {
3212 my $layout = $self->get_layout ($para); 3513 my $layout = $self->get_layout ($para);
3213 3514
3214 $layout->render ($para->{indent}, $y - $y0); 3515 $layout->render ($para->{indent}, $y - $y0);
3516 $layout->draw;
3215 3517
3216 if (my @w = @{ $para->{widget} }) { 3518 if (my @w = @{ $para->{widget} }) {
3217 my @s = $layout->get_shapes; 3519 my @s = $layout->get_shapes;
3218 3520
3219 for (@w) { 3521 for (@w) {
3257 $self->{children}[1]->draw; 3559 $self->{children}[1]->draw;
3258} 3560}
3259 3561
3260############################################################################# 3562#############################################################################
3261 3563
3262package CFPlus::UI::Animator; 3564package DC::UI::Animator;
3263 3565
3264use CFPlus::OpenGL; 3566use DC::OpenGL;
3265 3567
3266our @ISA = CFPlus::UI::Bin::; 3568our @ISA = DC::UI::Bin::;
3267 3569
3268sub moveto { 3570sub moveto {
3269 my ($self, $x, $y) = @_; 3571 my ($self, $x, $y) = @_;
3270 3572
3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3573 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3299 glPopMatrix; 3601 glPopMatrix;
3300} 3602}
3301 3603
3302############################################################################# 3604#############################################################################
3303 3605
3304package CFPlus::UI::Flopper; 3606package DC::UI::Flopper;
3305 3607
3306our @ISA = CFPlus::UI::Button::; 3608our @ISA = DC::UI::Button::;
3307 3609
3308sub new { 3610sub new {
3309 my $class = shift; 3611 my $class = shift;
3310 3612
3311 my $self = $class->SUPER::new ( 3613 my $self = $class->SUPER::new (
3323 $self->{other}->toggle_visibility; 3625 $self->{other}->toggle_visibility;
3324} 3626}
3325 3627
3326############################################################################# 3628#############################################################################
3327 3629
3328package CFPlus::UI::Tooltip; 3630package DC::UI::Tooltip;
3329 3631
3330our @ISA = CFPlus::UI::Bin::; 3632our @ISA = DC::UI::Bin::;
3331 3633
3332use CFPlus::OpenGL; 3634use DC::OpenGL;
3333 3635
3334sub new { 3636sub new {
3335 my $class = shift; 3637 my $class = shift;
3336 3638
3337 $class->SUPER::new ( 3639 $class->SUPER::new (
3341} 3643}
3342 3644
3343sub set_tooltip_from { 3645sub set_tooltip_from {
3344 my ($self, $widget) = @_; 3646 my ($self, $widget) = @_;
3345 3647
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
3348
3349 my $tooltip = $widget->{tooltip}; 3648 my $tip = $widget->{tooltip};
3649 $tip = $tip->($widget) if "CODE" eq ref $tip;
3650
3651 $tip = DC::Pod::section_label tooltip => $1
3652 if $tip =~ /^#(.*)$/;
3350 3653
3351 if ($ENV{CFPLUS_DEBUG} & 2) { 3654 if ($ENV{CFPLUS_DEBUG} & 2) {
3352 $tooltip .= "\n\n" . (ref $widget) . "\n" 3655 $tip .= "\n\n" . (ref $widget) . "\n"
3353 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3656 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3354 . "req $widget->{req_w} $widget->{req_h}\n" 3657 . "req $widget->{req_w} $widget->{req_h}\n"
3355 . "visible $widget->{visible}"; 3658 . "visible $widget->{visible}";
3356 } 3659 }
3357 3660
3358 $tooltip =~ s/^\n+//; 3661 $tip =~ s/^\n+//;
3359 $tooltip =~ s/\n+$//; 3662 $tip =~ s/\n+$//;
3360 3663
3361 $self->add (new CFPlus::UI::Label 3664 $self->add (new DC::UI::Label
3665 fg => $DC::THEME{tooltip_fg},
3362 markup => $tooltip, 3666 markup => $tip,
3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3667 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3668 align => 0,
3364 fontsize => 0.8, 3669 fontsize => 0.8,
3365 style => 1, # FLAG_INVERSE 3670 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3366 ellipsise => 0, 3671 ellipsise => 0,
3367 font => ($widget->{tooltip_font} || $::FONT_PROP), 3672 font => ($widget->{tooltip_font} || $::FONT_PROP),
3368 ); 3673 );
3369} 3674}
3370 3675
3405} 3710}
3406 3711
3407sub _draw { 3712sub _draw {
3408 my ($self) = @_; 3713 my ($self) = @_;
3409 3714
3410 glTranslate 0.375, 0.375;
3411
3412 my ($w, $h) = @$self{qw(w h)}; 3715 my ($w, $h) = @$self{qw(w h)};
3413 3716
3414 glColor 1, 0.8, 0.4; 3717 glColor @{ $DC::THEME{tooltip_bg} };
3415 glBegin GL_QUADS; 3718 glRect 0, 0, $w, $h;
3416 glVertex 0 , 0;
3417 glVertex 0 , $h;
3418 glVertex $w, $h;
3419 glVertex $w, 0;
3420 glEnd;
3421 3719
3422 glColor 0, 0, 0; 3720 glColor @{ $DC::THEME{tooltip_border} };
3423 glBegin GL_LINE_LOOP; 3721 glRect_lineloop .5, .5, $w + .5, $h + .5;
3424 glVertex 0 , 0;
3425 glVertex 0 , $h;
3426 glVertex $w, $h;
3427 glVertex $w, 0;
3428 glEnd;
3429 3722
3430 glTranslate 2 - 0.375, 2 - 0.375; 3723 glTranslate 2, 2;
3431 3724
3432 $self->SUPER::_draw; 3725 $self->SUPER::_draw;
3433} 3726}
3434 3727
3435############################################################################# 3728#############################################################################
3436 3729
3437package CFPlus::UI::Face; 3730package DC::UI::Face;
3438 3731
3439our @ISA = CFPlus::UI::DrawBG::; 3732our @ISA = DC::UI::DrawBG::;
3440 3733
3441use CFPlus::OpenGL; 3734use DC::OpenGL;
3442 3735
3443sub new { 3736sub new {
3444 my $class = shift; 3737 my $class = shift;
3445 3738
3446 my $self = $class->SUPER::new ( 3739 my $self = $class->SUPER::new (
3449 aspect => 1, 3742 aspect => 1,
3450 can_events => 0, 3743 can_events => 0,
3451 @_, 3744 @_,
3452 ); 3745 );
3453 3746
3454 if ($self->{anim} && $self->{animspeed}) {
3455 CFPlus::weaken (my $widget = $self);
3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3459 $self->{timer} = Event->timer (
3460 parked => 1,
3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
3464 ++$widget->{frame};
3465 $widget->update_face;
3466 $widget->update;
3467
3468 $widget->update_timer;
3469 },
3470 );
3471
3472 $self->update_face;
3473 $self->update_timer; 3747 $self->update_anim;
3474 }
3475 3748
3476 $self 3749 $self
3477} 3750}
3478 3751
3479sub update_timer { 3752sub update_timer {
3480 my ($self) = @_; 3753 my ($self) = @_;
3481 3754
3482 return unless $self->{timer}; 3755 return unless $self->{timer};
3483 3756
3484 if ($self->{visible}) { 3757 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start; 3758 $self->{timer}->start;
3491 } else { 3759 } else {
3492 $self->{timer}->stop; 3760 $self->{timer}->stop;
3493 } 3761 }
3494} 3762}
3495 3763
3496sub update_face { 3764sub update_face {
3497 my ($self) = @_; 3765 my ($self) = @_;
3498 3766
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
3510sub size_request {
3511 my ($self) = @_;
3512
3513 if ($::CONN) { 3767 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3768 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) { 3769 if ($anim && @$anim) {
3516 $self->{tex} = $tex; 3770 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3771 delete $self->{face_change_cb};
3518 } else { 3772
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3773 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3520 $self->realloc; 3774 unless ($tex->{name} || $tex->{loading}) {
3775 $tex->upload (sub { $self->reconfigure });
3776 }
3521 }); 3777 }
3522 } 3778 }
3523 } 3779 }
3524 } 3780 }
3781}
3782
3783sub update_anim {
3784 my ($self) = @_;
3785
3786 if ($self->{anim} && $self->{animspeed}) {
3787 DC::weaken (my $widget = $self);
3788
3789 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3790 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3791 return unless $::CONN;
3792
3793 my $w = $widget
3794 or return;
3795
3796 ++$w->{frame};
3797 $w->update_face;
3798
3799 # somehow, $widget can go away
3800 $w->update;
3801 $w->update_timer;
3802 };
3803
3804 $self->update_face;
3805 $self->update_timer;
3806 } else {
3807 delete $self->{timer};
3808 }
3809}
3810
3811sub size_request {
3812 my ($self) = @_;
3813
3814 if ($::CONN) {
3815 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3816 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3817 if ($tex->{name}) {
3818 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3819 } elsif (!$tex->{loading}) {
3820 $tex->upload (sub { $self->reconfigure });
3821 }
3822 }
3823
3824 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3825 }
3826 }
3525 3827
3526 ($self->{size_w} || 8, $self->{size_h} || 8) 3828 ($self->{size_w} || 8, $self->{size_h} || 8)
3527} 3829}
3528 3830
3529sub update { 3831sub update {
3530 my ($self) = @_; 3832 my ($self) = @_;
3531 3833
3532 return unless $self->{visible}; 3834 return unless $self->{visible};
3533 3835
3534 $self->SUPER::update; 3836 $self->SUPER::update;
3837}
3838
3839sub set_face {
3840 my ($self, $face) = @_;
3841
3842 $self->{face} = $face;
3843 $self->reconfigure;
3844}
3845
3846sub set_anim {
3847 my ($self, $anim) = @_;
3848
3849 $self->{anim} = $anim;
3850 $self->update_anim;
3851}
3852
3853sub set_animspeed {
3854 my ($self, $animspeed) = @_;
3855
3856 $self->{animspeed} = $animspeed;
3857 $self->update_anim;
3535} 3858}
3536 3859
3537sub invoke_visibility_change { 3860sub invoke_visibility_change {
3538 my ($self) = @_; 3861 my ($self) = @_;
3539 3862
3565 $self->SUPER::destroy; 3888 $self->SUPER::destroy;
3566} 3889}
3567 3890
3568############################################################################# 3891#############################################################################
3569 3892
3570package CFPlus::UI::Buttonbar; 3893package DC::UI::Buttonbar;
3571 3894
3572our @ISA = CFPlus::UI::HBox::; 3895our @ISA = DC::UI::HBox::;
3573 3896
3574# TODO: should actually wrap buttons and other goodies. 3897# TODO: should actually wrap buttons and other goodies.
3575 3898
3576############################################################################# 3899#############################################################################
3577 3900
3578package CFPlus::UI::Menu; 3901package DC::UI::Menu;
3579 3902
3580our @ISA = CFPlus::UI::Toplevel::; 3903our @ISA = DC::UI::Toplevel::;
3581 3904
3582use CFPlus::OpenGL; 3905use DC::OpenGL;
3583 3906
3584sub new { 3907sub new {
3585 my $class = shift; 3908 my $class = shift;
3586 3909
3587 my $self = $class->SUPER::new ( 3910 my $self = $class->SUPER::new (
3588 items => [], 3911 items => [],
3589 z => 100, 3912 z => 100,
3590 @_, 3913 @_,
3591 ); 3914 );
3592 3915
3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3916 $self->add ($self->{vbox} = new DC::UI::VBox);
3594 3917
3595 for my $item (@{ $self->{items} }) { 3918 for my $item (@{ $self->{items} }) {
3596 my ($widget, $cb, $tooltip) = @$item; 3919 my ($widget, $cb, $tooltip) = @$item;
3597 3920
3598 # handle various types of items, only text for now 3921 # handle various types of items, only text for now
3599 if (!ref $widget) { 3922 if (!ref $widget) {
3600 if ($widget =~ /\t/) { 3923 if ($widget =~ /\t/) {
3601 my ($left, $right) = split /\t/, $widget, 2; 3924 my ($left, $right) = split /\t/, $widget, 2;
3602 3925
3603 $widget = new CFPlus::UI::HBox 3926 $widget = new DC::UI::HBox
3604 can_hover => 1, 3927 can_hover => 1,
3605 can_events => 1, 3928 can_events => 1,
3606 tooltip => $tooltip, 3929 tooltip => $tooltip,
3607 children => [ 3930 children => [
3608 (new CFPlus::UI::Label markup => $left, expand => 1), 3931 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3609 (new CFPlus::UI::Label markup => $right, align => +1), 3932 (new DC::UI::Label markup => $right, align => 1),
3610 ], 3933 ],
3611 ; 3934 ;
3612 3935
3613 } else { 3936 } else {
3614 $widget = new CFPlus::UI::Label 3937 $widget = new DC::UI::Label
3615 can_hover => 1, 3938 can_hover => 1,
3616 can_events => 1, 3939 can_events => 1,
3940 align => 0,
3617 markup => $widget, 3941 markup => $widget,
3618 tooltip => $tooltip; 3942 tooltip => $tooltip;
3619 } 3943 }
3620 } 3944 }
3621 3945
3636 # maybe save $GRAB? must be careful about events... 3960 # maybe save $GRAB? must be careful about events...
3637 $GRAB = $self; 3961 $GRAB = $self;
3638 $self->{button} = $ev->{button}; 3962 $self->{button} = $ev->{button};
3639 3963
3640 $self->show; 3964 $self->show;
3641 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3965
3966 my $x = $ev->{x};
3967 my $y = $ev->{y};
3968
3969 $self->{root}->on_post_alloc ($self => sub {
3970 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3971 });
3972
3973 1 # so it can be used inside event handlers
3642} 3974}
3643 3975
3644sub invoke_mouse_motion { 3976sub invoke_mouse_motion {
3645 my ($self, $ev, $x, $y) = @_; 3977 my ($self, $ev, $x, $y) = @_;
3646 3978
3667 1 3999 1
3668} 4000}
3669 4001
3670############################################################################# 4002#############################################################################
3671 4003
3672package CFPlus::UI::Multiplexer; 4004package DC::UI::Multiplexer;
3673 4005
3674our @ISA = CFPlus::UI::Container::; 4006our @ISA = DC::UI::Container::;
3675 4007
3676sub new { 4008sub new {
3677 my $class = shift; 4009 my $class = shift;
3678 4010
3679 my $self = $class->SUPER::new ( 4011 my $self = $class->SUPER::new (
3680 @_, 4012 @_,
3681 ); 4013 );
3682 4014
3683 $self->{current} = $self->{children}[0] 4015 $self->set_current_page (0);
3684 if @{ $self->{children} };
3685 4016
3686 $self 4017 $self
3687} 4018}
3688 4019
3689sub add { 4020sub add {
3690 my ($self, @widgets) = @_; 4021 my ($self, @widgets) = @_;
3691 4022
3692 $self->SUPER::add (@widgets); 4023 $self->SUPER::add (@widgets);
3693 4024
3694 $self->{current} = $self->{children}[0] 4025 $self->set_current_page (0)
3695 if @{ $self->{children} }; 4026 if @widgets == @{ $self->{children} };
3696} 4027}
3697 4028
3698sub get_current_page { 4029sub get_current_page {
3699 my ($self) = @_; 4030 my ($self) = @_;
3700 4031
3706 4037
3707 my $widget = ref $page_or_widget 4038 my $widget = ref $page_or_widget
3708 ? $page_or_widget 4039 ? $page_or_widget
3709 : $self->{children}[$page_or_widget]; 4040 : $self->{children}[$page_or_widget];
3710 4041
4042 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4043
3711 $self->{current} = $widget; 4044 if (($self->{current} = $widget)) {
4045 $self->{current}->set_visible if $self->{current} && $self->{visible};
3712 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4046 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3713 4047
3714 $self->emit (page_changed => $self->{current}); 4048 $self->emit (page_changed => $self->{current});
4049 }
3715 4050
3716 $self->realloc; 4051 $self->realloc;
3717} 4052}
3718 4053
3719sub visible_children { 4054sub visible_children {
3720 $_[0]{current} 4055 $_[0]{current} || ()
3721} 4056}
3722 4057
3723sub size_request { 4058sub size_request {
3724 my ($self) = @_; 4059 my ($self) = @_;
3725 4060
4061 $self->{current}
3726 $self->{current}->size_request 4062 ? $self->{current}->size_request
4063 : (0, 0)
3727} 4064}
3728 4065
3729sub invoke_size_allocate { 4066sub invoke_size_allocate {
3730 my ($self, $w, $h) = @_; 4067 my ($self, $w, $h) = @_;
3731 4068
3732 $self->{current}->configure (0, 0, $w, $h); 4069 $self->{current}->configure (0, 0, $w, $h)
4070 if $self->{current};
3733 4071
3734 1 4072 1
3735} 4073}
3736 4074
3737sub _draw { 4075sub _draw {
3738 my ($self) = @_; 4076 my ($self) = @_;
3739 4077
3740 $self->{current}->draw; 4078 $self->{current}->draw
4079 if $self->{current};
3741} 4080}
3742 4081
3743############################################################################# 4082#############################################################################
3744 4083
3745package CFPlus::UI::Notebook; 4084package DC::UI::Notebook;
3746 4085
4086use DC::OpenGL;
4087
3747our @ISA = CFPlus::UI::VBox::; 4088our @ISA = DC::UI::VBox::;
3748 4089
3749sub new { 4090sub new {
3750 my $class = shift; 4091 my $class = shift;
3751 4092
3752 my $self = $class->SUPER::new ( 4093 my $self = $class->SUPER::new (
3753 buttonbar => (new CFPlus::UI::Buttonbar), 4094 buttonbar => (new DC::UI::Buttonbar),
3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4095 multiplexer => (new DC::UI::Multiplexer expand => 1),
4096 active_outline => [.7, .7, 0.2],
3755 # filter => # will be put between multiplexer and $self 4097 # filter => # will be put between multiplexer and $self
3756 @_, 4098 @_,
3757 ); 4099 );
3758 4100
3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4101 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3760 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4102 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3761 4103
4104 {
4105 Scalar::Util::weaken (my $wself = $self);
4106
4107 $self->{multiplexer}->connect (c_add => sub {
4108 my ($mplex, $widgets) = @_;
4109
4110 for my $child (@$widgets) {
4111 Scalar::Util::weaken $child;
4112 $child->{c_tab_} ||= do {
4113 my $tab =
4114 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4115 ? $child->{c_tab}
4116 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4117
4118 $tab->connect (activate => sub {
4119 $wself->set_current_page ($child);
4120 });
4121
4122 $tab
4123 };
4124
4125 $self->{buttonbar}->add ($child->{c_tab_});
4126 }
4127 });
4128
4129 $self->{multiplexer}->connect (c_remove => sub {
4130 my ($mplex, $widgets) = @_;
4131
4132 for my $child (@$widgets) {
4133 $wself->{buttonbar}->remove ($child->{c_tab_});
4134 }
4135 });
4136 }
4137
3762 $self 4138 $self
3763} 4139}
3764 4140
3765sub add { 4141sub add {
4142 my ($self, @widgets) = @_;
4143
4144 $self->{multiplexer}->add (@widgets)
4145}
4146
4147sub remove {
4148 my ($self, @widgets) = @_;
4149
4150 $self->{multiplexer}->remove (@widgets)
4151}
4152
4153sub pages {
4154 my ($self) = @_;
4155 $self->{multiplexer}->children
4156}
4157
4158sub page_index {
4159 my ($self, $widget) = @_;
4160
4161 my $i = 0;
4162 for ($self->pages) {
4163 if ($_ eq $widget) { return $i };
4164 $i++;
4165 }
4166
4167 undef
4168}
4169
4170sub add_tab {
3766 my ($self, $title, $widget, $tooltip) = @_; 4171 my ($self, $title, $widget, $tooltip) = @_;
3767 4172
3768 CFPlus::weaken $self; 4173 $title = [$title, $tooltip] unless ref $title;
4174 $widget->{c_tab} = $title;
3769 4175
3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3772 markup => $title,
3773 tooltip => $tooltip,
3774 );
3775 }
3776
3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3778 $self->{buttonbar}->add ($title);
3779
3780 $self->{multiplexer}->add ($widget); 4176 $self->add ($widget);
3781} 4177}
3782 4178
3783sub get_current_page { 4179sub get_current_page {
3784 my ($self) = @_; 4180 my ($self) = @_;
3785 4181
3791 4187
3792 $self->{multiplexer}->set_current_page ($page); 4188 $self->{multiplexer}->set_current_page ($page);
3793 $self->emit (page_changed => $self->{multiplexer}{current}); 4189 $self->emit (page_changed => $self->{multiplexer}{current});
3794} 4190}
3795 4191
4192sub _draw {
4193 my ($self) = @_;
4194
4195 $self->SUPER::_draw ();
4196
4197 if (my $cur = $self->{multiplexer}{current}) {
4198 if ($cur = $cur->{c_tab_}) {
4199 glTranslate $self->{buttonbar}{x} + $cur->{x},
4200 $self->{buttonbar}{y} + $cur->{y};
4201 glLineWidth 3;
4202 #glEnable GL_BLEND;
4203 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4204 glColor @{$self->{active_outline}};
4205 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4206 glLineWidth 1;
4207 #glDisable GL_BLEND;
4208 }
4209 }
4210}
4211
3796############################################################################# 4212#############################################################################
3797 4213
3798package CFPlus::UI::Selector; 4214package DC::UI::Selector;
3799 4215
3800use utf8; 4216use utf8;
3801 4217
3802our @ISA = CFPlus::UI::Button::; 4218our @ISA = DC::UI::Button::;
3803 4219
3804sub new { 4220sub new {
3805 my $class = shift; 4221 my $class = shift;
3806 4222
3807 my $self = $class->SUPER::new ( 4223 my $self = $class->SUPER::new (
3824 my ($value, $title, $tooltip) = @$_; 4240 my ($value, $title, $tooltip) = @$_;
3825 4241
3826 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4242 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3827 } 4243 }
3828 4244
3829 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4245 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3830} 4246}
3831 4247
3832sub _set_value { 4248sub _set_value {
3833 my ($self, $value) = @_; 4249 my ($self, $value) = @_;
3834 4250
3835 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4251 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4252 $item ||= $self->{options}[0]
3836 or return; 4253 or return;
3837 4254
3838 $self->{value} = $item->[0]; 4255 $self->{value} = $item->[0];
3839 $self->set_markup ("$item->[1] ⇓"); 4256 $self->set_markup ("$item->[1] ⇓");
3840 $self->set_tooltip ($item->[2]); 4257# $self->set_tooltip ($item->[2]);
3841} 4258}
3842 4259
3843sub set_value { 4260sub set_value {
3844 my ($self, $value) = @_; 4261 my ($self, $value) = @_;
3845 4262
3847 4264
3848 $self->_set_value ($value); 4265 $self->_set_value ($value);
3849 $self->emit (changed => $value); 4266 $self->emit (changed => $value);
3850} 4267}
3851 4268
4269sub set_options {
4270 my ($self, $options) = @_;
4271
4272 $self->{options} = $options;
4273 $self->_set_value ($self->{value});
4274}
4275
3852############################################################################# 4276#############################################################################
3853 4277
3854package CFPlus::UI::Statusbox; 4278package DC::UI::Statusbox;
3855 4279
3856our @ISA = CFPlus::UI::VBox::; 4280our @ISA = DC::UI::VBox::;
3857 4281
3858sub new { 4282sub new {
3859 my $class = shift; 4283 my $class = shift;
3860 4284
3861 my $self = $class->SUPER::new ( 4285 my $self = $class->SUPER::new (
3862 fontsize => 0.8, 4286 fontsize => 0.8,
3863 @_, 4287 @_,
3864 ); 4288 );
3865 4289
3866 CFPlus::weaken (my $this = $self); 4290 DC::weaken (my $this = $self);
3867 4291
3868 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4292 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3869 4293
3870 $self 4294 $self
3871} 4295}
3872 4296
3873sub reorder { 4297sub reorder {
3874 my ($self) = @_; 4298 my ($self) = @_;
3875 my $NOW = Time::HiRes::time; 4299 my $NOW = AE::time;
3876 4300
3877 # freeze display when hovering over any label 4301 # freeze display when hovering over any label
3878 return if $CFPlus::UI::TOOLTIP->{owner} 4302 return if $DC::UI::TOOLTIP->{owner}
3879 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4303 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3880 values %{ $self->{item} }; 4304 values %{ $self->{item} };
3881 4305
3882 while (my ($k, $v) = each %{ $self->{item} }) { 4306 while (my ($k, $v) = each %{ $self->{item} }) {
3883 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4307 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3884 } 4308 }
4309
4310 $self->{timer}->set (1, 1);
3885 4311
3886 my @widgets; 4312 my @widgets;
3887 4313
3888 my @items = sort { 4314 my @items = sort {
3889 $a->{pri} <=> $b->{pri} 4315 $a->{pri} <=> $b->{pri}
3890 or $b->{id} <=> $a->{id} 4316 or $b->{id} <=> $a->{id}
3891 } values %{ $self->{item} }; 4317 } values %{ $self->{item} };
3892
3893 $self->{timer}->interval (1);
3894 4318
3895 my $count = 10 + 1; 4319 my $count = 10 + 1;
3896 for my $item (@items) { 4320 for my $item (@items) {
3897 last unless --$count; 4321 last unless --$count;
3898 4322
3905 for ($short) { 4329 for ($short) {
3906 s/^\s+//; 4330 s/^\s+//;
3907 s/\s+/ /g; 4331 s/\s+/ /g;
3908 } 4332 }
3909 4333
3910 new CFPlus::UI::Label 4334 new DC::UI::Label
3911 markup => $short, 4335 markup => $short,
3912 tooltip => $item->{tooltip}, 4336 tooltip => $item->{tooltip},
3913 tooltip_font => $::FONT_PROP, 4337 tooltip_font => $::FONT_PROP,
3914 tooltip_width => 0.67, 4338 tooltip_width => 0.67,
3915 fontsize => $item->{fontsize} || $self->{fontsize}, 4339 fontsize => $item->{fontsize} || $self->{fontsize},
3916 max_w => $::WIDTH * 0.44, 4340 max_w => $::WIDTH * 0.44,
4341 align => 0,
3917 fg => [@{ $item->{fg} }], 4342 fg => [@{ $item->{fg} }],
3918 can_events => 1, 4343 can_events => 1,
3919 can_hover => 1 4344 can_hover => 1
3920 }; 4345 };
3921 4346
3922 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4347 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3923 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4348 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3924 $label->update; 4349 $label->update;
3925 $label->set_max_size (undef, $label->{req_h} * $diff) 4350 $label->set_max_size (undef, $label->{req_h} * $diff)
3926 if $diff < 1; 4351 if $diff < 1;
3927 $self->{timer}->interval (1/30); 4352 $self->{timer}->set (1/30, 1/30);
3928 } else { 4353 } else {
3929 $label->{fg}[3] = $item->{fg}[3] || 1; 4354 $label->{fg}[3] = $item->{fg}[3] || 1;
3930 } 4355 }
3931 4356
3932 push @widgets, $label; 4357 push @widgets, $label;
3933 } 4358 }
4359
4360 my $hash = join ",", @widgets;
4361 return if $hash eq $self->{last_widget_hash};
4362 $self->{last_widget_hash} = $hash;
3934 4363
3935 $self->clear; 4364 $self->clear;
3936 $self->SUPER::add (reverse @widgets); 4365 $self->SUPER::add (reverse @widgets);
3937} 4366}
3938 4367
3974 $ROOT->on_refresh (reorder => sub { 4403 $ROOT->on_refresh (reorder => sub {
3975 $self->reorder; 4404 $self->reorder;
3976 }); 4405 });
3977} 4406}
3978 4407
4408sub clr_group {
4409 my ($self, $group) = @_;
4410
4411 if (delete $self->{item}{$group}) {
4412 $ROOT->on_refresh (reorder => sub {
4413 $self->reorder;
4414 });
4415 }
4416}
4417
3979sub reconfigure { 4418sub reconfigure {
3980 my ($self) = @_; 4419 my ($self) = @_;
3981 4420
3982 delete $_->{label} 4421 delete $_->{label}
3983 for values %{ $self->{item} || {} }; 4422 for values %{ $self->{item} || {} };
3994 $self->SUPER::destroy; 4433 $self->SUPER::destroy;
3995} 4434}
3996 4435
3997############################################################################# 4436#############################################################################
3998 4437
3999package CFPlus::UI::Root; 4438package DC::UI::Root;
4000 4439
4001our @ISA = CFPlus::UI::Container::; 4440our @ISA = DC::UI::Container::;
4002 4441
4003use List::Util qw(min max); 4442use List::Util qw(min max);
4004 4443
4005use CFPlus::OpenGL; 4444use DC::OpenGL;
4006 4445
4007sub new { 4446sub new {
4008 my $class = shift; 4447 my $class = shift;
4009 4448
4010 my $self = $class->SUPER::new ( 4449 my $self = $class->SUPER::new (
4011 visible => 1, 4450 visible => 1,
4012 @_, 4451 @_,
4013 ); 4452 );
4014 4453
4015 CFPlus::weaken ($self->{root} = $self); 4454 DC::weaken ($self->{root} = $self);
4016 4455
4017 $self 4456 $self
4018} 4457}
4019 4458
4020sub size_request { 4459sub size_request {
4068} 4507}
4069 4508
4070sub update { 4509sub update {
4071 my ($self) = @_; 4510 my ($self) = @_;
4072 4511
4073 $::WANT_REFRESH++; 4512 $::WANT_REFRESH = 1;
4074} 4513}
4075 4514
4076sub add { 4515sub add {
4077 my ($self, @children) = @_; 4516 my ($self, @children) = @_;
4078 4517
4145 4584
4146 delete $queue{$widget+0}; 4585 delete $queue{$widget+0};
4147 4586
4148 my ($w, $h) = $widget->size_request; 4587 my ($w, $h) = $widget->size_request;
4149 4588
4150 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4589 $w += $widget->{padding_x} * 2;
4151 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4590 $h += $widget->{padding_y} * 2;
4591
4592 $w = max $widget->{min_w}, $w;
4593 $h = max $widget->{min_h}, $h;
4152 4594
4153 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4595 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4154 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4596 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4155 4597
4156 $w = $widget->{force_w} if exists $widget->{force_w}; 4598 $w = $widget->{force_w} if exists $widget->{force_w};
4223 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4665 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4224 glMatrixMode GL_MODELVIEW; 4666 glMatrixMode GL_MODELVIEW;
4225 glLoadIdentity; 4667 glLoadIdentity;
4226 4668
4227 { 4669 {
4228 package CFPlus::UI::Base; 4670 package DC::UI::Base;
4229 4671
4230 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4672 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4231 (0, 0, $self->{w}, $self->{h}); 4673 (0, 0, $self->{w}, $self->{h});
4232 4674
4233 $self->_draw; 4675 $self->_draw;
4234 } 4676 }
4235} 4677}
4236 4678
4237############################################################################# 4679#############################################################################
4238 4680
4239package CFPlus::UI; 4681package DC::UI;
4240 4682
4241$ROOT = new CFPlus::UI::Root; 4683$ROOT = new DC::UI::Root;
4242$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4684$TOOLTIP = new DC::UI::Tooltip z => 900;
4243 4685
42441 46861
4245

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines