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.378 by root, Mon Jul 16 20:22:39 2007 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use DC;
10use CFPlus::Pod; 9use DC::Pod;
11use CFPlus::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
… …
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
… …
210 reconfigure_widgets; 211 reconfigure_widgets;
211} 212}
212 213
213############################################################################# 214#############################################################################
214 215
215package CFPlus::UI::Event; 216package DC::UI::Event;
216 217
217sub xy { 218sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 220}
220 221
221############################################################################# 222#############################################################################
222 223
223package CFPlus::UI::Base; 224package DC::UI::Base;
224 225
225use strict; 226use strict;
226 227
227use CFPlus::OpenGL; 228use DC::OpenGL;
228 229
229sub new { 230sub new {
230 my $class = shift; 231 my $class = shift;
231 232
232 my $self = bless { 233 my $self = bless {
… …
237 h => undef, 238 h => undef,
238 can_events => 1, 239 can_events => 1,
239 @_ 240 @_
240 }, $class; 241 }, $class;
241 242
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 244
244 for (keys %$self) { 245 for (keys %$self) {
245 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
247 } 248 }
248 } 249 }
249 250
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 256
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 259
259 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
280 return if $self->{parent}; 281 return if $self->{parent};
281 282
282 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
283} 284}
284 285
285sub set_visible { 286sub set_visible {
286 my ($self) = @_; 287 my ($self) = @_;
287 288
… …
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
… …
337sub hide { 338sub hide {
338 my ($self) = @_; 339 my ($self) = @_;
339 340
340 $self->set_invisible; 341 $self->set_invisible;
341 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 346 $parent->remove ($self);
343 if $self->{parent}; 347 }
344} 348}
345 349
346sub move_abs { 350sub move_abs {
347 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
348 352
… …
360 $self->{force_h} = $h; 364 $self->{force_h} = $h;
361 365
362 $self->realloc; 366 $self->realloc;
363} 367}
364 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
365sub size_request { 387sub size_request {
366 require Carp; 388 require Carp;
367 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
368} 390}
369 391
… …
375 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
376 398
377 if ($self->{aspect}) { 399 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
379 401
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 404
383 # use alignment to adjust x, y 405 # use alignment to adjust x, y
384 406
385 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
… …
427 449
428 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
429 451
430 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
431 453
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 457 }
436} 458}
437 459
438# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
439sub coord2local { 461sub coord2local {
440 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
441 463
442 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
443 465
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 467}
446 468
447# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
448sub coord2global { 470sub coord2global {
449 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
450 472
451 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
452 474
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 476}
455 477
456sub invoke_focus_in { 478sub invoke_focus_in {
… …
505sub connect { 527sub connect {
506 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
507 529
508 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
509 531
510 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
513 } 535 }
514} 536}
515 537
… …
547 569
548 # parent 570 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 572}
551 573
552sub find_widget { 574#sub find_widget {
553 my ($self, $x, $y) = @_; 575# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 576
564sub set_parent { 577sub set_parent {
565 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
566 579
567 CFPlus::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
569} 582}
570 583
571sub realloc { 584sub realloc {
572 my ($self) = @_; 585 my ($self) = @_;
… …
598 611
599# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 613# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 615
603sub draw { 616#sub draw {
604 my ($self) = @_; 617#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 618
650sub _draw { 619sub _draw {
651 my ($self) = @_; 620 my ($self) = @_;
652 621
653 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
654} 623}
655 624
656my $cntx;#d#
657sub DESTROY { 625sub DESTROY {
658 my ($self) = @_; 626 my ($self) = @_;
659 627
660 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
661 629
630 local $@;
662 eval { $self->destroy }; 631 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 633
665 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
666} 635}
667 636
668############################################################################# 637#############################################################################
669 638
670package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
671 640
672our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
673 642
674use strict; 643use strict;
675use CFPlus::OpenGL; 644use DC::OpenGL;
676 645
677sub new { 646sub new {
678 my $class = shift; 647 my $class = shift;
679
680 # range [value, low, high, page]
681 648
682 $class->SUPER::new ( 649 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
685 @_ 652 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
698 665
699 glEnable GL_BLEND; 666 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 668 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 670 glDisable GL_BLEND;
711 } 671 }
712} 672}
713 673
714############################################################################# 674#############################################################################
715 675
716package CFPlus::UI::Empty; 676package DC::UI::Empty;
717 677
718our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
719 679
720sub new { 680sub new {
721 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
723} 683}
… …
730 690
731sub draw { } 691sub draw { }
732 692
733############################################################################# 693#############################################################################
734 694
735package CFPlus::UI::Container; 695package DC::UI::Container;
736 696
737our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
738 698
739sub new { 699sub new {
740 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
741 701
742 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
746 can_events => 0, 706 can_events => 0,
747 %arg, 707 %arg,
748 ); 708 );
749 709
750 $self->add (@$children) 710 $self->add (@$children)
751 if $children; 711 if $children && @$children;
752 712
753 $self 713 $self
754} 714}
755 715
756sub realloc { 716sub realloc {
… …
765 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
766 726
767 $_->set_parent ($self) 727 $_->set_parent ($self)
768 for @widgets; 728 for @widgets;
769 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 731 use sort 'stable';
771 732
772 $self->{children} = [ 733 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
775 ]; 736 ];
776 737
777 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
778} 743}
779 744
780sub children { 745sub children {
781 @{ $_[0]{children} } 746 @{ $_[0]{children} }
782} 747}
783 748
784sub remove { 749sub remove {
785 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
786 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
787 delete $child->{parent}; 755 delete $child->{parent};
788 $child->hide; 756 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
791 759
792 $self->realloc; 760 $self->realloc;
793} 761}
794 762
795sub clear { 763sub clear {
796 my ($self) = @_; 764 my ($self) = @_;
797 765
798 my $children = delete $self->{children}; 766 my $children = $self->{children};
799 $self->{children} = []; 767 $self->{children} = [];
800 768
801 for (@$children) { 769 for (@$children) {
802 delete $_->{parent}; 770 delete $_->{parent};
803 $_->hide; 771 $_->hide;
… …
823} 791}
824 792
825sub _draw { 793sub _draw {
826 my ($self) = @_; 794 my ($self) = @_;
827 795
828 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
829} 797}
830 798
831############################################################################# 799#############################################################################
832 800
833package CFPlus::UI::Bin; 801package DC::UI::Bin;
834 802
835our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
836 804
837sub new { 805sub new {
838 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
839 807
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 809
842 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
843} 811}
844 812
845sub add { 813sub add {
846 my ($self, $child) = @_; 814 my ($self, $child) = @_;
847 815
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
849 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
850} 818}
851 819
852sub remove { 820sub remove {
853 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
854 822
855 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
856 824
857 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 826 unless @{$self->{children}};
859} 827}
860 828
861sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
862 830
… …
871 839
872 1 840 1
873} 841}
874 842
875############################################################################# 843#############################################################################
876
877# back-buffered drawing area 844# back-buffered drawing area
878 845
879package CFPlus::UI::Window; 846package DC::UI::Window;
880 847
881our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
882 849
883use CFPlus::OpenGL; 850use DC::OpenGL;
884 851
885sub new { 852sub new {
886 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
887 854
888 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
910} 877}
911 878
912sub render_child { 879sub render_child {
913 my ($self) = @_; 880 my ($self) = @_;
914 881
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
918 885
919 { 886 {
920 package CFPlus::UI::Base; 887 package DC::UI::Base;
921 888
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
924 891
925 $self->_render; 892 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
943} 910}
944 911
945############################################################################# 912#############################################################################
946 913
947package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
948 915
949use List::Util qw(min max); 916use List::Util qw(min max);
950 917
951our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
952 919
953sub new { 920sub new {
954 my $class = shift; 921 my $class = shift;
955 922
956 $class->SUPER::new ( 923 $class->SUPER::new (
… …
963sub size_request { 930sub size_request {
964 my ($self) = @_; 931 my ($self) = @_;
965 932
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 934
968 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
970 937
971 ($w, $h) 938 ($w, $h)
972} 939}
973 940
974sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 965 $self->emit (changed => $x, $y);
999 $self->update; 966 $self->update;
1000 } 967 }
1001} 968}
1002 969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
986}
987
1003# hmm, this does not work for topleft of $self... but we should not ask for that 988# hmm, this does not work for topleft of $self... but we should not ask for that
1004sub coord2local { 989sub coord2local {
1005 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
1006 991
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 992 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1021 1006
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1009 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1011 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1028 } 1013 }
1029} 1014}
1030 1015
1031sub _render { 1016sub _render {
1032 my ($self) = @_; 1017 my ($self) = @_;
1033 1018
1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1019 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1036 1021
1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1038 1023
1039 $self->SUPER::_render; 1024 $self->SUPER::_render;
1040} 1025}
1041 1026
1042############################################################################# 1027#############################################################################
1043 1028
1044package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1045 1030
1046our @ISA = CFPlus::UI::Table::; 1031our @ISA = DC::UI::Table::;
1047 1032
1048sub new { 1033sub new {
1049 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1050 1035
1051 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1052 1037
1053 my $self; 1038 my $self;
1054 1039
1055 my $hslider = new CFPlus::UI::Slider 1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1056 vertical => 0, 1043 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1045 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1046 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1048 },
1062 ; 1049 ;
1063 1050
1064 my $vslider = new CFPlus::UI::Slider 1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
1065 vertical => 1, 1054 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1056 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1057 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1079 col_expand => [1, 0], 1068 col_expand => [1, 0],
1080 row_expand => [1, 0], 1069 row_expand => [1, 0],
1081 %arg, 1070 %arg,
1082 ); 1071 );
1083 1072
1084 $self->{vp} = new CFPlus::UI::ViewPort 1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1085 expand => 1, 1076 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1077 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1078 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1079 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1080 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1082 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1083 $vp->{parent}{vslider}->set_value ($y);
1093 1084
1094 0 1085 0
1095 }, 1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1096 ; 1092 ;
1097 1093
1098 $self->SUPER::add (0, 0, $self->{vp}); 1094 $self->SUPER::add ($self->{vp});
1099 1095
1100 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1101 1097
1102 $self 1098 $self
1103} 1099}
1104
1105#TODO# update range on size_allocate depending on child
1106 1100
1107sub add { 1101sub add {
1108 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1109 1103
1110 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1111} 1105}
1112 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1113sub update_slider { 1111sub update_slider {
1114 my ($self) = @_; 1112 my ($self) = @_;
1115 1113
1116 my $child = ($self->{vp} or return)->child; 1114 my $child = ($self->{vp} or return)->child;
1117 1115
1116 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1119
1121 my $visible = $w1 > $w2; 1120 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1123 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1125 } 1126 }
1126 1127
1128 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1131
1130 my $visible = $h1 > $h2; 1132 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1135 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1134 } 1156 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1157}
1143 1158
1144sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1146 1161
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1164
1151 1 1165 1
1152} 1166}
1153 1167
1154sub invoke_button_down { 1168sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1156 1170
1157 if ($ev->{button} == 2) { 1171 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1172 $self->start_dragging ($ev);
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1; 1173 return 1;
1171 } 1174 }
1172 1175
1173 0 1176 0
1174} 1177}
… …
1201 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1202} 1205}
1203 1206
1204############################################################################# 1207#############################################################################
1205 1208
1206package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1207 1210
1208our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1209 1212
1210use CFPlus::OpenGL; 1213use DC::OpenGL;
1211 1214
1212sub new { 1215sub new {
1213 my $class = shift; 1216 my $class = shift;
1214 1217
1215 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1225 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1226 1229
1227 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1230
1231 glBegin GL_QUADS;
1232 glVertex 0 , 0;
1233 glVertex 0 , $h;
1234 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1235 glVertex $w, 0;
1236 glEnd;
1237
1238 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1239 } 1235 }
1240 1236
1241 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1242} 1238}
1243 1239
1244############################################################################# 1240#############################################################################
1245 1241
1246package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1247 1243
1248our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1249 1245
1250use CFPlus::OpenGL; 1246use DC::OpenGL;
1251 1247
1252sub new { 1248sub new {
1253 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1254 1250
1255 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1257 align => 1, 1253 align => 1,
1258 valign => 0, 1254 valign => 0.5,
1259 text => $arg{label}, 1255 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1261 } 1257 }
1262 1258
1263 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
… …
1273 1269
1274sub add { 1270sub add {
1275 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1276 1272
1277 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1279} 1275}
1280 1276
1281sub border { 1277sub border {
1282 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1283} 1279}
… …
1341 } 1337 }
1342} 1338}
1343 1339
1344############################################################################# 1340#############################################################################
1345 1341
1346package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1347 1343
1348our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1349 1345
1350use CFPlus::OpenGL; 1346use DC::OpenGL;
1351 1347
1352my $bg = 1348my $bg =
1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1354 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1355 1351
1356my @border = 1352my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355
1356my @icon =
1357 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1359 1359
1360sub new { 1360sub new {
1361 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1362 1362
1363 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
… …
1368 min_w => 64, 1368 min_w => 64,
1369 min_h => 32, 1369 min_h => 32,
1370 %arg, 1370 %arg,
1371 ); 1371 );
1372 1372
1373 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1374 align => 0, 1374 align => 0.5,
1375 valign => 1, 1375 valign => 1,
1376 text => $self->{title}, 1376 text => $self->{title},
1377 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1378 if exists $self->{title}; 1378 if exists $self->{title};
1379 1379
1380 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1381 $self->{close_button} = 1381 $self->{close_button} =
1382 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1383 path => 'x1_close.png', 1383 path => 'x1_close.png',
1384 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1385 1385
1386 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1387 } 1387 }
1388 1388
1389 $self 1389 $self
1390} 1390}
1391 1391
1392sub add { 1392sub add {
1393 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1394 1394
1395 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1396 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1397 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1398} 1398}
1399 1399
1400sub border { 1400sub border {
1401 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1402} 1411}
1403 1412
1404sub size_request { 1413sub size_request {
1405 my ($self) = @_; 1414 my ($self) = @_;
1406 1415
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1542
1534 my $border = $self->border; 1543 my $border = $self->border;
1535 1544
1536 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550
1551 # move
1552 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557
1558 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541 1564
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1544 1567
1545 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1564 if $self->{close_button}; 1587 if $self->{close_button};
1565} 1588}
1566 1589
1567############################################################################# 1590#############################################################################
1568 1591
1569package CFPlus::UI::Table; 1592package DC::UI::Table;
1570 1593
1571our @ISA = CFPlus::UI::Base::; 1594our @ISA = DC::UI::Container::;
1572 1595
1573use List::Util qw(max sum); 1596use List::Util qw(max sum);
1574 1597
1575use CFPlus::OpenGL; 1598use DC::OpenGL;
1576 1599
1577sub new { 1600sub new {
1578 my $class = shift; 1601 my $class = shift;
1579 1602
1580 $class->SUPER::new ( 1603 $class->SUPER::new (
1581 children => [],
1582 col_expand => [], 1604 col_expand => [],
1583 row_expand => [], 1605 row_expand => [],
1584 @_, 1606 @_,
1585 ) 1607 )
1586} 1608}
1587 1609
1588sub children {
1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590}
1591
1592# TODO: store row/col info in child widget and use standard add/del
1593sub add { 1610sub add {
1611 my ($self, @widgets) = @_;
1612
1613 for my $child (@widgets) {
1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1617
1618 $self->SUPER::add (@widgets);
1619}
1620
1621sub add_at {
1594 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1595 1625
1596 while (@_) { 1626 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1598 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child;
1600 }
1601 1628
1602 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1603 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1604 $self->realloc;
1605}
1606 1631
1607sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1608 my ($self, $child) = @_; 1639 my ($self) = @_;
1609 1640
1610 for (@{ $self->{children} }) { 1641 my (@w, @h);
1611 for (@{ $_ || [] }) { 1642
1612 $_ = undef if $_ == $child; 1643 my @children = $self->children;
1644
1645 # first pass, columns
1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1648
1649 my $sw = sum @w[$c .. $c + $cs - 1];
1650
1651 if ($w > $sw) {
1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1613 } 1653 }
1614 } 1654 }
1615}
1616 1655
1617# TODO: move to container class maybe? send children a signal on removal? 1656 # second pass, rows
1618sub clear { 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1619 my ($self) = @_;
1620
1621 my @children = $self->children;
1622 delete $self->{children};
1623
1624 for (@children) {
1625 delete $_->{parent};
1626 $_->hide;
1627 }
1628
1629 $self->realloc;
1630}
1631
1632sub get_wh {
1633 my ($self) = @_;
1634
1635 my (@w, @h);
1636
1637 for my $y (0 .. $#{$self->{children}}) {
1638 my $row = $self->{children}[$y]
1639 or next;
1640
1641 for my $x (0 .. $#$row) {
1642 my $widget = $row->[$x]
1643 or next;
1644 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1645 1659
1646 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1647 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1648 } 1664 }
1649 } 1665 }
1650 1666
1651 (\@w, \@h) 1667 (\@w, \@h)
1652} 1668}
… …
1668 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1669 1685
1670 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1671 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1672 1688
1673 # TODO: nicer code 1689 # now linearly scale the rows/columns to the allocated size
1674 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1675 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1676 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1677 1693
1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1679 1695
1680 CFPlus::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1681 1697
1682 my @row_expand = @{$self->{row_expand}}; 1698 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand; 1699 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1; 1700 my $row_expand = (sum @row_expand) || 1;
1685 1701
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687 1703
1688 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1689 1705
1690 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1691 1708
1692 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1693 my $row = $self->{children}[$r] 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1694 or next;
1695 1711
1696 my $x = 0; 1712 $widget->configure (
1697 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698 1715 );
1699 for my $c (0 .. $#$row) {
1700 my $col_w = $ws->[$c];
1701
1702 if (my $widget = $row->[$c]) {
1703 $widget->configure ($x, $y, $col_w, $row_h);
1704 }
1705
1706 $x += $col_w;
1707 }
1708
1709 $y += $row_h;
1710 } 1716 }
1711 1717
1712 1 1718 1
1713} 1719}
1714 1720
1715sub find_widget {
1716 my ($self, $x, $y) = @_;
1717
1718 $x -= $self->{x};
1719 $y -= $self->{y};
1720
1721 my $res;
1722
1723 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1724 $res = $_->find_widget ($x, $y)
1725 and return $res;
1726 }
1727
1728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1729}
1730
1731sub _draw {
1732 my ($self) = @_;
1733
1734 for (grep $_, @{$self->{children}}) {
1735 $_->draw for grep $_, @$_;
1736 }
1737}
1738
1739############################################################################# 1721#############################################################################
1740 1722
1741package CFPlus::UI::Fixed; 1723package DC::UI::Fixed;
1742 1724
1743use List::Util qw(min max); 1725use List::Util qw(min max);
1744 1726
1745our @ISA = CFPlus::UI::Container::; 1727our @ISA = DC::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753 1728
1754sub _scale($$$) { 1729sub _scale($$$) {
1755 my ($mode, $val, $max) = @_; 1730 my ($rel, $val, $max) = @_;
1756 1731
1757 $mode eq "abs" ? $val 1732 $rel ? $val * $max : $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760} 1733}
1761 1734
1762sub size_request { 1735sub size_request {
1763 my ($self) = @_; 1736 my ($self) = @_;
1764 1737
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766 1739
1767 # determine overall size by querying abs widgets 1740 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) { 1741 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1770 1745
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1777 } 1748 }
1778 } 1749 }
1779 1750
1780 my $W = $x2 - $x1; 1751 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1; 1752 my $H = $y2 - $y1;
1782 1753
1783 # now layout remaining widgets 1754 # now layout remaining widgets
1784 for my $child ($self->visible_children) { 1755 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1786 1759
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1795 } 1762 }
1796 } 1763 }
1797 1764
1798 my $W = $x2 - $x1; 1765 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1; 1766 my $H = $y2 - $y1;
… …
1803 1770
1804sub invoke_size_allocate { 1771sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_; 1772 my ($self, $W, $H) = @_;
1806 1773
1807 for my $child ($self->visible_children) { 1774 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1809 1777
1810 $x = _scale $pos, $x, $W; 1778 $x += $child->{c_halign} * $child->{req_w};
1811 $y = _scale $pos, $x, $H; 1779 $y += $child->{c_valign} * $child->{req_h};
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814 1780
1815 $child->configure ($x, $y, $w, $h); 1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1816 } 1782 }
1817 1783
1818 1 1784 1
1819} 1785}
1820 1786
1821############################################################################# 1787#############################################################################
1822 1788
1823package CFPlus::UI::Box; 1789package DC::UI::Box;
1824 1790
1825our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1826 1792
1827sub size_request { 1793sub size_request {
1828 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1829 1797
1830 $self->{vertical} 1798 $self->{vertical}
1831 ? ( 1799 ? (
1832 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1833 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1834 ) 1802 )
1835 : ( 1803 : (
1836 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1837 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1838 ) 1806 )
1839} 1807}
1840 1808
1841sub invoke_size_allocate { 1809sub invoke_size_allocate {
1842 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1863 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1864 for 0 .. $#children; 1832 for 0 .. $#children;
1865 } 1833 }
1866 } 1834 }
1867 1835
1868 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1869 1837
1870 my $pos = 0; 1838 my $pos = 0;
1871 for (0 .. $#children) { 1839 for (0 .. $#children) {
1872 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1873 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1878 1 1846 1
1879} 1847}
1880 1848
1881############################################################################# 1849#############################################################################
1882 1850
1883package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1884 1852
1885our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1886 1854
1887sub new { 1855sub new {
1888 my $class = shift; 1856 my $class = shift;
1889 1857
1890 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1893 ) 1861 )
1894} 1862}
1895 1863
1896############################################################################# 1864#############################################################################
1897 1865
1898package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1899 1867
1900our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1901 1869
1902sub new { 1870sub new {
1903 my $class = shift; 1871 my $class = shift;
1904 1872
1905 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1908 ) 1876 )
1909} 1877}
1910 1878
1911############################################################################# 1879#############################################################################
1912 1880
1913package CFPlus::UI::Label; 1881package DC::UI::Label;
1914 1882
1915our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1916 1884
1917use CFPlus::OpenGL; 1885use DC::OpenGL;
1918 1886
1919sub new { 1887sub new {
1920 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1921 1889
1922 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1927 #text => initial text 1895 #text => initial text
1928 #markup => initial narkup 1896 #markup => initial narkup
1929 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1930 #style => 0, # render flags 1898 #style => 0, # render flags
1931 ellipsise => 3, # end 1899 ellipsise => 3, # end
1932 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1933 fontsize => 1, 1901 fontsize => 1,
1934 align => -1, 1902 align => 0.5,
1935 valign => -1, 1903 valign => 0.5,
1936 padding_x => 2, 1904 padding_x => 4,
1937 padding_y => 2, 1905 padding_y => 2,
1938 can_events => 0, 1906 can_events => 0,
1939 %arg 1907 %arg
1940 ); 1908 );
1941 1909
1942 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1943 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1944 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1945 $self->{template} = $layout; 1913 $self->{template} = $layout;
1946 } 1914 }
1947 1915
1948 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1966 1934
1967 delete $self->{ox}; 1935 delete $self->{ox};
1968 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1969} 1937}
1970 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1971sub set_text { 1945sub set_text {
1972 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1973 1947
1974 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1975 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
… …
1998 1972
1999sub size_request { 1973sub size_request {
2000 my ($self) = @_; 1974 my ($self) = @_;
2001 1975
2002 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
2003 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
2004 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
2005 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
2006 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2007 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2008 1984
2009 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
2010 1986
2011 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
2012 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
2013 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
2014 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2015 1991
2016 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
2017 1993
2018 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
2074 2050
2075 [$self->{layout}->size] 2051 [$self->{layout}->size]
2076 }; 2052 };
2077 2053
2078 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
2079 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2080 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2081 : ($self->{w} - $size->[0]) * 0.5);
2082 2057
2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2085 : ($self->{h} - $size->[1]) * 0.5);
2086 }; 2059 };
2087 2060
2088 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
2089 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
2090 2063# DC::OpenGL::glNewList $self->{list};
2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
2069
2070 $self->{layout}->draw;
2092} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
2093 2080
2094############################################################################# 2081#############################################################################
2095 2082
2096package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
2097 2084
2098our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
2099 2086
2100use CFPlus::OpenGL; 2087use DC::OpenGL;
2101 2088
2102sub new { 2089sub new {
2103 my $class = shift; 2090 my $class = shift;
2104 2091
2105 $class->SUPER::new ( 2092 $class->SUPER::new (
2106 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
2107 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
2108 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
2109 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
2110 can_hover => 1, 2099 can_hover => 1,
2111 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
2112 valign => 0, 2102 valign => 0.5,
2113 can_events => 1, 2103 can_events => 1,
2114 ellipsise => 0, 2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
2115 #text => ... 2107 #text => ...
2116 #hidden => "*", 2108 #hidden => "*",
2117 @_ 2109 @_
2118 ) 2110 )
2119} 2111}
… …
2170 2162
2171 if ($uni == 8) { 2163 if ($uni == 8) {
2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2173 } elsif ($uni == 127) { 2165 } elsif ($uni == 127) {
2174 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
2175 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
2176 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
2177 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
2178 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2179 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2180 # what a hack 2172 # what a hack
2181 $self->{cursor} = 2173 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1 2175 ? length $1
2184 : 0; 2176 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
2186 # uh, again 2178 # uh, again
2187 $self->{cursor} = 2179 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1 2181 ? $self->{cursor} + length $1
2190 : length $self->{text}; 2182 : length $self->{text};
… …
2254 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2255 } 2247 }
2256 2248
2257 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2258 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glBegin GL_QUADS;
2260 glVertex 0 , 0;
2261 glVertex 0 , $self->{h};
2262 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2263 glVertex $self->{w}, 0;
2264 glEnd;
2265 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2266 2253
2267 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2268 2255
2269 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
2271 2258
2272 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2273 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2274 utf8::encode $text; 2261 utf8::encode $text;
2275 2262
2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2277 } 2264 }
2278 2265
2266 glColor_premultiply @{$self->{active_fg}};
2279 glBegin GL_LINES; 2267 glBegin GL_LINES;
2280 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2282 glEnd; 2270 glEnd;
2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2283 } 2285 }
2284} 2286}
2285 2287
2286############################################################################# 2288#############################################################################
2287 2289
2288package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2289 2291
2290our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2291 2293
2292use CFPlus::OpenGL; 2294use DC::OpenGL;
2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
2293 2305
2294sub invoke_key_down { 2306sub invoke_key_down {
2295 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
2296 2308
2297 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
… …
2303 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
2304 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
2305 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
2306 $self->update; 2318 $self->update;
2307 2319
2308 } elsif ($sym == CFPlus::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
2309 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
2310 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
2311 } 2323 }
2312 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
2313 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
2315 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
2316 } 2328 }
2317 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2318 } 2330 }
2319 2331
2320 } elsif ($sym == CFPlus::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
2321 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2323 2335
2324 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2325 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2326 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2327 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2328 } 2343 }
2329 2344
2330 } else { 2345 } else {
2331 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2332 } 2347 }
… …
2334 1 2349 1
2335} 2350}
2336 2351
2337############################################################################# 2352#############################################################################
2338 2353
2339package CFPlus::UI::TextEdit; 2354package DC::UI::TextEdit;
2340 2355
2341our @ISA = CFPlus::UI::EntryBase::; 2356our @ISA = DC::UI::EntryBase::;
2342 2357
2343use CFPlus::OpenGL; 2358use DC::OpenGL;
2359
2360sub new {
2361 my $class = shift;
2362
2363 $class->SUPER::new (
2364 padding_y => 4,
2365
2366 @_
2367 )
2368}
2344 2369
2345sub move_cursor_ver { 2370sub move_cursor_ver {
2346 my ($self, $dy) = @_; 2371 my ($self, $dy) = @_;
2347 2372
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349 2374
2350 $y += $dy; 2375 $line += $dy;
2351 2376
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2353 $self->{cursor} = $index; 2378 $self->{cursor} = $index;
2354 delete $self->{cur_h}; 2379 delete $self->{cur_h};
2355 $self->update; 2380 $self->update;
2356 return; 2381 return;
2357 } 2382 }
… …
2360sub invoke_key_down { 2385sub invoke_key_down {
2361 my ($self, $ev) = @_; 2386 my ($self, $ev) = @_;
2362 2387
2363 my $sym = $ev->{sym}; 2388 my $sym = $ev->{sym};
2364 2389
2365 if ($sym == CFPlus::SDLK_UP) { 2390 if ($sym == DC::SDLK_UP) {
2366 $self->move_cursor_ver (-1); 2391 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) { 2392 } elsif ($sym == DC::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1); 2393 $self->move_cursor_ver (+1);
2369 } else { 2394 } else {
2370 return $self->SUPER::invoke_key_down ($ev) 2395 return $self->SUPER::invoke_key_down ($ev)
2371 } 2396 }
2372 2397
2373 1 2398 1
2374} 2399}
2375 2400
2376############################################################################# 2401#############################################################################
2377 2402
2378package CFPlus::UI::Button; 2403package DC::UI::ButtonBin;
2379 2404
2380our @ISA = CFPlus::UI::Label::; 2405our @ISA = DC::UI::Bin::;
2381 2406
2382use CFPlus::OpenGL; 2407use DC::OpenGL;
2383 2408
2384my @tex = 2409my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2410 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2411 qw(b1_button_inactive.png b1_button_active.png);
2387 2412
2388sub new { 2413sub new {
2389 my $class = shift; 2414 my $class = shift;
2390 2415
2391 $class->SUPER::new ( 2416 $class->SUPER::new (
2392 padding_x => 4,
2393 padding_y => 4,
2394 fg => [1, 1, 1],
2395 active_fg => [0, 0, 1],
2396 can_hover => 1, 2417 can_hover => 1,
2397 align => 0, 2418 align => 0.5,
2398 valign => 0, 2419 valign => 0.5,
2399 can_events => 1, 2420 can_events => 1,
2400 @_ 2421 @_
2401 ) 2422 )
2402} 2423}
2403 2424
… …
2412} 2433}
2413 2434
2414sub _draw { 2435sub _draw {
2415 my ($self) = @_; 2436 my ($self) = @_;
2416 2437
2417 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2418
2419 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
2422 2441
2442 my $tex = $tex[$GRAB == $self];
2423 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424 2444
2425 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2426 2446
2427 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
2428} 2448}
2429 2449
2430############################################################################# 2450#############################################################################
2431 2451
2432package CFPlus::UI::CheckBox; 2452package DC::UI::Button;
2433 2453
2434our @ISA = CFPlus::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
2435 2457
2436my @tex = 2458my @tex =
2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2459 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png);
2461
2462sub new {
2463 my $class = shift;
2464
2465 $class->SUPER::new (
2466 padding_x => 8,
2467 padding_y => 4,
2468 fg => [1.0, 1.0, 1.0],
2469 active_fg => [0.8, 0.8, 0.8],
2470 can_hover => 1,
2471 align => 0.5,
2472 valign => 0.5,
2473 can_events => 1,
2474 @_
2475 )
2476}
2477
2478sub invoke_button_up {
2479 my ($self, $ev, $x, $y) = @_;
2480
2481 $self->emit ("activate")
2482 if $x >= 0 && $x < $self->{w}
2483 && $y >= 0 && $y < $self->{h};
2484
2485 1
2486}
2487
2488sub _draw {
2489 my ($self) = @_;
2490
2491 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2492
2493 glEnable GL_TEXTURE_2D;
2494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2495 glColor 0, 0, 0, 1;
2496
2497 my $tex = $tex[$GRAB == $self];
2498 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499
2500 glDisable GL_TEXTURE_2D;
2501
2502 $self->SUPER::_draw;
2503}
2504
2505#############################################################################
2506
2507package DC::UI::CheckBox;
2508
2509our @ISA = DC::UI::DrawBG::;
2510
2511my @tex =
2512 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2438 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2439 2514
2440use CFPlus::OpenGL; 2515use DC::OpenGL;
2441 2516
2442sub new { 2517sub new {
2443 my $class = shift; 2518 my $class = shift;
2444 2519
2445 $class->SUPER::new ( 2520 $class->SUPER::new (
… …
2485sub _draw { 2560sub _draw {
2486 my ($self) = @_; 2561 my ($self) = @_;
2487 2562
2488 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2489 2564
2490 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2491 2566
2492 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2493 2568
2494 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2495 2570
… …
2502 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2503} 2578}
2504 2579
2505############################################################################# 2580#############################################################################
2506 2581
2507package CFPlus::UI::Image; 2582package DC::UI::Image;
2508 2583
2509our @ISA = CFPlus::UI::Base::; 2584our @ISA = DC::UI::Base::;
2510 2585
2511use CFPlus::OpenGL; 2586use DC::OpenGL;
2512 2587
2513our %texture_cache; 2588our %texture_cache;
2514 2589
2515sub new { 2590sub new {
2516 my $class = shift; 2591 my $class = shift;
2517 2592
2518 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2519 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2520 @_, 2596 @_,
2521 ); 2597 );
2522 2598
2523 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2524 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2525 2601
2526 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2527 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2528 2604
2529 CFPlus::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2530 2606
2531 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2532 2608
2533 $self 2609 $self
2534} 2610}
2535 2611
2536sub STORABLE_freeze { 2612sub STORABLE_freeze {
2537 my ($self, $cloning) = @_; 2613 my ($self, $cloning) = @_;
2538 2614
2539 $self->{path} 2615 $self->{path}
2540 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2541 2617
2542 $self->{path} 2618 $self->{path}
2543} 2619}
2544 2620
2545sub STORABLE_attach { 2621sub STORABLE_attach {
… …
2549} 2625}
2550 2626
2551sub size_request { 2627sub size_request {
2552 my ($self) = @_; 2628 my ($self) = @_;
2553 2629
2554 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2555} 2631}
2556 2632
2557sub _draw { 2633sub _draw {
2558 my ($self) = @_; 2634 my ($self) = @_;
2559 2635
… …
2569 } 2645 }
2570 2646
2571 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 2649
2574 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
2575 2651
2576 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2577} 2653}
2578 2654
2579############################################################################# 2655#############################################################################
2580 2656
2581package CFPlus::UI::ImageButton; 2657package DC::UI::ImageButton;
2582 2658
2583our @ISA = CFPlus::UI::Image::; 2659our @ISA = DC::UI::Image::;
2584 2660
2585use CFPlus::OpenGL; 2661use DC::OpenGL;
2586 2662
2587my %textures; 2663my %textures;
2588 2664
2589sub new { 2665sub new {
2590 my $class = shift; 2666 my $class = shift;
… …
2593 padding_x => 4, 2669 padding_x => 4,
2594 padding_y => 4, 2670 padding_y => 4,
2595 fg => [1, 1, 1], 2671 fg => [1, 1, 1],
2596 active_fg => [0, 0, 1], 2672 active_fg => [0, 0, 1],
2597 can_hover => 1, 2673 can_hover => 1,
2598 align => 0, 2674 align => 0.5,
2599 valign => 0, 2675 valign => 0.5,
2600 can_events => 1, 2676 can_events => 1,
2601 @_ 2677 @_
2602 ); 2678 );
2603} 2679}
2604 2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2605sub invoke_button_up { 2687sub invoke_button_up {
2606 my ($self, $ev, $x, $y) = @_; 2688 my ($self, $ev, $x, $y) = @_;
2607 2689
2608 $self->emit ("activate") 2690 $self->emit ("activate")
2609 if $x >= 0 && $x < $self->{w} 2691 if $x >= 0 && $x < $self->{w}
… …
2612 1 2694 1
2613} 2695}
2614 2696
2615############################################################################# 2697#############################################################################
2616 2698
2617package CFPlus::UI::VGauge; 2699package DC::UI::VGauge;
2618 2700
2619our @ISA = CFPlus::UI::Base::; 2701our @ISA = DC::UI::Base::;
2620 2702
2621use List::Util qw(min max); 2703use List::Util qw(min max);
2622 2704
2623use CFPlus::OpenGL; 2705use DC::OpenGL;
2624 2706
2625my %tex = ( 2707my %tex = (
2626 food => [ 2708 food => [
2627 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2709 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2628 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2629 ], 2711 ],
2630 grace => [ 2712 grace => [
2631 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2713 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2632 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2633 ], 2715 ],
2634 hp => [ 2716 hp => [
2635 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2636 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2637 ], 2719 ],
2638 mana => [ 2720 mana => [
2639 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2640 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2641 ], 2723 ],
2642); 2724);
2643 2725
2644# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2747 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2748} 2830}
2749 2831
2750############################################################################# 2832#############################################################################
2751 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
2752package CFPlus::UI::Gauge; 2972package DC::UI::Gauge;
2753 2973
2754our @ISA = CFPlus::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2755 2975
2756sub new { 2976sub new {
2757 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2758 2978
2759 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
2761 can_hover => 1, 2981 can_hover => 1,
2762 can_events => 1, 2982 can_events => 1,
2763 %arg, 2983 %arg,
2764 ); 2984 );
2765 2985
2766 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2767 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2768 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2769 2989
2770 $self 2990 $self
2771} 2991}
2772 2992
2773sub set_fontsize { 2993sub set_fontsize {
… …
2794 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2795} 3015}
2796 3016
2797############################################################################# 3017#############################################################################
2798 3018
2799package CFPlus::UI::Slider; 3019package DC::UI::Slider;
2800 3020
2801use strict; 3021use strict;
2802 3022
2803use CFPlus::OpenGL; 3023use DC::OpenGL;
2804 3024
2805our @ISA = CFPlus::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2806 3026
2807my @tex = 3027my @tex =
2808 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3028 map { new_from_file DC::Texture DC::find_rcfile $_ }
2809 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2810 3030
2811sub new { 3031sub new {
2812 my $class = shift; 3032 my $class = shift;
2813 3033
… …
2881 3101
2882 $self->SUPER::invoke_button_down ($ev, $x, $y); 3102 $self->SUPER::invoke_button_down ($ev, $x, $y);
2883 3103
2884 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3104 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2885 3105
2886 $self->invoke_mouse_motion ($ev, $x, $y) 3106 $self->invoke_mouse_motion ($ev, $x, $y);
3107
3108 1
2887} 3109}
2888 3110
2889sub invoke_mouse_motion { 3111sub invoke_mouse_motion {
2890 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2891 3113
… …
2907sub invoke_mouse_wheel { 3129sub invoke_mouse_wheel {
2908 my ($self, $ev) = @_; 3130 my ($self, $ev) = @_;
2909 3131
2910 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3132 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2911 3133
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3134 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2913 3135
2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3136 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915 3137
2916 ! ! $delta 3138 1
2917} 3139}
2918 3140
2919sub update { 3141sub update {
2920 my ($self) = @_; 3142 my ($self) = @_;
2921 3143
… …
2970 glDisable GL_TEXTURE_2D; 3192 glDisable GL_TEXTURE_2D;
2971} 3193}
2972 3194
2973############################################################################# 3195#############################################################################
2974 3196
2975package CFPlus::UI::ValSlider; 3197package DC::UI::ValSlider;
2976 3198
2977our @ISA = CFPlus::UI::HBox::; 3199our @ISA = DC::UI::HBox::;
2978 3200
2979sub new { 3201sub new {
2980 my ($class, %arg) = @_; 3202 my ($class, %arg) = @_;
2981 3203
2982 my $range = delete $arg{range}; 3204 my $range = delete $arg{range};
2983 3205
2984 my $self = $class->SUPER::new ( 3206 my $self = $class->SUPER::new (
2985 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3207 slider => (new DC::UI::Slider expand => 1, range => $range),
2986 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3208 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2987 to_value => sub { shift }, 3209 to_value => sub { shift },
2988 from_value => sub { shift }, 3210 from_value => sub { shift },
2989 %arg, 3211 %arg,
2990 ); 3212 );
2991 3213
… …
3011sub set_range { shift->{slider}->set_range (@_) } 3233sub set_range { shift->{slider}->set_range (@_) }
3012sub set_value { shift->{slider}->set_value (@_) } 3234sub set_value { shift->{slider}->set_value (@_) }
3013 3235
3014############################################################################# 3236#############################################################################
3015 3237
3016package CFPlus::UI::TextScroller; 3238package DC::UI::TextScroller;
3017 3239
3018our @ISA = CFPlus::UI::HBox::; 3240our @ISA = DC::UI::HBox::;
3019 3241
3020use CFPlus::OpenGL; 3242use DC::OpenGL;
3021 3243
3022sub new { 3244sub new {
3023 my $class = shift; 3245 my $class = shift;
3024 3246
3025 my $self = $class->SUPER::new ( 3247 my $self = $class->SUPER::new (
… …
3027 can_events => 1, 3249 can_events => 1,
3028 indent => 0, 3250 indent => 0,
3029 #font => default_font 3251 #font => default_font
3030 @_, 3252 @_,
3031 3253
3032 layout => (new CFPlus::Layout), 3254 layout => (new DC::Layout),
3033 par => [], 3255 par => [],
3034 max_par => 0, 3256 max_par => 0,
3035 height => 0, 3257 height => 0,
3036 children => [ 3258 children => [
3037 (new CFPlus::UI::Empty expand => 1), 3259 (new DC::UI::Empty expand => 1),
3038 (new CFPlus::UI::Slider vertical => 1), 3260 (new DC::UI::Slider vertical => 1),
3039 ], 3261 ],
3040 ); 3262 );
3041 3263
3042 $self->{children}[1]->connect (changed => sub { $self->update }); 3264 $self->{children}[1]->connect (changed => sub { $self->update });
3043 3265
… …
3052} 3274}
3053 3275
3054sub size_request { 3276sub size_request {
3055 my ($self) = @_; 3277 my ($self) = @_;
3056 3278
3057 my ($empty, $slider) = @{ $self->{children} }; 3279 my ($empty, $slider) = $self->visible_children;
3058 3280
3059 local $self->{children} = [$empty, $slider]; 3281 local $self->{children} = [$empty, $slider];
3060 $self->SUPER::size_request 3282 $self->SUPER::size_request
3061} 3283}
3062 3284
… …
3099 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3321 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3100 $layout->set_markup ($para->{markup}); 3322 $layout->set_markup ($para->{markup});
3101 3323
3102 $layout->set_shapes ( 3324 $layout->set_shapes (
3103 map 3325 map
3104 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3326 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3105 @{$para->{widget}} 3327 @{$para->{widget}}
3106 ); 3328 );
3107 3329
3108 $layout 3330 $layout
3109} 3331}
… …
3226 $ROOT->on_post_alloc ($self => sub { 3448 $ROOT->on_post_alloc ($self => sub {
3227 $self->force_uptodate; 3449 $self->force_uptodate;
3228 3450
3229 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3230 3452
3231 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3453 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3232 glClearColor 0, 0, 0, 0; 3454 glClearColor 0, 0, 0, 0;
3233 glClear GL_COLOR_BUFFER_BIT; 3455 glClear GL_COLOR_BUFFER_BIT;
3234 3456
3235 package CFPlus::UI::Base; 3457 package DC::UI::Base;
3236 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3458 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3237 (0, 0, $self->{w}, $self->{h}); 3459 (0, 0, $self->{w}, $self->{h});
3238 3460
3239 my $top = int $self->{children}[1]{range}[0]; 3461 my $top = int $self->{children}[1]{range}[0];
3240 3462
… …
3251 3473
3252 if ($y0 < $y + $h && $y < $y1) { 3474 if ($y0 < $y + $h && $y < $y1) {
3253 my $layout = $self->get_layout ($para); 3475 my $layout = $self->get_layout ($para);
3254 3476
3255 $layout->render ($para->{indent}, $y - $y0); 3477 $layout->render ($para->{indent}, $y - $y0);
3478 $layout->draw;
3256 3479
3257 if (my @w = @{ $para->{widget} }) { 3480 if (my @w = @{ $para->{widget} }) {
3258 my @s = $layout->get_shapes; 3481 my @s = $layout->get_shapes;
3259 3482
3260 for (@w) { 3483 for (@w) {
… …
3298 $self->{children}[1]->draw; 3521 $self->{children}[1]->draw;
3299} 3522}
3300 3523
3301############################################################################# 3524#############################################################################
3302 3525
3303package CFPlus::UI::Animator; 3526package DC::UI::Animator;
3304 3527
3305use CFPlus::OpenGL; 3528use DC::OpenGL;
3306 3529
3307our @ISA = CFPlus::UI::Bin::; 3530our @ISA = DC::UI::Bin::;
3308 3531
3309sub moveto { 3532sub moveto {
3310 my ($self, $x, $y) = @_; 3533 my ($self, $x, $y) = @_;
3311 3534
3312 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3535 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3340 glPopMatrix; 3563 glPopMatrix;
3341} 3564}
3342 3565
3343############################################################################# 3566#############################################################################
3344 3567
3345package CFPlus::UI::Flopper; 3568package DC::UI::Flopper;
3346 3569
3347our @ISA = CFPlus::UI::Button::; 3570our @ISA = DC::UI::Button::;
3348 3571
3349sub new { 3572sub new {
3350 my $class = shift; 3573 my $class = shift;
3351 3574
3352 my $self = $class->SUPER::new ( 3575 my $self = $class->SUPER::new (
… …
3364 $self->{other}->toggle_visibility; 3587 $self->{other}->toggle_visibility;
3365} 3588}
3366 3589
3367############################################################################# 3590#############################################################################
3368 3591
3369package CFPlus::UI::Tooltip; 3592package DC::UI::Tooltip;
3370 3593
3371our @ISA = CFPlus::UI::Bin::; 3594our @ISA = DC::UI::Bin::;
3372 3595
3373use CFPlus::OpenGL; 3596use DC::OpenGL;
3374 3597
3375sub new { 3598sub new {
3376 my $class = shift; 3599 my $class = shift;
3377 3600
3378 $class->SUPER::new ( 3601 $class->SUPER::new (
… …
3382} 3605}
3383 3606
3384sub set_tooltip_from { 3607sub set_tooltip_from {
3385 my ($self, $widget) = @_; 3608 my ($self, $widget) = @_;
3386 3609
3387 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3388 if $widget->{tooltip} =~ /^#(.*)$/;
3389
3390 my $tooltip = $widget->{tooltip}; 3610 my $tip = $widget->{tooltip};
3611 $tip = $tip->($widget) if "CODE" eq ref $tip;
3612
3613 $tip = DC::Pod::section_label tooltip => $1
3614 if $tip =~ /^#(.*)$/;
3391 3615
3392 if ($ENV{CFPLUS_DEBUG} & 2) { 3616 if ($ENV{CFPLUS_DEBUG} & 2) {
3393 $tooltip .= "\n\n" . (ref $widget) . "\n" 3617 $tip .= "\n\n" . (ref $widget) . "\n"
3394 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3618 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3395 . "req $widget->{req_w} $widget->{req_h}\n" 3619 . "req $widget->{req_w} $widget->{req_h}\n"
3396 . "visible $widget->{visible}"; 3620 . "visible $widget->{visible}";
3397 } 3621 }
3398 3622
3399 $tooltip =~ s/^\n+//; 3623 $tip =~ s/^\n+//;
3400 $tooltip =~ s/\n+$//; 3624 $tip =~ s/\n+$//;
3401 3625
3402 $self->add (new CFPlus::UI::Label 3626 $self->add (new DC::UI::Label
3403 markup => $tooltip, 3627 markup => $tip,
3404 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3628 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3629 align => 0,
3405 fontsize => 0.8, 3630 fontsize => 0.8,
3406 style => 1, # FLAG_INVERSE 3631 style => 1, # FLAG_INVERSE
3407 ellipsise => 0, 3632 ellipsise => 0,
3408 font => ($widget->{tooltip_font} || $::FONT_PROP), 3633 font => ($widget->{tooltip_font} || $::FONT_PROP),
3409 ); 3634 );
… …
3446} 3671}
3447 3672
3448sub _draw { 3673sub _draw {
3449 my ($self) = @_; 3674 my ($self) = @_;
3450 3675
3451 glTranslate 0.375, 0.375;
3452
3453 my ($w, $h) = @$self{qw(w h)}; 3676 my ($w, $h) = @$self{qw(w h)};
3454 3677
3455 glColor 1, 0.8, 0.4; 3678 glColor 1, 0.8, 0.4;
3456 glBegin GL_QUADS; 3679 glRect 0, 0, $w, $h;
3457 glVertex 0 , 0;
3458 glVertex 0 , $h;
3459 glVertex $w, $h;
3460 glVertex $w, 0;
3461 glEnd;
3462 3680
3463 glColor 0, 0, 0; 3681 glColor 0, 0, 0;
3464 glBegin GL_LINE_LOOP; 3682 glRect_lineloop .5, .5, $w + .5, $h + .5;
3465 glVertex 0 , 0;
3466 glVertex 0 , $h;
3467 glVertex $w, $h;
3468 glVertex $w, 0;
3469 glEnd;
3470 3683
3471 glTranslate 2 - 0.375, 2 - 0.375; 3684 glTranslate 2, 2;
3472 3685
3473 $self->SUPER::_draw; 3686 $self->SUPER::_draw;
3474} 3687}
3475 3688
3476############################################################################# 3689#############################################################################
3477 3690
3478package CFPlus::UI::Face; 3691package DC::UI::Face;
3479 3692
3480our @ISA = CFPlus::UI::DrawBG::; 3693our @ISA = DC::UI::DrawBG::;
3481 3694
3482use CFPlus::OpenGL; 3695use DC::OpenGL;
3483 3696
3484sub new { 3697sub new {
3485 my $class = shift; 3698 my $class = shift;
3486 3699
3487 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
… …
3491 can_events => 0, 3704 can_events => 0,
3492 @_, 3705 @_,
3493 ); 3706 );
3494 3707
3495 if ($self->{anim} && $self->{animspeed}) { 3708 if ($self->{anim} && $self->{animspeed}) {
3496 CFPlus::weaken (my $widget = $self); 3709 DC::weaken (my $widget = $self);
3497 3710
3498 $self->{timer} = Event->timer ( 3711 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3499 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3712 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3500 hard => 1,
3501 interval => $self->{animspeed},
3502 cb => sub {
3503 return unless $::CONN; 3713 return unless $::CONN;
3504 3714
3715 my $w = $widget
3716 or return;
3717
3505 ++$widget->{frame}; 3718 ++$w->{frame};
3506 $self->update_face; 3719 $w->update_face;
3720
3721 # somehow, $widget can go away
3507 $self->update; 3722 $w->update;
3508 }, 3723 $w->update_timer;
3509 ); 3724 };
3510 3725
3511 $self->update_face; 3726 $self->update_face;
3727 $self->update_timer;
3512 } 3728 }
3513 3729
3514 $self 3730 $self
3515} 3731}
3516 3732
3733sub update_timer {
3734 my ($self) = @_;
3735
3736 return unless $self->{timer};
3737
3738 if ($self->{visible}) {
3739 $self->{timer}->start;
3740 } else {
3741 $self->{timer}->stop;
3742 }
3743}
3744
3517sub update_face { 3745sub update_face {
3518 my ($self) = @_; 3746 my ($self) = @_;
3519 3747
3520 return unless $::CONN;
3521
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) {
3524 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3526 }
3527 }
3528}
3529
3530sub size_request {
3531 my ($self) = @_;
3532
3533 if ($::CONN) { 3748 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3749 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) { 3750 if ($anim && @$anim) {
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3751 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3537 } else { 3752 delete $self->{face_change_cb};
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3753
3539 $self->realloc; 3754 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3755 unless ($tex->{name} || $tex->{loading}) {
3756 $tex->upload (sub { $self->reconfigure });
3757 }
3540 }); 3758 }
3541 } 3759 }
3542 } 3760 }
3543 } 3761 }
3762}
3763
3764sub size_request {
3765 my ($self) = @_;
3766
3767 if ($::CONN) {
3768 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3769 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3770 if ($tex->{name}) {
3771 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3772 } elsif (!$tex->{loading}) {
3773 $tex->upload (sub { $self->reconfigure });
3774 }
3775 }
3776
3777 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3778 }
3779 }
3544 3780
3545 ($self->{size_w} || 8, $self->{size_h} || 8) 3781 ($self->{size_w} || 8, $self->{size_h} || 8)
3546} 3782}
3547 3783
3548sub update { 3784sub update {
… …
3551 return unless $self->{visible}; 3787 return unless $self->{visible};
3552 3788
3553 $self->SUPER::update; 3789 $self->SUPER::update;
3554} 3790}
3555 3791
3792sub invoke_visibility_change {
3793 my ($self) = @_;
3794
3795 $self->update_timer;
3796
3797 0
3798}
3799
3556sub _draw { 3800sub _draw {
3557 my ($self) = @_; 3801 my ($self) = @_;
3558 3802
3559 return unless $::CONN;
3560
3561 $self->SUPER::_draw; 3803 $self->SUPER::_draw;
3562 3804
3563 my $faceid = $::CONN->{faceid}[$self->{face}] 3805 if (my $tex = $self->{tex}) {
3564 or return;
3565
3566 my $tex = $::CONN->{texture}[$faceid];
3567
3568 if ($tex) {
3569 glEnable GL_TEXTURE_2D; 3806 glEnable GL_TEXTURE_2D;
3570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3807 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3571 glColor 0, 0, 0, 1; 3808 glColor 0, 0, 0, 1;
3572 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3809 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3573 glDisable GL_TEXTURE_2D; 3810 glDisable GL_TEXTURE_2D;
… …
3575} 3812}
3576 3813
3577sub destroy { 3814sub destroy {
3578 my ($self) = @_; 3815 my ($self) = @_;
3579 3816
3580 $self->{timer}->cancel 3817 (delete $self->{timer})->cancel
3581 if $self->{timer}; 3818 if $self->{timer};
3582 3819
3583 $self->SUPER::destroy; 3820 $self->SUPER::destroy;
3584} 3821}
3585 3822
3586############################################################################# 3823#############################################################################
3587 3824
3588package CFPlus::UI::Buttonbar; 3825package DC::UI::Buttonbar;
3589 3826
3590our @ISA = CFPlus::UI::HBox::; 3827our @ISA = DC::UI::HBox::;
3591 3828
3592# TODO: should actually wrap buttons and other goodies. 3829# TODO: should actually wrap buttons and other goodies.
3593 3830
3594############################################################################# 3831#############################################################################
3595 3832
3596package CFPlus::UI::Menu; 3833package DC::UI::Menu;
3597 3834
3598our @ISA = CFPlus::UI::Toplevel::; 3835our @ISA = DC::UI::Toplevel::;
3599 3836
3600use CFPlus::OpenGL; 3837use DC::OpenGL;
3601 3838
3602sub new { 3839sub new {
3603 my $class = shift; 3840 my $class = shift;
3604 3841
3605 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3606 items => [], 3843 items => [],
3607 z => 100, 3844 z => 100,
3608 @_, 3845 @_,
3609 ); 3846 );
3610 3847
3611 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3848 $self->add ($self->{vbox} = new DC::UI::VBox);
3612 3849
3613 for my $item (@{ $self->{items} }) { 3850 for my $item (@{ $self->{items} }) {
3614 my ($widget, $cb, $tooltip) = @$item; 3851 my ($widget, $cb, $tooltip) = @$item;
3615 3852
3616 # handle various types of items, only text for now 3853 # handle various types of items, only text for now
3617 if (!ref $widget) { 3854 if (!ref $widget) {
3618 if ($widget =~ /\t/) { 3855 if ($widget =~ /\t/) {
3619 my ($left, $right) = split /\t/, $widget, 2; 3856 my ($left, $right) = split /\t/, $widget, 2;
3620 3857
3621 $widget = new CFPlus::UI::HBox 3858 $widget = new DC::UI::HBox
3622 can_hover => 1, 3859 can_hover => 1,
3623 can_events => 1, 3860 can_events => 1,
3624 tooltip => $tooltip, 3861 tooltip => $tooltip,
3625 children => [ 3862 children => [
3626 (new CFPlus::UI::Label markup => $left, expand => 1), 3863 (new DC::UI::Label markup => $left, expand => 1),
3627 (new CFPlus::UI::Label markup => $right, align => +1), 3864 (new DC::UI::Label markup => $right, align => 1),
3628 ], 3865 ],
3629 ; 3866 ;
3630 3867
3631 } else { 3868 } else {
3632 $widget = new CFPlus::UI::Label 3869 $widget = new DC::UI::Label
3633 can_hover => 1, 3870 can_hover => 1,
3634 can_events => 1, 3871 can_events => 1,
3872 align => 0,
3635 markup => $widget, 3873 markup => $widget,
3636 tooltip => $tooltip; 3874 tooltip => $tooltip;
3637 } 3875 }
3638 } 3876 }
3639 3877
… …
3685 1 3923 1
3686} 3924}
3687 3925
3688############################################################################# 3926#############################################################################
3689 3927
3690package CFPlus::UI::Multiplexer; 3928package DC::UI::Multiplexer;
3691 3929
3692our @ISA = CFPlus::UI::Container::; 3930our @ISA = DC::UI::Container::;
3693 3931
3694sub new { 3932sub new {
3695 my $class = shift; 3933 my $class = shift;
3696 3934
3697 my $self = $class->SUPER::new ( 3935 my $self = $class->SUPER::new (
… …
3758 $self->{current}->draw; 3996 $self->{current}->draw;
3759} 3997}
3760 3998
3761############################################################################# 3999#############################################################################
3762 4000
3763package CFPlus::UI::Notebook; 4001package DC::UI::Notebook;
3764 4002
4003use DC::OpenGL;
4004
3765our @ISA = CFPlus::UI::VBox::; 4005our @ISA = DC::UI::VBox::;
3766 4006
3767sub new { 4007sub new {
3768 my $class = shift; 4008 my $class = shift;
3769 4009
3770 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3771 buttonbar => (new CFPlus::UI::Buttonbar), 4011 buttonbar => (new DC::UI::Buttonbar),
3772 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4012 multiplexer => (new DC::UI::Multiplexer expand => 1),
4013 active_outline => [.7, .7, 0.2],
3773 # filter => # will be put between multiplexer and $self 4014 # filter => # will be put between multiplexer and $self
3774 @_, 4015 @_,
3775 ); 4016 );
3776 4017
3777 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4018 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3778 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4019 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3779 4020
4021 {
4022 Scalar::Util::weaken (my $wself = $self);
4023
4024 $self->{multiplexer}->connect (c_add => sub {
4025 my ($mplex, $widgets) = @_;
4026
4027 for my $child (@$widgets) {
4028 Scalar::Util::weaken $child;
4029 $child->{c_tab_} ||= do {
4030 my $tab =
4031 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4032 ? $child->{c_tab}
4033 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4034
4035 $tab->connect (activate => sub {
4036 $wself->set_current_page ($child);
4037 });
4038
4039 $tab
4040 };
4041
4042 $self->{buttonbar}->add ($child->{c_tab_});
4043 }
4044 });
4045
4046 $self->{multiplexer}->connect (c_remove => sub {
4047 my ($mplex, $widgets) = @_;
4048
4049 for my $child (@$widgets) {
4050 $wself->{buttonbar}->remove ($child->{c_tab_});
4051 }
4052 });
4053 }
4054
3780 $self 4055 $self
3781} 4056}
3782 4057
3783sub add { 4058sub add {
4059 my ($self, @widgets) = @_;
4060
4061 $self->{multiplexer}->add (@widgets)
4062}
4063
4064sub remove {
4065 my ($self, @widgets) = @_;
4066
4067 $self->{multiplexer}->remove (@widgets)
4068}
4069
4070sub pages {
4071 my ($self) = @_;
4072 $self->{multiplexer}->children
4073}
4074
4075sub page_index {
4076 my ($self, $widget) = @_;
4077
4078 my $i = 0;
4079 for ($self->pages) {
4080 if ($_ eq $widget) { return $i };
4081 $i++;
4082 }
4083
4084 undef
4085}
4086
4087sub add_tab {
3784 my ($self, $title, $widget, $tooltip) = @_; 4088 my ($self, $title, $widget, $tooltip) = @_;
3785 4089
3786 CFPlus::weaken $self; 4090 $title = [$title, $tooltip] unless ref $title;
4091 $widget->{c_tab} = $title;
3787 4092
3788 $self->{buttonbar}->add (new CFPlus::UI::Button
3789 markup => $title,
3790 tooltip => $tooltip,
3791 on_activate => sub { $self->set_current_page ($widget) },
3792 );
3793
3794 $self->{multiplexer}->add ($widget); 4093 $self->add ($widget);
3795} 4094}
3796 4095
3797sub get_current_page { 4096sub get_current_page {
3798 my ($self) = @_; 4097 my ($self) = @_;
3799 4098
… …
3805 4104
3806 $self->{multiplexer}->set_current_page ($page); 4105 $self->{multiplexer}->set_current_page ($page);
3807 $self->emit (page_changed => $self->{multiplexer}{current}); 4106 $self->emit (page_changed => $self->{multiplexer}{current});
3808} 4107}
3809 4108
4109sub _draw {
4110 my ($self) = @_;
4111
4112 $self->SUPER::_draw ();
4113
4114 if (my $cur = $self->{multiplexer}{current}) {
4115 if ($cur = $cur->{c_tab_}) {
4116 glTranslate $self->{buttonbar}{x} + $cur->{x},
4117 $self->{buttonbar}{y} + $cur->{y};
4118 glLineWidth 3;
4119 #glEnable GL_BLEND;
4120 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4121 glColor @{$self->{active_outline}};
4122 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4123 glLineWidth 1;
4124 #glDisable GL_BLEND;
4125 }
4126 }
4127}
4128
3810############################################################################# 4129#############################################################################
3811 4130
3812package CFPlus::UI::Selector; 4131package DC::UI::Selector;
3813 4132
3814use utf8; 4133use utf8;
3815 4134
3816our @ISA = CFPlus::UI::Button::; 4135our @ISA = DC::UI::Button::;
3817 4136
3818sub new { 4137sub new {
3819 my $class = shift; 4138 my $class = shift;
3820 4139
3821 my $self = $class->SUPER::new ( 4140 my $self = $class->SUPER::new (
… …
3838 my ($value, $title, $tooltip) = @$_; 4157 my ($value, $title, $tooltip) = @$_;
3839 4158
3840 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4159 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3841 } 4160 }
3842 4161
3843 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4162 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3844} 4163}
3845 4164
3846sub _set_value { 4165sub _set_value {
3847 my ($self, $value) = @_; 4166 my ($self, $value) = @_;
3848 4167
3849 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4168 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4169 $item ||= $self->{options}[0]
3850 or return; 4170 or return;
3851 4171
3852 $self->{value} = $item->[0]; 4172 $self->{value} = $item->[0];
3853 $self->set_markup ("$item->[1] ⇓"); 4173 $self->set_markup ("$item->[1] ⇓");
3854 $self->set_tooltip ($item->[2]); 4174# $self->set_tooltip ($item->[2]);
3855} 4175}
3856 4176
3857sub set_value { 4177sub set_value {
3858 my ($self, $value) = @_; 4178 my ($self, $value) = @_;
3859 4179
… …
3861 4181
3862 $self->_set_value ($value); 4182 $self->_set_value ($value);
3863 $self->emit (changed => $value); 4183 $self->emit (changed => $value);
3864} 4184}
3865 4185
4186sub set_options {
4187 my ($self, $options) = @_;
4188
4189 $self->{options} = $options;
4190 $self->_set_value ($self->{value});
4191}
4192
3866############################################################################# 4193#############################################################################
3867 4194
3868package CFPlus::UI::Statusbox; 4195package DC::UI::Statusbox;
3869 4196
3870our @ISA = CFPlus::UI::VBox::; 4197our @ISA = DC::UI::VBox::;
3871 4198
3872sub new { 4199sub new {
3873 my $class = shift; 4200 my $class = shift;
3874 4201
3875 my $self = $class->SUPER::new ( 4202 my $self = $class->SUPER::new (
3876 fontsize => 0.8, 4203 fontsize => 0.8,
3877 @_, 4204 @_,
3878 ); 4205 );
3879 4206
3880 CFPlus::weaken (my $this = $self); 4207 DC::weaken (my $this = $self);
3881 4208
3882 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4209 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3883 4210
3884 $self 4211 $self
3885} 4212}
3886 4213
3887sub reorder { 4214sub reorder {
3888 my ($self) = @_; 4215 my ($self) = @_;
3889 my $NOW = Time::HiRes::time; 4216 my $NOW = Time::HiRes::time;
3890 4217
3891 # freeze display when hovering over any label 4218 # freeze display when hovering over any label
3892 return if $CFPlus::UI::TOOLTIP->{owner} 4219 return if $DC::UI::TOOLTIP->{owner}
3893 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4220 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3894 values %{ $self->{item} }; 4221 values %{ $self->{item} };
3895 4222
3896 while (my ($k, $v) = each %{ $self->{item} }) { 4223 while (my ($k, $v) = each %{ $self->{item} }) {
3897 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4224 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3898 } 4225 }
4226
4227 $self->{timer}->set (1, 1);
3899 4228
3900 my @widgets; 4229 my @widgets;
3901 4230
3902 my @items = sort { 4231 my @items = sort {
3903 $a->{pri} <=> $b->{pri} 4232 $a->{pri} <=> $b->{pri}
3904 or $b->{id} <=> $a->{id} 4233 or $b->{id} <=> $a->{id}
3905 } values %{ $self->{item} }; 4234 } values %{ $self->{item} };
3906
3907 $self->{timer}->interval (1);
3908 4235
3909 my $count = 10 + 1; 4236 my $count = 10 + 1;
3910 for my $item (@items) { 4237 for my $item (@items) {
3911 last unless --$count; 4238 last unless --$count;
3912 4239
… …
3919 for ($short) { 4246 for ($short) {
3920 s/^\s+//; 4247 s/^\s+//;
3921 s/\s+/ /g; 4248 s/\s+/ /g;
3922 } 4249 }
3923 4250
3924 new CFPlus::UI::Label 4251 new DC::UI::Label
3925 markup => $short, 4252 markup => $short,
3926 tooltip => $item->{tooltip}, 4253 tooltip => $item->{tooltip},
3927 tooltip_font => $::FONT_PROP, 4254 tooltip_font => $::FONT_PROP,
3928 tooltip_width => 0.67, 4255 tooltip_width => 0.67,
3929 fontsize => $item->{fontsize} || $self->{fontsize}, 4256 fontsize => $item->{fontsize} || $self->{fontsize},
3930 max_w => $::WIDTH * 0.44, 4257 max_w => $::WIDTH * 0.44,
4258 align => 0,
3931 fg => [@{ $item->{fg} }], 4259 fg => [@{ $item->{fg} }],
3932 can_events => 1, 4260 can_events => 1,
3933 can_hover => 1 4261 can_hover => 1
3934 }; 4262 };
3935 4263
3936 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4264 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3937 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4265 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3938 $label->update; 4266 $label->update;
3939 $label->set_max_size (undef, $label->{req_h} * $diff) 4267 $label->set_max_size (undef, $label->{req_h} * $diff)
3940 if $diff < 1; 4268 if $diff < 1;
3941 $self->{timer}->interval (1/30); 4269 $self->{timer}->set (1/30, 1/30);
3942 } else { 4270 } else {
3943 $label->{fg}[3] = $item->{fg}[3] || 1; 4271 $label->{fg}[3] = $item->{fg}[3] || 1;
3944 } 4272 }
3945 4273
3946 push @widgets, $label; 4274 push @widgets, $label;
… …
4008 $self->SUPER::destroy; 4336 $self->SUPER::destroy;
4009} 4337}
4010 4338
4011############################################################################# 4339#############################################################################
4012 4340
4013package CFPlus::UI::Root; 4341package DC::UI::Root;
4014 4342
4015our @ISA = CFPlus::UI::Container::; 4343our @ISA = DC::UI::Container::;
4016 4344
4017use List::Util qw(min max); 4345use List::Util qw(min max);
4018 4346
4019use CFPlus::OpenGL; 4347use DC::OpenGL;
4020 4348
4021sub new { 4349sub new {
4022 my $class = shift; 4350 my $class = shift;
4023 4351
4024 my $self = $class->SUPER::new ( 4352 my $self = $class->SUPER::new (
4025 visible => 1, 4353 visible => 1,
4026 @_, 4354 @_,
4027 ); 4355 );
4028 4356
4029 CFPlus::weaken ($self->{root} = $self); 4357 DC::weaken ($self->{root} = $self);
4030 4358
4031 $self 4359 $self
4032} 4360}
4033 4361
4034sub size_request { 4362sub size_request {
… …
4082} 4410}
4083 4411
4084sub update { 4412sub update {
4085 my ($self) = @_; 4413 my ($self) = @_;
4086 4414
4087 $::WANT_REFRESH++; 4415 $::WANT_REFRESH = 1;
4088} 4416}
4089 4417
4090sub add { 4418sub add {
4091 my ($self, @children) = @_; 4419 my ($self, @children) = @_;
4092 4420
… …
4129 while ($self->{refresh_hook}) { 4457 while ($self->{refresh_hook}) {
4130 $_->() 4458 $_->()
4131 for values %{delete $self->{refresh_hook}}; 4459 for values %{delete $self->{refresh_hook}};
4132 } 4460 }
4133 4461
4134 if ($self->{realloc}) { 4462 while ($self->{realloc}) {
4135 my %queue; 4463 my %queue;
4136 my @queue; 4464 my @queue;
4137 my $widget; 4465 my $widget;
4138 4466
4139 outer: 4467 outer:
… …
4159 4487
4160 delete $queue{$widget+0}; 4488 delete $queue{$widget+0};
4161 4489
4162 my ($w, $h) = $widget->size_request; 4490 my ($w, $h) = $widget->size_request;
4163 4491
4164 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4492 $w += $widget->{padding_x} * 2;
4165 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4493 $h += $widget->{padding_y} * 2;
4494
4495 $w = max $widget->{min_w}, $w;
4496 $h = max $widget->{min_h}, $h;
4166 4497
4167 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4498 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4168 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4499 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4169 4500
4170 $w = $widget->{force_w} if exists $widget->{force_w}; 4501 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4186 } 4517 }
4187 } 4518 }
4188 4519
4189 delete $self->{realloc}{$widget+0}; 4520 delete $self->{realloc}{$widget+0};
4190 } 4521 }
4191 }
4192 4522
4193 while (my $size_alloc = delete $self->{size_alloc}) { 4523 while (my $size_alloc = delete $self->{size_alloc}) {
4194 my @queue = sort { $b->{visible} <=> $a->{visible} } 4524 my @queue = sort { $a->{visible} <=> $b->{visible} }
4195 values %$size_alloc; 4525 values %$size_alloc;
4196 4526
4197 while () { 4527 while () {
4198 my $widget = pop @queue || last; 4528 my $widget = pop @queue || last;
4199 4529
4200 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4530 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4201 4531
4202 $w = 0 if $w < 0;
4203 $h = 0 if $h < 0;
4204
4205 $w = max $widget->{min_w}, $w; 4532 $w = max $widget->{min_w}, $w;
4206 $h = max $widget->{min_h}, $h; 4533 $h = max $widget->{min_h}, $h;
4207 4534
4208# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4535# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4209# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4536# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4210 4537
4211 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4538 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4212 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4539 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4213 4540
4214 $w = int $w + 0.5; 4541 $w = int $w + 0.5;
4215 $h = int $h + 0.5; 4542 $h = int $h + 0.5;
4216 4543
4217 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4544 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4218 $widget->{old_w} = $widget->{w}; 4545 $widget->{old_w} = $widget->{w};
4219 $widget->{old_h} = $widget->{h}; 4546 $widget->{old_h} = $widget->{h};
4220 4547
4221 $widget->{w} = $w; 4548 $widget->{w} = $w;
4222 $widget->{h} = $h; 4549 $widget->{h} = $h;
4223 4550
4224 $widget->emit (size_allocate => $w, $h); 4551 $widget->emit (size_allocate => $w, $h);
4552 }
4225 } 4553 }
4226 } 4554 }
4227 } 4555 }
4228 4556
4229 while ($self->{post_alloc_hook}) { 4557 while ($self->{post_alloc_hook}) {
4230 $_->() 4558 $_->()
4231 for values %{delete $self->{post_alloc_hook}}; 4559 for values %{delete $self->{post_alloc_hook}};
4232 } 4560 }
4233
4234 4561
4235 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4562 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4236 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4563 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4237 glClear GL_COLOR_BUFFER_BIT; 4564 glClear GL_COLOR_BUFFER_BIT;
4238 4565
… …
4241 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4568 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4242 glMatrixMode GL_MODELVIEW; 4569 glMatrixMode GL_MODELVIEW;
4243 glLoadIdentity; 4570 glLoadIdentity;
4244 4571
4245 { 4572 {
4246 package CFPlus::UI::Base; 4573 package DC::UI::Base;
4247 4574
4248 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4575 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4249 (0, 0, $self->{w}, $self->{h}); 4576 (0, 0, $self->{w}, $self->{h});
4250 4577
4251 $self->_draw; 4578 $self->_draw;
4252 } 4579 }
4253} 4580}
4254 4581
4255############################################################################# 4582#############################################################################
4256 4583
4257package CFPlus::UI; 4584package DC::UI;
4258 4585
4259$ROOT = new CFPlus::UI::Root; 4586$ROOT = new DC::UI::Root;
4260$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4587$TOOLTIP = new DC::UI::Tooltip z => 900;
4261 4588
42621 45891
4263 4590

Diff Legend

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