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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.456 by root, Fri Dec 28 11:44:02 2007 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use DC;
10use CFPlus::Pod; 9use DC::Pod;
11use CFPlus::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $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};
… …
268 $self->hide; 269 $self->hide;
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
273sub show { 278sub show {
274 my ($self) = @_; 279 my ($self) = @_;
275 280
276 return if $self->{parent}; 281 return if $self->{parent};
277 282
278 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
279} 284}
280 285
281sub set_visible { 286sub set_visible {
282 my ($self) = @_; 287 my ($self) = @_;
283 288
… …
304 delete $self->{root}; 309 delete $self->{root};
305 310
306 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
307 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
308 313
309 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
310 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
311 316
312 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
313 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
314} 319}
… …
316sub set_visibility { 321sub set_visibility {
317 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
318 323
319 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
320 325
321 $visible ? $self->hide 326 $visible ? $self->show
322 : $self->show; 327 : $self->hide;
323} 328}
324 329
325sub toggle_visibility { 330sub toggle_visibility {
326 my ($self) = @_; 331 my ($self) = @_;
327 332
… …
333sub hide { 338sub hide {
334 my ($self) = @_; 339 my ($self) = @_;
335 340
336 $self->set_invisible; 341 $self->set_invisible;
337 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
338 $self->{parent}->remove ($self) 346 $parent->remove ($self);
339 if $self->{parent}; 347 }
340} 348}
341 349
342sub move_abs { 350sub move_abs {
343 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
344 352
… …
356 $self->{force_h} = $h; 364 $self->{force_h} = $h;
357 365
358 $self->realloc; 366 $self->realloc;
359} 367}
360 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
377}
378
361sub size_request { 379sub size_request {
362 require Carp; 380 require Carp;
363 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
364} 382}
365 383
… …
371 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
372 390
373 if ($self->{aspect}) { 391 if ($self->{aspect}) {
374 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
375 393
376 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 394 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
377 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 395 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
378 396
379 # use alignment to adjust x, y 397 # use alignment to adjust x, y
380 398
381 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
382 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
… …
423 441
424 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
425 443
426 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
427 445
428 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($DC::UI::TOOLTIP->{owner} == $self) {
429 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $DC::UI::TOOLTIP->{owner};
430 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $DC::UI::TOOLTIP_WATCHER->invoke;
431 } 449 }
432} 450}
433 451
434# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
435sub coord2local { 453sub coord2local {
436 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
437 455
438 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
439 457
440 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
441} 459}
442 460
443# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
444sub coord2global { 462sub coord2global {
445 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
446 464
447 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
448 466
449 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
450} 468}
451 469
452sub invoke_focus_in { 470sub invoke_focus_in {
… …
501sub connect { 519sub connect {
502 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
503 521
504 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
505 523
506 defined wantarray and CFPlus::guard { 524 defined wantarray and DC::guard {
507 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
508 @{ $self->{signal_cb}{$signal} }; 526 @{ $self->{signal_cb}{$signal} };
509 } 527 }
510} 528}
511 529
… …
543 561
544 # parent 562 # parent
545 $self->{parent} && $self->{parent}->emit ($signal, @args) 563 $self->{parent} && $self->{parent}->emit ($signal, @args)
546} 564}
547 565
548sub find_widget { 566#sub find_widget {
549 my ($self, $x, $y) = @_; 567# in .xs
550
551 return () unless $self->{can_events};
552
553 return $self
554 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557 ()
558}
559 568
560sub set_parent { 569sub set_parent {
561 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
562 571
563 CFPlus::weaken ($self->{parent} = $parent); 572 DC::weaken ($self->{parent} = $parent);
564 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
565} 574}
566 575
567sub realloc { 576sub realloc {
568 my ($self) = @_; 577 my ($self) = @_;
… …
594 603
595# using global variables seems a bit hacky, but passing through all drawing 604# using global variables seems a bit hacky, but passing through all drawing
596# functions seems pointless. 605# functions seems pointless.
597our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 606our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
598 607
599sub draw { 608#sub draw {
600 my ($self) = @_; 609#CFPlus.xs
601
602 return unless $self->{h} && $self->{w};
603
604 # update screen rectangle
605 local $draw_x = $draw_x + $self->{x};
606 local $draw_y = $draw_y + $self->{y};
607
608 # skip widgets that are entirely outside the drawing area
609 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
610 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
611
612 glPushMatrix;
613 glTranslate $self->{x}, $self->{y}, 0;
614
615 if ($self == $HOVER && $self->{can_hover}) {
616 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
617 glEnable GL_BLEND;
618 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glBegin GL_QUADS;
620 glVertex 0 , 0;
621 glVertex $self->{w}, 0;
622 glVertex $self->{w}, $self->{h};
623 glVertex 0 , $self->{h};
624 glEnd;
625 glDisable GL_BLEND;
626 }
627
628 if ($ENV{CFPLUS_DEBUG} & 1) {
629 glPushMatrix;
630 glColor 1, 1, 0, 1;
631 glTranslate 0.375, 0.375;
632 glBegin GL_LINE_LOOP;
633 glVertex 0 , 0;
634 glVertex $self->{w} - 1, 0;
635 glVertex $self->{w} - 1, $self->{h} - 1;
636 glVertex 0 , $self->{h} - 1;
637 glEnd;
638 glPopMatrix;
639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
640 }
641
642 $self->_draw;
643 glPopMatrix;
644}
645 610
646sub _draw { 611sub _draw {
647 my ($self) = @_; 612 my ($self) = @_;
648 613
649 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
650} 615}
651 616
652my $cntx;#d#
653sub DESTROY { 617sub DESTROY {
654 my ($self) = @_; 618 my ($self) = @_;
655 619
656 return if CFPlus::in_destruct; 620 return if DC::in_destruct;
657 621
622 local $@;
658 eval { $self->destroy }; 623 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660 625
661 delete $WIDGET{$self+0}; 626 delete $WIDGET{$self+0};
662} 627}
663 628
664############################################################################# 629#############################################################################
665 630
666package CFPlus::UI::DrawBG; 631package DC::UI::DrawBG;
667 632
668our @ISA = CFPlus::UI::Base::; 633our @ISA = DC::UI::Base::;
669 634
670use strict; 635use strict;
671use CFPlus::OpenGL; 636use DC::OpenGL;
672 637
673sub new { 638sub new {
674 my $class = shift; 639 my $class = shift;
675
676 # range [value, low, high, page]
677 640
678 $class->SUPER::new ( 641 $class->SUPER::new (
679 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
680 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
681 @_ 644 @_
… …
693 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
694 657
695 glEnable GL_BLEND; 658 glEnable GL_BLEND;
696 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
697 glColor_premultiply @$color; 660 glColor_premultiply @$color;
698
699 glBegin GL_QUADS;
700 glVertex 0 , 0;
701 glVertex 0 , $h;
702 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
703 glVertex $w, 0;
704 glEnd;
705
706 glDisable GL_BLEND; 662 glDisable GL_BLEND;
707 } 663 }
708} 664}
709 665
710############################################################################# 666#############################################################################
711 667
712package CFPlus::UI::Empty; 668package DC::UI::Empty;
713 669
714our @ISA = CFPlus::UI::Base::; 670our @ISA = DC::UI::Base::;
715 671
716sub new { 672sub new {
717 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
718 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
719} 675}
… …
726 682
727sub draw { } 683sub draw { }
728 684
729############################################################################# 685#############################################################################
730 686
731package CFPlus::UI::Container; 687package DC::UI::Container;
732 688
733our @ISA = CFPlus::UI::Base::; 689our @ISA = DC::UI::Base::;
734 690
735sub new { 691sub new {
736 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
737 693
738 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
… …
742 can_events => 0, 698 can_events => 0,
743 %arg, 699 %arg,
744 ); 700 );
745 701
746 $self->add (@$children) 702 $self->add (@$children)
747 if $children; 703 if $children && @$children;
748 704
749 $self 705 $self
750} 706}
751 707
752sub realloc { 708sub realloc {
… …
761 my ($self, @widgets) = @_; 717 my ($self, @widgets) = @_;
762 718
763 $_->set_parent ($self) 719 $_->set_parent ($self)
764 for @widgets; 720 for @widgets;
765 721
722 # TODO: only do this in widgets that need it, e.g. root, fixed
766 use sort 'stable'; 723 use sort 'stable';
767 724
768 $self->{children} = [ 725 $self->{children} = [
769 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
771 ]; 728 ];
772 729
773 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
774} 735}
775 736
776sub children { 737sub children {
777 @{ $_[0]{children} } 738 @{ $_[0]{children} }
778} 739}
779 740
780sub remove { 741sub remove {
781 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
782 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
783 delete $child->{parent}; 747 delete $child->{parent};
784 $child->hide; 748 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
787 751
788 $self->realloc; 752 $self->realloc;
789} 753}
790 754
791sub clear { 755sub clear {
792 my ($self) = @_; 756 my ($self) = @_;
793 757
794 my $children = delete $self->{children}; 758 my $children = $self->{children};
795 $self->{children} = []; 759 $self->{children} = [];
796 760
797 for (@$children) { 761 for (@$children) {
798 delete $_->{parent}; 762 delete $_->{parent};
799 $_->hide; 763 $_->hide;
… …
819} 783}
820 784
821sub _draw { 785sub _draw {
822 my ($self) = @_; 786 my ($self) = @_;
823 787
824 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
825} 789}
826 790
827############################################################################# 791#############################################################################
828 792
829package CFPlus::UI::Bin; 793package DC::UI::Bin;
830 794
831our @ISA = CFPlus::UI::Container::; 795our @ISA = DC::UI::Container::;
832 796
833sub new { 797sub new {
834 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
835 799
836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 800 my $child = (delete $arg{child}) || new DC::UI::Empty::;
837 801
838 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
839} 803}
840 804
841sub add { 805sub add {
842 my ($self, $child) = @_; 806 my ($self, $child) = @_;
843 807
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
845 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
846} 810}
847 811
848sub remove { 812sub remove {
849 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
850 814
851 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
852 816
853 $self->{children} = [new CFPlus::UI::Empty] 817 $self->{children} = [new DC::UI::Empty]
854 unless @{$self->{children}}; 818 unless @{$self->{children}};
855} 819}
856 820
857sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
858 822
… …
867 831
868 1 832 1
869} 833}
870 834
871############################################################################# 835#############################################################################
872
873# back-buffered drawing area 836# back-buffered drawing area
874 837
875package CFPlus::UI::Window; 838package DC::UI::Window;
876 839
877our @ISA = CFPlus::UI::Bin::; 840our @ISA = DC::UI::Bin::;
878 841
879use CFPlus::OpenGL; 842use DC::OpenGL;
880 843
881sub new { 844sub new {
882 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
883 846
884 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
… …
906} 869}
907 870
908sub render_child { 871sub render_child {
909 my ($self) = @_; 872 my ($self) = @_;
910 873
911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 874 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
912 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
913 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
914 877
915 { 878 {
916 package CFPlus::UI::Base; 879 package DC::UI::Base;
917 880
918 local ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
919 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
920 883
921 $self->_render; 884 $self->_render;
… …
938 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
939} 902}
940 903
941############################################################################# 904#############################################################################
942 905
943package CFPlus::UI::ViewPort; 906package DC::UI::ViewPort;
944 907
908use List::Util qw(min max);
909
945our @ISA = CFPlus::UI::Window::; 910our @ISA = DC::UI::Window::;
946 911
947sub new { 912sub new {
948 my $class = shift; 913 my $class = shift;
949 914
950 $class->SUPER::new ( 915 $class->SUPER::new (
… …
957sub size_request { 922sub size_request {
958 my ($self) = @_; 923 my ($self) = @_;
959 924
960 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961 926
962 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
963 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
964 929
965 ($w, $h) 930 ($w, $h)
966} 931}
967 932
968sub invoke_size_allocate { 933sub invoke_size_allocate {
… …
980} 945}
981 946
982sub set_offset { 947sub set_offset {
983 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
984 949
950 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
951 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
952
953 if ($x != $self->{view_x} or $y != $self->{view_y}) {
985 $self->{view_x} = int $x; 954 $self->{view_x} = $x;
986 $self->{view_y} = int $y; 955 $self->{view_y} = $y;
987 956
957 $self->emit (changed => $x, $y);
988 $self->update; 958 $self->update;
959 }
960}
961
962sub set_center {
963 my ($self, $x, $y) = @_;
964
965 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
966}
967
968sub make_visible {
969 my ($self, $x, $y, $border) = @_;
970
971 if ( $x < $self->{view_x} + $self->{w} * $border
972 || $x > $self->{view_x} + $self->{w} * (1 - $border)
973 || $y < $self->{view_y} + $self->{h} * $border
974 || $y > $self->{view_y} + $self->{h} * (1 - $border)
975 ) {
976 $self->set_center ($x, $y);
977 }
989} 978}
990 979
991# hmm, this does not work for topleft of $self... but we should not ask for that 980# hmm, this does not work for topleft of $self... but we should not ask for that
992sub coord2local { 981sub coord2local {
993 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
… …
1008 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
1009 998
1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012 ) { 1001 ) {
1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1014 } else { 1003 } else {
1015 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->DC::UI::Base::find_widget ($x, $y)
1016 } 1005 }
1017} 1006}
1018 1007
1019sub _render { 1008sub _render {
1020 my ($self) = @_; 1009 my ($self) = @_;
1021 1010
1022 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1011 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1023 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1012 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1024 1013
1025 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1026 1015
1027 $self->SUPER::_render; 1016 $self->SUPER::_render;
1028} 1017}
1029 1018
1030############################################################################# 1019#############################################################################
1031 1020
1032package CFPlus::UI::ScrolledWindow; 1021package DC::UI::ScrolledWindow;
1033 1022
1034our @ISA = CFPlus::UI::HBox::; 1023our @ISA = DC::UI::Table::;
1035 1024
1036sub new { 1025sub new {
1037 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1038 1027
1039 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1040 1029
1041 my $self; 1030 my $self;
1042 1031
1043 my $slider = new CFPlus::UI::Slider 1032 my $hslider = new DC::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1035 vertical => 0,
1036 range => [0, 0, 1, 0.01], # HACK fix
1037 on_changed => sub {
1038 $self->{hpos} = $_[1];
1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 },
1041 ;
1042
1043 my $vslider = new DC::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
1044 vertical => 1, 1046 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1048 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1049 $self->{vpos} = $_[1];
1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1051 },
1049 ; 1052 ;
1050 1053
1051 $self = $class->SUPER::new ( 1054 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1055 scroll_x => 0,
1056 scroll_y => 1,
1053 can_events => 1, 1057 can_events => 1,
1054 slider => $slider, 1058 hslider => $hslider,
1059 vslider => $vslider,
1060 col_expand => [1, 0],
1061 row_expand => [1, 0],
1055 %arg, 1062 %arg,
1056 ); 1063 );
1057 1064
1065 $self->{vp} = new DC::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1068 expand => 1,
1069 scroll_x => $self->{scroll_x},
1070 scroll_y => $self->{scroll_y},
1071 on_changed => sub {
1072 my ($vp, $x, $y) = @_;
1073
1074 $vp->{parent}{hslider}->set_value ($x);
1075 $vp->{parent}{vslider}->set_value ($y);
1076
1077 0
1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1084 ;
1085
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1086 $self->SUPER::add ($self->{vp});
1087
1059 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1060 1089
1061 $self 1090 $self
1062} 1091}
1063
1064#TODO# update range on size_allocate depending on child
1065 1092
1066sub add { 1093sub add {
1067 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1068 1095
1069 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1070} 1097}
1071 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1103sub update_slider {
1104 my ($self) = @_;
1105
1106 my $child = ($self->{vp} or return)->child;
1107
1108 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1115 $visible ? $self->SUPER::add ($self->{hslider})
1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1118 }
1119
1120 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
1134 my ($self, $ev) = @_;
1135
1136 $self->grab_focus;
1137
1138 my $ox = $self->{vp}{view_x};
1139 my $oy = $self->{vp}{view_y};
1140
1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1148 };
1149}
1150
1072sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1074 1153
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev); 1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1078 1156
1079 1 1157 1
1080} 1158}
1081 1159
1082sub update_slider { 1160sub invoke_button_down {
1083 my ($self) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1084 1162
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1163 if ($ev->{button} == 2) {
1086} 1164 $self->start_dragging ($ev);
1165 return 1;
1166 }
1087 1167
1088sub update { 1168 0
1089 my ($self) = @_; 1169}
1090 1170
1091 $self->SUPER::update; 1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1092 1173
1093 $self->update_slider; 1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1094} 1190}
1095 1191
1096sub invoke_size_allocate { 1192sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1098 1194
1099 $self->update_slider; 1195 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1197}
1103 1198
1104############################################################################# 1199#############################################################################
1105 1200
1106package CFPlus::UI::Frame; 1201package DC::UI::Frame;
1107 1202
1108our @ISA = CFPlus::UI::Bin::; 1203our @ISA = DC::UI::Bin::;
1109 1204
1110use CFPlus::OpenGL; 1205use DC::OpenGL;
1111 1206
1112sub new { 1207sub new {
1113 my $class = shift; 1208 my $class = shift;
1114 1209
1115 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1125 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1126 1221
1127 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1128 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1129 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1130
1131 glBegin GL_QUADS;
1132 glVertex 0 , 0;
1133 glVertex 0 , $h;
1134 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1135 glVertex $w, 0;
1136 glEnd;
1137
1138 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1139 } 1227 }
1140 1228
1141 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1142} 1230}
1143 1231
1144############################################################################# 1232#############################################################################
1145 1233
1146package CFPlus::UI::FancyFrame; 1234package DC::UI::FancyFrame;
1147 1235
1148our @ISA = CFPlus::UI::Bin::; 1236our @ISA = DC::UI::Bin::;
1149 1237
1150use CFPlus::OpenGL; 1238use DC::OpenGL;
1151 1239
1152sub new { 1240sub new {
1153 my ($class, %arg) = @_; 1241 my ($class, %arg) = @_;
1154 1242
1155 if ((exists $arg{label}) && !ref $arg{label}) { 1243 if ((exists $arg{label}) && !ref $arg{label}) {
1156 $arg{label} = new CFPlus::UI::Label 1244 $arg{label} = new DC::UI::Label
1157 align => 1, 1245 align => 1,
1158 valign => 0, 1246 valign => 0,
1159 text => $arg{label}, 1247 text => $arg{label},
1160 fontsize => ($arg{border} || 0.8) * 0.75; 1248 fontsize => ($arg{border} || 0.8) * 0.75;
1161 } 1249 }
… …
1173 1261
1174sub add { 1262sub add {
1175 my ($self, @widgets) = @_; 1263 my ($self, @widgets) = @_;
1176 1264
1177 $self->SUPER::add (@widgets); 1265 $self->SUPER::add (@widgets);
1178 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1266 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1179} 1267}
1180 1268
1181sub border { 1269sub border {
1182 int $_[0]{border} * $::FONTSIZE 1270 int $_[0]{border} * $::FONTSIZE
1183} 1271}
… …
1241 } 1329 }
1242} 1330}
1243 1331
1244############################################################################# 1332#############################################################################
1245 1333
1246package CFPlus::UI::Toplevel; 1334package DC::UI::Toplevel;
1247 1335
1248our @ISA = CFPlus::UI::Bin::; 1336our @ISA = DC::UI::Bin::;
1249 1337
1250use CFPlus::OpenGL; 1338use DC::OpenGL;
1251 1339
1252my $bg = 1340my $bg =
1253 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1254 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1255 1343
1256my @border = 1344my @border =
1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1347
1348my @icon =
1349 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1350 qw(x1_move.png x1_resize.png);
1259 1351
1260sub new { 1352sub new {
1261 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1262 1354
1263 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
… …
1268 min_w => 64, 1360 min_w => 64,
1269 min_h => 32, 1361 min_h => 32,
1270 %arg, 1362 %arg,
1271 ); 1363 );
1272 1364
1273 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new DC::UI::Label
1274 align => 0, 1366 align => 0,
1275 valign => 1, 1367 valign => 1,
1276 text => $self->{title}, 1368 text => $self->{title},
1277 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1278 if exists $self->{title}; 1370 if exists $self->{title};
1279 1371
1280 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1281 $self->{close_button} = 1373 $self->{close_button} =
1282 new CFPlus::UI::ImageButton 1374 new DC::UI::ImageButton
1283 path => 'x1_close.png', 1375 path => 'x1_close.png',
1284 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1285 1377
1286 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->DC::UI::Container::add ($self->{close_button});
1287 } 1379 }
1288 1380
1289 $self 1381 $self
1290} 1382}
1291 1383
1292sub add { 1384sub add {
1293 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1294 1386
1295 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1296 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1388 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1297 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1389 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1298} 1390}
1299 1391
1300sub border { 1392sub border {
1301 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1394}
1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1302} 1403}
1303 1404
1304sub size_request { 1405sub size_request {
1305 my ($self) = @_; 1406 my ($self) = @_;
1306 1407
… …
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433 1534
1434 my $border = $self->border; 1535 my $border = $self->border;
1435 1536
1436 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1437 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1441 1556
1442 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1443 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1444 1559
1445 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1464 if $self->{close_button}; 1579 if $self->{close_button};
1465} 1580}
1466 1581
1467############################################################################# 1582#############################################################################
1468 1583
1469package CFPlus::UI::Table; 1584package DC::UI::Table;
1470 1585
1471our @ISA = CFPlus::UI::Base::; 1586our @ISA = DC::UI::Container::;
1472 1587
1473use List::Util qw(max sum); 1588use List::Util qw(max sum);
1474 1589
1475use CFPlus::OpenGL; 1590use DC::OpenGL;
1476 1591
1477sub new { 1592sub new {
1478 my $class = shift; 1593 my $class = shift;
1479 1594
1480 $class->SUPER::new ( 1595 $class->SUPER::new (
1481 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1482 @_, 1598 @_,
1483 ) 1599 )
1484} 1600}
1485 1601
1486sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488}
1489
1490sub add { 1602sub add {
1603 my ($self, @widgets) = @_;
1604
1605 for my $child (@widgets) {
1606 $child->{c_rowspan} ||= 1;
1607 $child->{c_colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1611}
1612
1613sub add_at {
1491 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1492 1617
1493 while (@_) { 1618 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child;
1497 }
1498 1620
1499 $self->{force_realloc} = 1; 1621 $child->{c_row} = $row;
1500 $self->{force_size_alloc} = 1; 1622 $child->{c_col} = $col;
1501 $self->realloc;
1502}
1503 1623
1504sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1505 my ($self, $child) = @_; 1631 my ($self) = @_;
1506 1632
1507 # TODO: not yet implemented 1633 my (@w, @h);
1508}
1509
1510# TODO: move to container class maybe? send children a signal on removal?
1511sub clear {
1512 my ($self) = @_;
1513 1634
1514 my @children = $self->children; 1635 my @children = $self->children;
1515 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1516 1646 }
1517 for (@children) {
1518 delete $_->{parent};
1519 $_->hide;
1520 }
1521 1647
1522 $self->realloc; 1648 # second pass, rows
1523} 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1524
1525sub get_wh {
1526 my ($self) = @_;
1527
1528 my (@w, @h);
1529
1530 for my $y (0 .. $#{$self->{children}}) {
1531 my $row = $self->{children}[$y]
1532 or next;
1533
1534 for my $x (0 .. $#$row) {
1535 my $widget = $row->[$x]
1536 or next;
1537 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1538 1651
1539 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1540 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541 } 1656 }
1542 } 1657 }
1543 1658
1544 (\@w, \@h) 1659 (\@w, \@h)
1545} 1660}
… …
1561 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1562 1677
1563 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1565 1680
1566 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1567 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1570 1685
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1687
1575 CFPlus::UI::harmonize $ws; 1688 DC::UI::harmonize $ws;
1689
1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1;
1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695
1576 CFPlus::UI::harmonize $hs; 1696 DC::UI::harmonize $hs;
1577 1697
1578 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579 1700
1580 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1581 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1582 or next;
1583 1703
1584 my $x = 0; 1704 $widget->configure (
1585 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586 1707 );
1587 for my $c (0 .. $#$row) { 1708 }
1588 my $col_w = $ws->[$c];
1589 1709
1590 if (my $widget = $row->[$c]) { 1710 1
1591 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1592 }
1593 1712
1594 $x += $col_w; 1713#############################################################################
1714
1715package DC::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = DC::UI::Container::;
1720
1721sub _scale($$$) {
1722 my ($rel, $val, $max) = @_;
1723
1724 $rel ? $val * $max : $val
1725}
1726
1727sub size_request {
1728 my ($self) = @_;
1729
1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1731
1732 # determine overall size by querying abs widgets
1733 for my $child ($self->visible_children) {
1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1737
1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1595 } 1740 }
1741 }
1596 1742
1597 $y += $row_h; 1743 my $W = $x2 - $x1;
1744 my $H = $y2 - $y1;
1745
1746 # now layout remaining widgets
1747 for my $child ($self->visible_children) {
1748 if ($child->{c_rel}) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1754 }
1755 }
1756
1757 my $W = $x2 - $x1;
1758 my $H = $y2 - $y1;
1759
1760 ($W, $H)
1761}
1762
1763sub invoke_size_allocate {
1764 my ($self, $W, $H) = @_;
1765
1766 for my $child ($self->visible_children) {
1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1769
1770 $x += $child->{c_halign} * $child->{req_w};
1771 $y += $child->{c_valign} * $child->{req_h};
1772
1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1598 } 1774 }
1599 1775
1600 1 1776 1
1601} 1777}
1602 1778
1603sub find_widget {
1604 my ($self, $x, $y) = @_;
1605
1606 $x -= $self->{x};
1607 $y -= $self->{y};
1608
1609 my $res;
1610
1611 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612 $res = $_->find_widget ($x, $y)
1613 and return $res;
1614 }
1615
1616 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617}
1618
1619sub _draw {
1620 my ($self) = @_;
1621
1622 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_;
1624 }
1625}
1626
1627############################################################################# 1779#############################################################################
1628 1780
1629package CFPlus::UI::Box; 1781package DC::UI::Box;
1630 1782
1631our @ISA = CFPlus::UI::Container::; 1783our @ISA = DC::UI::Container::;
1632 1784
1633sub size_request { 1785sub size_request {
1634 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1635 1789
1636 $self->{vertical} 1790 $self->{vertical}
1637 ? ( 1791 ? (
1638 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1639 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1640 ) 1794 )
1641 : ( 1795 : (
1642 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1643 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1644 ) 1798 )
1645} 1799}
1646 1800
1647sub invoke_size_allocate { 1801sub invoke_size_allocate {
1648 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1669 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1670 for 0 .. $#children; 1824 for 0 .. $#children;
1671 } 1825 }
1672 } 1826 }
1673 1827
1674 CFPlus::UI::harmonize \@req; 1828 DC::UI::harmonize \@req;
1675 1829
1676 my $pos = 0; 1830 my $pos = 0;
1677 for (0 .. $#children) { 1831 for (0 .. $#children) {
1678 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1679 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1684 1 1838 1
1685} 1839}
1686 1840
1687############################################################################# 1841#############################################################################
1688 1842
1689package CFPlus::UI::HBox; 1843package DC::UI::HBox;
1690 1844
1691our @ISA = CFPlus::UI::Box::; 1845our @ISA = DC::UI::Box::;
1692 1846
1693sub new { 1847sub new {
1694 my $class = shift; 1848 my $class = shift;
1695 1849
1696 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1699 ) 1853 )
1700} 1854}
1701 1855
1702############################################################################# 1856#############################################################################
1703 1857
1704package CFPlus::UI::VBox; 1858package DC::UI::VBox;
1705 1859
1706our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1707 1861
1708sub new { 1862sub new {
1709 my $class = shift; 1863 my $class = shift;
1710 1864
1711 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1714 ) 1868 )
1715} 1869}
1716 1870
1717############################################################################# 1871#############################################################################
1718 1872
1719package CFPlus::UI::Label; 1873package DC::UI::Label;
1720 1874
1721our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = DC::UI::DrawBG::;
1722 1876
1723use CFPlus::OpenGL; 1877use DC::OpenGL;
1724 1878
1725sub new { 1879sub new {
1726 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1727 1881
1728 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1733 #text => initial text 1887 #text => initial text
1734 #markup => initial narkup 1888 #markup => initial narkup
1735 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1736 #style => 0, # render flags 1890 #style => 0, # render flags
1737 ellipsise => 3, # end 1891 ellipsise => 3, # end
1738 layout => (new CFPlus::Layout), 1892 layout => (new DC::Layout),
1739 fontsize => 1, 1893 fontsize => 1,
1740 align => -1, 1894 align => -1,
1741 valign => -1, 1895 valign => -1,
1742 padding_x => 2, 1896 padding_x => 2,
1743 padding_y => 2, 1897 padding_y => 2,
1744 can_events => 0, 1898 can_events => 0,
1745 %arg 1899 %arg
1746 ); 1900 );
1747 1901
1748 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1749 my $layout = new CFPlus::Layout; 1903 my $layout = new DC::Layout;
1750 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1751 $self->{template} = $layout; 1905 $self->{template} = $layout;
1752 } 1906 }
1753 1907
1754 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1772 1926
1773 delete $self->{ox}; 1927 delete $self->{ox};
1774 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1775} 1929}
1776 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1777sub set_text { 1937sub set_text {
1778 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1779 1939
1780 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1781 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
1804 1964
1805sub size_request { 1965sub size_request {
1806 my ($self) = @_; 1966 my ($self) = @_;
1807 1967
1808 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1809 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1810 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1811 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1812 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1813 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1814 1976
1815 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
1887 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
1888 2050
1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1892 }; 2056 };
1893 2057
1894 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
1895 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = DC::OpenGL::glGenList;
1896 2060# DC::OpenGL::glNewList $self->{list};
1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062# DC::OpenGL::glEndList;
2063# }
2064#
2065# DC::OpenGL::glCallList $self->{list};
2066
2067 $self->{layout}->draw;
1898} 2068}
2069
2070#sub destroy {
2071# my ($self) = @_;
2072#
2073# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074#
2075# $self->SUPER::destroy;
2076#}
1899 2077
1900############################################################################# 2078#############################################################################
1901 2079
1902package CFPlus::UI::EntryBase; 2080package DC::UI::EntryBase;
1903 2081
1904our @ISA = CFPlus::UI::Label::; 2082our @ISA = DC::UI::Label::;
1905 2083
1906use CFPlus::OpenGL; 2084use DC::OpenGL;
1907 2085
1908sub new { 2086sub new {
1909 my $class = shift; 2087 my $class = shift;
1910 2088
1911 $class->SUPER::new ( 2089 $class->SUPER::new (
1912 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
1913 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
1914 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
1915 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
1916 can_hover => 1, 2096 can_hover => 1,
1917 can_focus => 1, 2097 can_focus => 1,
1918 valign => 0, 2098 valign => 0,
1919 can_events => 1, 2099 can_events => 1,
1920 ellipsise => 0, 2100 ellipsise => 0,
2101 padding_x => 4,
2102 padding_y => 2,
1921 #text => ... 2103 #text => ...
1922 #hidden => "*", 2104 #hidden => "*",
1923 @_ 2105 @_
1924 ) 2106 )
1925} 2107}
… …
1970 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1971 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1972 2154
1973 my $text = $self->get_text; 2155 my $text = $self->get_text;
1974 2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2158
1975 if ($uni == 8) { 2159 if ($uni == 8) {
1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1978 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1979 } elsif ($sym == CFPlus::SDLK_LEFT) { 2163 } elsif ($sym == DC::SDLK_LEFT) {
1980 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1981 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2165 } elsif ($sym == DC::SDLK_RIGHT) {
1982 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1983 } elsif ($sym == CFPlus::SDLK_HOME) { 2167 } elsif ($sym == DC::SDLK_HOME) {
1984 # what a hack 2168 # what a hack
1985 $self->{cursor} = 2169 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1 2171 ? length $1
1988 : 0; 2172 : 0;
1989 } elsif ($sym == CFPlus::SDLK_END) { 2173 } elsif ($sym == DC::SDLK_END) {
1990 # uh, again 2174 # uh, again
1991 $self->{cursor} = 2175 $self->{cursor} =
1992 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1993 ? $self->{cursor} + length $1 2177 ? $self->{cursor} + length $1
1994 : length $self->{text}; 2178 : length $self->{text};
… …
2058 glColor_premultiply @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
2059 } 2243 }
2060 2244
2061 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
2062 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2063 glBegin GL_QUADS;
2064 glVertex 0 , 0;
2065 glVertex 0 , $self->{h};
2066 glVertex $self->{w}, $self->{h}; 2247 glRect 0, 0, $self->{w}, $self->{h};
2067 glVertex $self->{w}, 0;
2068 glEnd;
2069 glDisable GL_BLEND; 2248 glDisable GL_BLEND;
2070 2249
2071 $self->SUPER::_draw; 2250 $self->SUPER::_draw;
2072 2251
2073 #TODO: force update every cursor change :( 2252 #TODO: force update every cursor change :(
… …
2075 2254
2076 unless (exists $self->{cur_h}) { 2255 unless (exists $self->{cur_h}) {
2077 my $text = substr $self->{text}, 0, $self->{cursor}; 2256 my $text = substr $self->{text}, 0, $self->{cursor};
2078 utf8::encode $text; 2257 utf8::encode $text;
2079 2258
2080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2081 } 2260 }
2082 2261
2262 glColor_premultiply @{$self->{active_fg}};
2083 glBegin GL_LINES; 2263 glBegin GL_LINES;
2084 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2264 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2085 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2265 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2086 glEnd; 2266 glEnd;
2267
2268 glLineWidth 3;
2269 glColor @{$self->{active_outline}};
2270 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2271 glLineWidth 1;
2272
2273 } else {
2274 glColor @{$self->{outline}};
2275 glBegin GL_LINE_STRIP;
2276 glVertex .5, $self->{h} * .5;
2277 glVertex .5, $self->{h} - 2.5;
2278 glVertex $self->{w} - .5, $self->{h} - 2.5;
2279 glVertex $self->{w} - .5, $self->{h} * .5;
2280 glEnd;
2087 } 2281 }
2088} 2282}
2089 2283
2090############################################################################# 2284#############################################################################
2091 2285
2092package CFPlus::UI::Entry; 2286package DC::UI::Entry;
2093 2287
2094our @ISA = CFPlus::UI::EntryBase::; 2288our @ISA = DC::UI::EntryBase::;
2095 2289
2096use CFPlus::OpenGL; 2290use DC::OpenGL;
2097 2291
2098sub invoke_key_down { 2292sub invoke_key_down {
2099 my ($self, $ev) = @_; 2293 my ($self, $ev) = @_;
2100 2294
2101 my $sym = $ev->{sym}; 2295 my $sym = $ev->{sym};
… …
2107 $self->{history_pointer} = -1; 2301 $self->{history_pointer} = -1;
2108 $self->{history_saveback} = ''; 2302 $self->{history_saveback} = '';
2109 $self->emit (activate => $txt); 2303 $self->emit (activate => $txt);
2110 $self->update; 2304 $self->update;
2111 2305
2112 } elsif ($sym == CFPlus::SDLK_UP) { 2306 } elsif ($sym == DC::SDLK_UP) {
2113 if ($self->{history_pointer} < 0) { 2307 if ($self->{history_pointer} < 0) {
2114 $self->{history_saveback} = $self->get_text; 2308 $self->{history_saveback} = $self->get_text;
2115 } 2309 }
2116 if (@{$self->{history} || []} > 0) { 2310 if (@{$self->{history} || []} > 0) {
2117 $self->{history_pointer}++; 2311 $self->{history_pointer}++;
… …
2119 $self->{history_pointer} = @{$self->{history} || []} - 1; 2313 $self->{history_pointer} = @{$self->{history} || []} - 1;
2120 } 2314 }
2121 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2315 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2122 } 2316 }
2123 2317
2124 } elsif ($sym == CFPlus::SDLK_DOWN) { 2318 } elsif ($sym == DC::SDLK_DOWN) {
2125 $self->{history_pointer}--; 2319 $self->{history_pointer}--;
2126 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2320 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2127 2321
2128 if ($self->{history_pointer} >= 0) { 2322 if ($self->{history_pointer} >= 0) {
2129 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2323 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2138 1 2332 1
2139} 2333}
2140 2334
2141############################################################################# 2335#############################################################################
2142 2336
2143package CFPlus::UI::TextEdit; 2337package DC::UI::TextEdit;
2144 2338
2145our @ISA = CFPlus::UI::EntryBase::; 2339our @ISA = DC::UI::EntryBase::;
2146 2340
2147use CFPlus::OpenGL; 2341use DC::OpenGL;
2342
2343sub new {
2344 my $class = shift;
2345
2346 $class->SUPER::new (
2347 padding_y => 4,
2348
2349 @_
2350 )
2351}
2148 2352
2149sub move_cursor_ver { 2353sub move_cursor_ver {
2150 my ($self, $dy) = @_; 2354 my ($self, $dy) = @_;
2151 2355
2152 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2356 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
… …
2164sub invoke_key_down { 2368sub invoke_key_down {
2165 my ($self, $ev) = @_; 2369 my ($self, $ev) = @_;
2166 2370
2167 my $sym = $ev->{sym}; 2371 my $sym = $ev->{sym};
2168 2372
2169 if ($sym == CFPlus::SDLK_UP) { 2373 if ($sym == DC::SDLK_UP) {
2170 $self->move_cursor_ver (-1); 2374 $self->move_cursor_ver (-1);
2171 } elsif ($sym == CFPlus::SDLK_DOWN) { 2375 } elsif ($sym == DC::SDLK_DOWN) {
2172 $self->move_cursor_ver (+1); 2376 $self->move_cursor_ver (+1);
2173 } else { 2377 } else {
2174 return $self->SUPER::invoke_key_down ($ev) 2378 return $self->SUPER::invoke_key_down ($ev)
2175 } 2379 }
2176 2380
2177 1 2381 1
2178} 2382}
2179 2383
2180############################################################################# 2384#############################################################################
2181 2385
2182package CFPlus::UI::Button; 2386package DC::UI::ButtonBin;
2183 2387
2184our @ISA = CFPlus::UI::Label::; 2388our @ISA = DC::UI::Bin::;
2185 2389
2186use CFPlus::OpenGL; 2390use DC::OpenGL;
2187 2391
2188my @tex = 2392my @tex =
2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2393 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2190 qw(b1_button_active.png); 2394 qw(b1_button_inactive.png b1_button_active.png);
2191 2395
2192sub new { 2396sub new {
2193 my $class = shift; 2397 my $class = shift;
2194 2398
2195 $class->SUPER::new ( 2399 $class->SUPER::new (
2196 padding_x => 4,
2197 padding_y => 4,
2198 fg => [1, 1, 1],
2199 active_fg => [0, 0, 1],
2200 can_hover => 1, 2400 can_hover => 1,
2201 align => 0, 2401 align => 0,
2202 valign => 0, 2402 valign => 0,
2203 can_events => 1, 2403 can_events => 1,
2204 @_ 2404 @_
… …
2216} 2416}
2217 2417
2218sub _draw { 2418sub _draw {
2219 my ($self) = @_; 2419 my ($self) = @_;
2220 2420
2221 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2222
2223 glEnable GL_TEXTURE_2D; 2421 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2422 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 0, 0, 0, 1; 2423 glColor 0, 0, 0, 1;
2226 2424
2425 my $tex = $tex[$GRAB == $self];
2227 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2426 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228 2427
2229 glDisable GL_TEXTURE_2D; 2428 glDisable GL_TEXTURE_2D;
2230 2429
2231 $self->SUPER::_draw; 2430 $self->SUPER::_draw;
2232} 2431}
2233 2432
2234############################################################################# 2433#############################################################################
2235 2434
2236package CFPlus::UI::CheckBox; 2435package DC::UI::Button;
2237 2436
2238our @ISA = CFPlus::UI::DrawBG::; 2437our @ISA = DC::UI::Label::;
2438
2439use DC::OpenGL;
2239 2440
2240my @tex = 2441my @tex =
2241 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2442 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2443 qw(b1_button_inactive.png b1_button_active.png);
2444
2445sub new {
2446 my $class = shift;
2447
2448 $class->SUPER::new (
2449 padding_x => 8,
2450 padding_y => 4,
2451 fg => [1.0, 1.0, 1.0],
2452 active_fg => [0.8, 0.8, 0.8],
2453 can_hover => 1,
2454 align => 0,
2455 valign => 0,
2456 can_events => 1,
2457 @_
2458 )
2459}
2460
2461sub invoke_button_up {
2462 my ($self, $ev, $x, $y) = @_;
2463
2464 $self->emit ("activate")
2465 if $x >= 0 && $x < $self->{w}
2466 && $y >= 0 && $y < $self->{h};
2467
2468 1
2469}
2470
2471sub _draw {
2472 my ($self) = @_;
2473
2474 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2475
2476 glEnable GL_TEXTURE_2D;
2477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2478 glColor 0, 0, 0, 1;
2479
2480 my $tex = $tex[$GRAB == $self];
2481 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2482
2483 glDisable GL_TEXTURE_2D;
2484
2485 $self->SUPER::_draw;
2486}
2487
2488#############################################################################
2489
2490package DC::UI::CheckBox;
2491
2492our @ISA = DC::UI::DrawBG::;
2493
2494my @tex =
2495 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2242 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2496 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2243 2497
2244use CFPlus::OpenGL; 2498use DC::OpenGL;
2245 2499
2246sub new { 2500sub new {
2247 my $class = shift; 2501 my $class = shift;
2248 2502
2249 $class->SUPER::new ( 2503 $class->SUPER::new (
… …
2289sub _draw { 2543sub _draw {
2290 my ($self) = @_; 2544 my ($self) = @_;
2291 2545
2292 $self->SUPER::_draw; 2546 $self->SUPER::_draw;
2293 2547
2294 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2548 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2295 2549
2296 my ($w, $h) = @$self{qw(w h)}; 2550 my ($w, $h) = @$self{qw(w h)};
2297 2551
2298 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2552 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2299 2553
… …
2306 glDisable GL_TEXTURE_2D; 2560 glDisable GL_TEXTURE_2D;
2307} 2561}
2308 2562
2309############################################################################# 2563#############################################################################
2310 2564
2311package CFPlus::UI::Image; 2565package DC::UI::Image;
2312 2566
2313our @ISA = CFPlus::UI::Base::; 2567our @ISA = DC::UI::Base::;
2314 2568
2315use CFPlus::OpenGL; 2569use DC::OpenGL;
2316 2570
2317our %texture_cache; 2571our %texture_cache;
2318 2572
2319sub new { 2573sub new {
2320 my $class = shift; 2574 my $class = shift;
2321 2575
2322 my $self = $class->SUPER::new ( 2576 my $self = $class->SUPER::new (
2323 can_events => 0, 2577 can_events => 0,
2578 scale => 1,
2324 @_, 2579 @_,
2325 ); 2580 );
2326 2581
2327 $self->{path} || $self->{tex} 2582 $self->{path} || $self->{tex}
2328 or Carp::croak "'path' or 'tex' attributes required"; 2583 or Carp::croak "'path' or 'tex' attributes required";
2329 2584
2330 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2585 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2331 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2586 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2332 2587
2333 CFPlus::weaken $texture_cache{$self->{path}}; 2588 DC::weaken $texture_cache{$self->{path}};
2334 2589
2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2590 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2336 2591
2337 $self 2592 $self
2338} 2593}
2339 2594
2340sub STORABLE_freeze { 2595sub STORABLE_freeze {
2341 my ($self, $cloning) = @_; 2596 my ($self, $cloning) = @_;
2342 2597
2343 $self->{path} 2598 $self->{path}
2344 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2599 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2345 2600
2346 $self->{path} 2601 $self->{path}
2347} 2602}
2348 2603
2349sub STORABLE_attach { 2604sub STORABLE_attach {
… …
2353} 2608}
2354 2609
2355sub size_request { 2610sub size_request {
2356 my ($self) = @_; 2611 my ($self) = @_;
2357 2612
2358 ($self->{tex}{w}, $self->{tex}{h}) 2613 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2359} 2614}
2360 2615
2361sub _draw { 2616sub _draw {
2362 my ($self) = @_; 2617 my ($self) = @_;
2363 2618
… …
2373 } 2628 }
2374 2629
2375 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2376 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377 2632
2378 $tex->draw_quad (0, 0, $w, $h); 2633 $tex->draw_quad_alpha (0, 0, $w, $h);
2379 2634
2380 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2381} 2636}
2382 2637
2383############################################################################# 2638#############################################################################
2384 2639
2385package CFPlus::UI::ImageButton; 2640package DC::UI::ImageButton;
2386 2641
2387our @ISA = CFPlus::UI::Image::; 2642our @ISA = DC::UI::Image::;
2388 2643
2389use CFPlus::OpenGL; 2644use DC::OpenGL;
2390 2645
2391my %textures; 2646my %textures;
2392 2647
2393sub new { 2648sub new {
2394 my $class = shift; 2649 my $class = shift;
… …
2404 can_events => 1, 2659 can_events => 1,
2405 @_ 2660 @_
2406 ); 2661 );
2407} 2662}
2408 2663
2664sub invoke_button_down {
2665 my ($self, $ev, $x, $y) = @_;
2666
2667 1
2668}
2669
2409sub invoke_button_up { 2670sub invoke_button_up {
2410 my ($self, $ev, $x, $y) = @_; 2671 my ($self, $ev, $x, $y) = @_;
2411 2672
2412 $self->emit ("activate") 2673 $self->emit ("activate")
2413 if $x >= 0 && $x < $self->{w} 2674 if $x >= 0 && $x < $self->{w}
… …
2416 1 2677 1
2417} 2678}
2418 2679
2419############################################################################# 2680#############################################################################
2420 2681
2421package CFPlus::UI::VGauge; 2682package DC::UI::VGauge;
2422 2683
2423our @ISA = CFPlus::UI::Base::; 2684our @ISA = DC::UI::Base::;
2424 2685
2425use List::Util qw(min max); 2686use List::Util qw(min max);
2426 2687
2427use CFPlus::OpenGL; 2688use DC::OpenGL;
2428 2689
2429my %tex = ( 2690my %tex = (
2430 food => [ 2691 food => [
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2432 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2693 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2433 ], 2694 ],
2434 grace => [ 2695 grace => [
2435 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2696 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2436 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2697 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2437 ], 2698 ],
2438 hp => [ 2699 hp => [
2439 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2700 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2440 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2701 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2441 ], 2702 ],
2442 mana => [ 2703 mana => [
2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2704 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2444 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2705 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2445 ], 2706 ],
2446); 2707);
2447 2708
2448# eg. VGauge->new (gauge => 'food'), default gauge: food 2709# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2551 glDisable GL_TEXTURE_2D; 2812 glDisable GL_TEXTURE_2D;
2552} 2813}
2553 2814
2554############################################################################# 2815#############################################################################
2555 2816
2817package DC::UI::Progress;
2818
2819our @ISA = DC::UI::Label::;
2820
2821use DC::OpenGL;
2822
2823sub new {
2824 my ($class, %arg) = @_;
2825
2826 my $self = $class->SUPER::new (
2827 fg => [1, 1, 1],
2828 bg => [0, 0, 1, 0.2],
2829 bar => [0.7, 0.5, 0.1, 0.8],
2830 outline => [0.4, 0.3, 0],
2831 fontsize => 0.9,
2832 valign => 0,
2833 align => 0,
2834 can_events => 1,
2835 ellipsise => 1,
2836 label => "%d%%",
2837 %arg,
2838 );
2839
2840 $self->set_value ($arg{value} || -1);
2841
2842 $self
2843}
2844
2845sub set_label {
2846 my ($self, $label) = @_;
2847
2848 return if $self->{label} eq $label;
2849 $self->{label} = $label;
2850
2851 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2852}
2853
2854sub set_value {
2855 my ($self, $value) = @_;
2856
2857 if ($self->{value} ne $value) {
2858 $self->{value} = $value;
2859
2860 if ($value < 0) {
2861 $self->set_text ("-");
2862 } else {
2863 $self->set_text (sprintf $self->{label}, $value * 100);
2864 }
2865
2866 $self->update;
2867 }
2868}
2869
2870sub _draw {
2871 my ($self) = @_;
2872
2873 glEnable GL_BLEND;
2874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2875
2876 if ($self->{value} >= 0) {
2877 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2878
2879 glColor_premultiply @{$self->{bar}};
2880 glRect 2, 2, $s, $self->{h} - 2;
2881 glColor_premultiply @{$self->{bg}};
2882 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2883 }
2884
2885 glColor_premultiply @{$self->{outline}};
2886 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2887
2888 glDisable GL_BLEND;
2889
2890 {
2891 local $self->{bg}; # do not draw background
2892 $self->SUPER::_draw;
2893 }
2894}
2895
2896#############################################################################
2897
2898package DC::UI::ExperienceProgress;
2899
2900our @ISA = DC::UI::Progress::;
2901
2902sub new {
2903 my ($class, %arg) = @_;
2904
2905 my $self = $class->SUPER::new (
2906 tooltip => sub {
2907 my ($self) = @_;
2908
2909 sprintf "level %d\n%s points\n%s next level\n%s to go",
2910 $self->{lvl},
2911 ::formsep ($self->{exp}),
2912 ::formsep ($self->{nxt}),
2913 ::formsep ($self->{nxt} - $self->{exp}),
2914 },
2915 %arg
2916 );
2917
2918 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2919 if $::CONN;
2920
2921 $self
2922}
2923
2924sub DESTROY {
2925 my ($self) = @_;
2926
2927 delete $::CONN->{on_exp_update}{$self+0}
2928 if $::CONN;
2929
2930 $self->SUPER::DESTROY;
2931}
2932
2933sub set_value {
2934 my ($self, $lvl, $exp) = @_;
2935
2936 $self->{lvl} = $lvl;
2937 $self->{exp} = $exp;
2938
2939 my $v = -1;
2940
2941 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2942 my $l0 = $table->[$lvl - 1];
2943 my $l1 = $table->[$lvl];
2944
2945 $self->{nxt} = $l1;
2946
2947 $v = ($exp - $l0) / ($l1 - $l0);
2948 }
2949
2950 $self->SUPER::set_value ($v);
2951}
2952
2953#############################################################################
2954
2556package CFPlus::UI::Gauge; 2955package DC::UI::Gauge;
2557 2956
2558our @ISA = CFPlus::UI::VBox::; 2957our @ISA = DC::UI::VBox::;
2559 2958
2560sub new { 2959sub new {
2561 my ($class, %arg) = @_; 2960 my ($class, %arg) = @_;
2562 2961
2563 my $self = $class->SUPER::new ( 2962 my $self = $class->SUPER::new (
… …
2565 can_hover => 1, 2964 can_hover => 1,
2566 can_events => 1, 2965 can_events => 1,
2567 %arg, 2966 %arg,
2568 ); 2967 );
2569 2968
2570 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2969 $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
2571 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2970 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2572 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2971 $self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999");
2573 2972
2574 $self 2973 $self
2575} 2974}
2576 2975
2577sub set_fontsize { 2976sub set_fontsize {
… …
2598 $self->{value}->set_text ($val); 2997 $self->{value}->set_text ($val);
2599} 2998}
2600 2999
2601############################################################################# 3000#############################################################################
2602 3001
2603package CFPlus::UI::Slider; 3002package DC::UI::Slider;
2604 3003
2605use strict; 3004use strict;
2606 3005
2607use CFPlus::OpenGL; 3006use DC::OpenGL;
2608 3007
2609our @ISA = CFPlus::UI::DrawBG::; 3008our @ISA = DC::UI::DrawBG::;
2610 3009
2611my @tex = 3010my @tex =
2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3011 map { new_from_file DC::Texture DC::find_rcfile $_ }
2613 qw(s1_slider.png s1_slider_bg.png); 3012 qw(s1_slider.png s1_slider_bg.png);
2614 3013
2615sub new { 3014sub new {
2616 my $class = shift; 3015 my $class = shift;
2617 3016
… …
2685 3084
2686 $self->SUPER::invoke_button_down ($ev, $x, $y); 3085 $self->SUPER::invoke_button_down ($ev, $x, $y);
2687 3086
2688 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3087 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2689 3088
2690 $self->invoke_mouse_motion ($ev, $x, $y) 3089 $self->invoke_mouse_motion ($ev, $x, $y);
3090
3091 1
2691} 3092}
2692 3093
2693sub invoke_mouse_motion { 3094sub invoke_mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2695 3096
… …
2711sub invoke_mouse_wheel { 3112sub invoke_mouse_wheel {
2712 my ($self, $ev) = @_; 3113 my ($self, $ev) = @_;
2713 3114
2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3115 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2715 3116
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3117 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2717 3118
2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3119 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719 3120
2720 ! ! $delta 3121 1
2721} 3122}
2722 3123
2723sub update { 3124sub update {
2724 my ($self) = @_; 3125 my ($self) = @_;
2725 3126
… …
2774 glDisable GL_TEXTURE_2D; 3175 glDisable GL_TEXTURE_2D;
2775} 3176}
2776 3177
2777############################################################################# 3178#############################################################################
2778 3179
2779package CFPlus::UI::ValSlider; 3180package DC::UI::ValSlider;
2780 3181
2781our @ISA = CFPlus::UI::HBox::; 3182our @ISA = DC::UI::HBox::;
2782 3183
2783sub new { 3184sub new {
2784 my ($class, %arg) = @_; 3185 my ($class, %arg) = @_;
2785 3186
2786 my $range = delete $arg{range}; 3187 my $range = delete $arg{range};
2787 3188
2788 my $self = $class->SUPER::new ( 3189 my $self = $class->SUPER::new (
2789 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3190 slider => (new DC::UI::Slider expand => 1, range => $range),
2790 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3191 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2791 to_value => sub { shift }, 3192 to_value => sub { shift },
2792 from_value => sub { shift }, 3193 from_value => sub { shift },
2793 %arg, 3194 %arg,
2794 ); 3195 );
2795 3196
… …
2815sub set_range { shift->{slider}->set_range (@_) } 3216sub set_range { shift->{slider}->set_range (@_) }
2816sub set_value { shift->{slider}->set_value (@_) } 3217sub set_value { shift->{slider}->set_value (@_) }
2817 3218
2818############################################################################# 3219#############################################################################
2819 3220
2820package CFPlus::UI::TextScroller; 3221package DC::UI::TextScroller;
2821 3222
2822our @ISA = CFPlus::UI::HBox::; 3223our @ISA = DC::UI::HBox::;
2823 3224
2824use CFPlus::OpenGL; 3225use DC::OpenGL;
2825 3226
2826sub new { 3227sub new {
2827 my $class = shift; 3228 my $class = shift;
2828 3229
2829 my $self = $class->SUPER::new ( 3230 my $self = $class->SUPER::new (
… …
2831 can_events => 1, 3232 can_events => 1,
2832 indent => 0, 3233 indent => 0,
2833 #font => default_font 3234 #font => default_font
2834 @_, 3235 @_,
2835 3236
2836 layout => (new CFPlus::Layout), 3237 layout => (new DC::Layout),
2837 par => [], 3238 par => [],
2838 max_par => 0, 3239 max_par => 0,
2839 height => 0, 3240 height => 0,
2840 children => [ 3241 children => [
2841 (new CFPlus::UI::Empty expand => 1), 3242 (new DC::UI::Empty expand => 1),
2842 (new CFPlus::UI::Slider vertical => 1), 3243 (new DC::UI::Slider vertical => 1),
2843 ], 3244 ],
2844 ); 3245 );
2845 3246
2846 $self->{children}[1]->connect (changed => sub { $self->update }); 3247 $self->{children}[1]->connect (changed => sub { $self->update });
2847 3248
… …
2856} 3257}
2857 3258
2858sub size_request { 3259sub size_request {
2859 my ($self) = @_; 3260 my ($self) = @_;
2860 3261
2861 my ($empty, $slider) = @{ $self->{children} }; 3262 my ($empty, $slider) = $self->visible_children;
2862 3263
2863 local $self->{children} = [$empty, $slider]; 3264 local $self->{children} = [$empty, $slider];
2864 $self->SUPER::size_request 3265 $self->SUPER::size_request
2865} 3266}
2866 3267
… …
3030 $ROOT->on_post_alloc ($self => sub { 3431 $ROOT->on_post_alloc ($self => sub {
3031 $self->force_uptodate; 3432 $self->force_uptodate;
3032 3433
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3434 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034 3435
3035 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3436 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3036 glClearColor 0, 0, 0, 0; 3437 glClearColor 0, 0, 0, 0;
3037 glClear GL_COLOR_BUFFER_BIT; 3438 glClear GL_COLOR_BUFFER_BIT;
3038 3439
3039 package CFPlus::UI::Base; 3440 package DC::UI::Base;
3040 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3441 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3041 (0, 0, $self->{w}, $self->{h}); 3442 (0, 0, $self->{w}, $self->{h});
3042 3443
3043 my $top = int $self->{children}[1]{range}[0]; 3444 my $top = int $self->{children}[1]{range}[0];
3044 3445
… …
3055 3456
3056 if ($y0 < $y + $h && $y < $y1) { 3457 if ($y0 < $y + $h && $y < $y1) {
3057 my $layout = $self->get_layout ($para); 3458 my $layout = $self->get_layout ($para);
3058 3459
3059 $layout->render ($para->{indent}, $y - $y0); 3460 $layout->render ($para->{indent}, $y - $y0);
3461 $layout->draw;
3060 3462
3061 if (my @w = @{ $para->{widget} }) { 3463 if (my @w = @{ $para->{widget} }) {
3062 my @s = $layout->get_shapes; 3464 my @s = $layout->get_shapes;
3063 3465
3064 for (@w) { 3466 for (@w) {
… …
3102 $self->{children}[1]->draw; 3504 $self->{children}[1]->draw;
3103} 3505}
3104 3506
3105############################################################################# 3507#############################################################################
3106 3508
3107package CFPlus::UI::Animator; 3509package DC::UI::Animator;
3108 3510
3109use CFPlus::OpenGL; 3511use DC::OpenGL;
3110 3512
3111our @ISA = CFPlus::UI::Bin::; 3513our @ISA = DC::UI::Bin::;
3112 3514
3113sub moveto { 3515sub moveto {
3114 my ($self, $x, $y) = @_; 3516 my ($self, $x, $y) = @_;
3115 3517
3116 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3518 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3144 glPopMatrix; 3546 glPopMatrix;
3145} 3547}
3146 3548
3147############################################################################# 3549#############################################################################
3148 3550
3149package CFPlus::UI::Flopper; 3551package DC::UI::Flopper;
3150 3552
3151our @ISA = CFPlus::UI::Button::; 3553our @ISA = DC::UI::Button::;
3152 3554
3153sub new { 3555sub new {
3154 my $class = shift; 3556 my $class = shift;
3155 3557
3156 my $self = $class->SUPER::new ( 3558 my $self = $class->SUPER::new (
… …
3168 $self->{other}->toggle_visibility; 3570 $self->{other}->toggle_visibility;
3169} 3571}
3170 3572
3171############################################################################# 3573#############################################################################
3172 3574
3173package CFPlus::UI::Tooltip; 3575package DC::UI::Tooltip;
3174 3576
3175our @ISA = CFPlus::UI::Bin::; 3577our @ISA = DC::UI::Bin::;
3176 3578
3177use CFPlus::OpenGL; 3579use DC::OpenGL;
3178 3580
3179sub new { 3581sub new {
3180 my $class = shift; 3582 my $class = shift;
3181 3583
3182 $class->SUPER::new ( 3584 $class->SUPER::new (
… …
3186} 3588}
3187 3589
3188sub set_tooltip_from { 3590sub set_tooltip_from {
3189 my ($self, $widget) = @_; 3591 my ($self, $widget) = @_;
3190 3592
3191 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3192 if $widget->{tooltip} =~ /^#(.*)$/;
3193
3194 my $tooltip = $widget->{tooltip}; 3593 my $tip = $widget->{tooltip};
3594 $tip = $tip->($widget) if "CODE" eq ref $tip;
3595
3596 $tip = DC::Pod::section_label tooltip => $1
3597 if $tip =~ /^#(.*)$/;
3195 3598
3196 if ($ENV{CFPLUS_DEBUG} & 2) { 3599 if ($ENV{CFPLUS_DEBUG} & 2) {
3197 $tooltip .= "\n\n" . (ref $widget) . "\n" 3600 $tip .= "\n\n" . (ref $widget) . "\n"
3198 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3601 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3199 . "req $widget->{req_w} $widget->{req_h}\n" 3602 . "req $widget->{req_w} $widget->{req_h}\n"
3200 . "visible $widget->{visible}"; 3603 . "visible $widget->{visible}";
3201 } 3604 }
3202 3605
3203 $tooltip =~ s/^\n+//; 3606 $tip =~ s/^\n+//;
3204 $tooltip =~ s/\n+$//; 3607 $tip =~ s/\n+$//;
3205 3608
3206 $self->add (new CFPlus::UI::Label 3609 $self->add (new DC::UI::Label
3207 markup => $tooltip, 3610 markup => $tip,
3208 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3209 fontsize => 0.8, 3612 fontsize => 0.8,
3210 style => 1, # FLAG_INVERSE 3613 style => 1, # FLAG_INVERSE
3211 ellipsise => 0, 3614 ellipsise => 0,
3212 font => ($widget->{tooltip_font} || $::FONT_PROP), 3615 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3250} 3653}
3251 3654
3252sub _draw { 3655sub _draw {
3253 my ($self) = @_; 3656 my ($self) = @_;
3254 3657
3255 glTranslate 0.375, 0.375;
3256
3257 my ($w, $h) = @$self{qw(w h)}; 3658 my ($w, $h) = @$self{qw(w h)};
3258 3659
3259 glColor 1, 0.8, 0.4; 3660 glColor 1, 0.8, 0.4;
3260 glBegin GL_QUADS; 3661 glRect 0, 0, $w, $h;
3261 glVertex 0 , 0;
3262 glVertex 0 , $h;
3263 glVertex $w, $h;
3264 glVertex $w, 0;
3265 glEnd;
3266 3662
3267 glColor 0, 0, 0; 3663 glColor 0, 0, 0;
3268 glBegin GL_LINE_LOOP; 3664 glRect_lineloop .5, .5, $w + .5, $h + .5;
3269 glVertex 0 , 0;
3270 glVertex 0 , $h;
3271 glVertex $w, $h;
3272 glVertex $w, 0;
3273 glEnd;
3274 3665
3275 glTranslate 2 - 0.375, 2 - 0.375; 3666 glTranslate 2, 2;
3276 3667
3277 $self->SUPER::_draw; 3668 $self->SUPER::_draw;
3278} 3669}
3279 3670
3280############################################################################# 3671#############################################################################
3281 3672
3282package CFPlus::UI::Face; 3673package DC::UI::Face;
3283 3674
3284our @ISA = CFPlus::UI::DrawBG::; 3675our @ISA = DC::UI::DrawBG::;
3285 3676
3286use CFPlus::OpenGL; 3677use DC::OpenGL;
3287 3678
3288sub new { 3679sub new {
3289 my $class = shift; 3680 my $class = shift;
3290 3681
3291 my $self = $class->SUPER::new ( 3682 my $self = $class->SUPER::new (
3683 size_w => 32,
3684 size_h => 8,
3292 aspect => 1, 3685 aspect => 1,
3293 can_events => 0, 3686 can_events => 0,
3294 @_, 3687 @_,
3295 ); 3688 );
3296 3689
3297 if ($self->{anim} && $self->{animspeed}) { 3690 if ($self->{anim} && $self->{animspeed}) {
3298 CFPlus::weaken (my $widget = $self); 3691 DC::weaken (my $widget = $self);
3299 3692
3300 $self->{timer} = Event->timer ( 3693 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3694 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3302 hard => 1, 3695 return unless $::CONN;
3303 interval => $self->{animspeed}, 3696
3304 cb => sub { 3697 my $w = $widget
3698 or return;
3699
3305 ++$widget->{frame}; 3700 ++$w->{frame};
3701 $w->update_face;
3702
3703 # somehow, $widget can go away
3306 $widget->update; 3704 $w->update;
3307 }, 3705 $w->update_timer;
3308 ); 3706 };
3707
3708 $self->update_face;
3709 $self->update_timer;
3309 } 3710 }
3310 3711
3311 $self 3712 $self
3312} 3713}
3313 3714
3715sub update_timer {
3716 my ($self) = @_;
3717
3718 return unless $self->{timer};
3719
3720 if ($self->{visible}) {
3721 $self->{timer}->start;
3722 } else {
3723 $self->{timer}->stop;
3724 }
3725}
3726
3727sub update_face {
3728 my ($self) = @_;
3729
3730 if ($::CONN) {
3731 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3732 if ($anim && @$anim) {
3733 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3734 delete $self->{face_change_cb};
3735
3736 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3737 unless ($tex->{name} || $tex->{loading}) {
3738 $tex->upload (sub { $self->reconfigure });
3739 }
3740 }
3741 }
3742 }
3743 }
3744}
3745
3314sub size_request { 3746sub size_request {
3315 (32, 8) 3747 my ($self) = @_;
3748
3749 if ($::CONN) {
3750 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3751 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3752 if ($tex->{name}) {
3753 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3754 } elsif (!$tex->{loading}) {
3755 $tex->upload (sub { $self->reconfigure });
3756 }
3757 }
3758
3759 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3760 }
3761 }
3762
3763 ($self->{size_w} || 8, $self->{size_h} || 8)
3316} 3764}
3317 3765
3318sub update { 3766sub update {
3319 my ($self) = @_; 3767 my ($self) = @_;
3320 3768
3321 return unless $self->{visible}; 3769 return unless $self->{visible};
3322 3770
3323 $self->SUPER::update; 3771 $self->SUPER::update;
3324} 3772}
3325 3773
3774sub invoke_visibility_change {
3775 my ($self) = @_;
3776
3777 $self->update_timer;
3778
3779 0
3780}
3781
3326sub _draw { 3782sub _draw {
3327 my ($self) = @_; 3783 my ($self) = @_;
3328 3784
3329 return unless $::CONN;
3330
3331 $self->SUPER::_draw; 3785 $self->SUPER::_draw;
3332 3786
3333 my $face; 3787 if (my $tex = $self->{tex}) {
3334
3335 if ($self->{frame}) {
3336 my $anim = $::CONN->{anim}[$self->{anim}];
3337
3338 $face = $anim->[ $self->{frame} % @$anim ]
3339 if $anim && @$anim;
3340 }
3341
3342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3343
3344 if ($tex) {
3345 glEnable GL_TEXTURE_2D; 3788 glEnable GL_TEXTURE_2D;
3346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347 glColor 0, 0, 0, 1; 3790 glColor 0, 0, 0, 1;
3348 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3349 glDisable GL_TEXTURE_2D; 3792 glDisable GL_TEXTURE_2D;
… …
3351} 3794}
3352 3795
3353sub destroy { 3796sub destroy {
3354 my ($self) = @_; 3797 my ($self) = @_;
3355 3798
3356 $self->{timer}->cancel 3799 (delete $self->{timer})->cancel
3357 if $self->{timer}; 3800 if $self->{timer};
3358 3801
3359 $self->SUPER::destroy; 3802 $self->SUPER::destroy;
3360} 3803}
3361 3804
3362############################################################################# 3805#############################################################################
3363 3806
3364package CFPlus::UI::Buttonbar; 3807package DC::UI::Buttonbar;
3365 3808
3366our @ISA = CFPlus::UI::HBox::; 3809our @ISA = DC::UI::HBox::;
3367 3810
3368# TODO: should actually wrap buttons and other goodies. 3811# TODO: should actually wrap buttons and other goodies.
3369 3812
3370############################################################################# 3813#############################################################################
3371 3814
3372package CFPlus::UI::Menu; 3815package DC::UI::Menu;
3373 3816
3374our @ISA = CFPlus::UI::Toplevel::; 3817our @ISA = DC::UI::Toplevel::;
3375 3818
3376use CFPlus::OpenGL; 3819use DC::OpenGL;
3377 3820
3378sub new { 3821sub new {
3379 my $class = shift; 3822 my $class = shift;
3380 3823
3381 my $self = $class->SUPER::new ( 3824 my $self = $class->SUPER::new (
3382 items => [], 3825 items => [],
3383 z => 100, 3826 z => 100,
3384 @_, 3827 @_,
3385 ); 3828 );
3386 3829
3387 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3830 $self->add ($self->{vbox} = new DC::UI::VBox);
3388 3831
3389 for my $item (@{ $self->{items} }) { 3832 for my $item (@{ $self->{items} }) {
3390 my ($widget, $cb, $tooltip) = @$item; 3833 my ($widget, $cb, $tooltip) = @$item;
3391 3834
3392 # handle various types of items, only text for now 3835 # handle various types of items, only text for now
3393 if (!ref $widget) { 3836 if (!ref $widget) {
3394 if ($widget =~ /\t/) { 3837 if ($widget =~ /\t/) {
3395 my ($left, $right) = split /\t/, $widget, 2; 3838 my ($left, $right) = split /\t/, $widget, 2;
3396 3839
3397 $widget = new CFPlus::UI::HBox 3840 $widget = new DC::UI::HBox
3398 can_hover => 1, 3841 can_hover => 1,
3399 can_events => 1, 3842 can_events => 1,
3400 tooltip => $tooltip, 3843 tooltip => $tooltip,
3401 children => [ 3844 children => [
3402 (new CFPlus::UI::Label markup => $left, expand => 1), 3845 (new DC::UI::Label markup => $left, expand => 1),
3403 (new CFPlus::UI::Label markup => $right, align => +1), 3846 (new DC::UI::Label markup => $right, align => +1),
3404 ], 3847 ],
3405 ; 3848 ;
3406 3849
3407 } else { 3850 } else {
3408 $widget = new CFPlus::UI::Label 3851 $widget = new DC::UI::Label
3409 can_hover => 1, 3852 can_hover => 1,
3410 can_events => 1, 3853 can_events => 1,
3411 markup => $widget, 3854 markup => $widget,
3412 tooltip => $tooltip; 3855 tooltip => $tooltip;
3413 } 3856 }
… …
3461 1 3904 1
3462} 3905}
3463 3906
3464############################################################################# 3907#############################################################################
3465 3908
3466package CFPlus::UI::Multiplexer; 3909package DC::UI::Multiplexer;
3467 3910
3468our @ISA = CFPlus::UI::Container::; 3911our @ISA = DC::UI::Container::;
3469 3912
3470sub new { 3913sub new {
3471 my $class = shift; 3914 my $class = shift;
3472 3915
3473 my $self = $class->SUPER::new ( 3916 my $self = $class->SUPER::new (
… …
3534 $self->{current}->draw; 3977 $self->{current}->draw;
3535} 3978}
3536 3979
3537############################################################################# 3980#############################################################################
3538 3981
3539package CFPlus::UI::Notebook; 3982package DC::UI::Notebook;
3540 3983
3984use DC::OpenGL;
3985
3541our @ISA = CFPlus::UI::VBox::; 3986our @ISA = DC::UI::VBox::;
3542 3987
3543sub new { 3988sub new {
3544 my $class = shift; 3989 my $class = shift;
3545 3990
3546 my $self = $class->SUPER::new ( 3991 my $self = $class->SUPER::new (
3547 buttonbar => (new CFPlus::UI::Buttonbar), 3992 buttonbar => (new DC::UI::Buttonbar),
3548 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3993 multiplexer => (new DC::UI::Multiplexer expand => 1),
3994 active_outline => [.7, .7, 0.2],
3549 # filter => # will be put between multiplexer and $self 3995 # filter => # will be put between multiplexer and $self
3550 @_, 3996 @_,
3551 ); 3997 );
3552 3998
3553 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3999 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3554 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4000 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3555 4001
4002 {
4003 Scalar::Util::weaken (my $wself = $self);
4004
4005 $self->{multiplexer}->connect (c_add => sub {
4006 my ($mplex, $widgets) = @_;
4007
4008 for my $child (@$widgets) {
4009 Scalar::Util::weaken $child;
4010 $child->{c_tab_} ||= do {
4011 my $tab =
4012 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4013 ? $child->{c_tab}
4014 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4015
4016 $tab->connect (activate => sub {
4017 $wself->set_current_page ($child);
4018 });
4019
4020 $tab
4021 };
4022
4023 $self->{buttonbar}->add ($child->{c_tab_});
4024 }
4025 });
4026
4027 $self->{multiplexer}->connect (c_remove => sub {
4028 my ($mplex, $widgets) = @_;
4029
4030 for my $child (@$widgets) {
4031 $wself->{buttonbar}->remove ($child->{c_tab_});
4032 }
4033 });
4034 }
4035
3556 $self 4036 $self
3557} 4037}
3558 4038
3559sub add { 4039sub add {
4040 my ($self, @widgets) = @_;
4041
4042 $self->{multiplexer}->add (@widgets)
4043}
4044
4045sub remove {
4046 my ($self, @widgets) = @_;
4047
4048 $self->{multiplexer}->remove (@widgets)
4049}
4050
4051sub pages {
4052 my ($self) = @_;
4053 $self->{multiplexer}->children
4054}
4055
4056sub add_tab {
3560 my ($self, $title, $widget, $tooltip) = @_; 4057 my ($self, $title, $widget, $tooltip) = @_;
3561 4058
3562 CFPlus::weaken $self; 4059 $title = [$title, $tooltip] unless ref $title;
4060 $widget->{c_tab} = $title;
3563 4061
3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3565 markup => $title,
3566 tooltip => $tooltip,
3567 on_activate => sub { $self->set_current_page ($widget) },
3568 );
3569
3570 $self->{multiplexer}->add ($widget); 4062 $self->add ($widget);
3571} 4063}
3572 4064
3573sub get_current_page { 4065sub get_current_page {
3574 my ($self) = @_; 4066 my ($self) = @_;
3575 4067
… …
3581 4073
3582 $self->{multiplexer}->set_current_page ($page); 4074 $self->{multiplexer}->set_current_page ($page);
3583 $self->emit (page_changed => $self->{multiplexer}{current}); 4075 $self->emit (page_changed => $self->{multiplexer}{current});
3584} 4076}
3585 4077
4078sub _draw {
4079 my ($self) = @_;
4080
4081 $self->SUPER::_draw ();
4082
4083 if (my $cur = $self->{multiplexer}{current}) {
4084 if ($cur = $cur->{c_tab_}) {
4085 glTranslate $self->{buttonbar}{x} + $cur->{x},
4086 $self->{buttonbar}{y} + $cur->{y};
4087 glLineWidth 3;
4088 #glEnable GL_BLEND;
4089 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4090 glColor @{$self->{active_outline}};
4091 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4092 glLineWidth 1;
4093 #glDisable GL_BLEND;
4094 }
4095 }
4096}
4097
3586############################################################################# 4098#############################################################################
3587 4099
3588package CFPlus::UI::Selector; 4100package DC::UI::Selector;
3589 4101
3590use utf8; 4102use utf8;
3591 4103
3592our @ISA = CFPlus::UI::Button::; 4104our @ISA = DC::UI::Button::;
3593 4105
3594sub new { 4106sub new {
3595 my $class = shift; 4107 my $class = shift;
3596 4108
3597 my $self = $class->SUPER::new ( 4109 my $self = $class->SUPER::new (
… …
3614 my ($value, $title, $tooltip) = @$_; 4126 my ($value, $title, $tooltip) = @$_;
3615 4127
3616 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4128 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3617 } 4129 }
3618 4130
3619 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4131 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3620} 4132}
3621 4133
3622sub _set_value { 4134sub _set_value {
3623 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3624 4136
3625 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4137 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4138 $item ||= $self->{options}[0]
3626 or return; 4139 or return;
3627 4140
3628 $self->{value} = $item->[0]; 4141 $self->{value} = $item->[0];
3629 $self->set_markup ("$item->[1] ⇓"); 4142 $self->set_markup ("$item->[1] ⇓");
3630 $self->set_tooltip ($item->[2]); 4143# $self->set_tooltip ($item->[2]);
3631} 4144}
3632 4145
3633sub set_value { 4146sub set_value {
3634 my ($self, $value) = @_; 4147 my ($self, $value) = @_;
3635 4148
… …
3637 4150
3638 $self->_set_value ($value); 4151 $self->_set_value ($value);
3639 $self->emit (changed => $value); 4152 $self->emit (changed => $value);
3640} 4153}
3641 4154
4155sub set_options {
4156 my ($self, $options) = @_;
4157
4158 $self->{options} = $options;
4159 $self->_set_value ($self->{value});
4160}
4161
3642############################################################################# 4162#############################################################################
3643 4163
3644package CFPlus::UI::Statusbox; 4164package DC::UI::Statusbox;
3645 4165
3646our @ISA = CFPlus::UI::VBox::; 4166our @ISA = DC::UI::VBox::;
3647 4167
3648sub new { 4168sub new {
3649 my $class = shift; 4169 my $class = shift;
3650 4170
3651 my $self = $class->SUPER::new ( 4171 my $self = $class->SUPER::new (
3652 fontsize => 0.8, 4172 fontsize => 0.8,
3653 @_, 4173 @_,
3654 ); 4174 );
3655 4175
3656 CFPlus::weaken (my $this = $self); 4176 DC::weaken (my $this = $self);
3657 4177
3658 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4178 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3659 4179
3660 $self 4180 $self
3661} 4181}
3662 4182
3663sub reorder { 4183sub reorder {
3664 my ($self) = @_; 4184 my ($self) = @_;
3665 my $NOW = Time::HiRes::time; 4185 my $NOW = Time::HiRes::time;
3666 4186
3667 # freeze display when hovering over any label 4187 # freeze display when hovering over any label
3668 return if $CFPlus::UI::TOOLTIP->{owner} 4188 return if $DC::UI::TOOLTIP->{owner}
3669 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4189 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3670 values %{ $self->{item} }; 4190 values %{ $self->{item} };
3671 4191
3672 while (my ($k, $v) = each %{ $self->{item} }) { 4192 while (my ($k, $v) = each %{ $self->{item} }) {
3673 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3674 } 4194 }
4195
4196 $self->{timer}->set (1, 1);
3675 4197
3676 my @widgets; 4198 my @widgets;
3677 4199
3678 my @items = sort { 4200 my @items = sort {
3679 $a->{pri} <=> $b->{pri} 4201 $a->{pri} <=> $b->{pri}
3680 or $b->{id} <=> $a->{id} 4202 or $b->{id} <=> $a->{id}
3681 } values %{ $self->{item} }; 4203 } values %{ $self->{item} };
3682
3683 $self->{timer}->interval (1);
3684 4204
3685 my $count = 10 + 1; 4205 my $count = 10 + 1;
3686 for my $item (@items) { 4206 for my $item (@items) {
3687 last unless --$count; 4207 last unless --$count;
3688 4208
… …
3695 for ($short) { 4215 for ($short) {
3696 s/^\s+//; 4216 s/^\s+//;
3697 s/\s+/ /g; 4217 s/\s+/ /g;
3698 } 4218 }
3699 4219
3700 new CFPlus::UI::Label 4220 new DC::UI::Label
3701 markup => $short, 4221 markup => $short,
3702 tooltip => $item->{tooltip}, 4222 tooltip => $item->{tooltip},
3703 tooltip_font => $::FONT_PROP, 4223 tooltip_font => $::FONT_PROP,
3704 tooltip_width => 0.67, 4224 tooltip_width => 0.67,
3705 fontsize => $item->{fontsize} || $self->{fontsize}, 4225 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3712 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3713 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3714 $label->update; 4234 $label->update;
3715 $label->set_max_size (undef, $label->{req_h} * $diff) 4235 $label->set_max_size (undef, $label->{req_h} * $diff)
3716 if $diff < 1; 4236 if $diff < 1;
3717 $self->{timer}->interval (1/30); 4237 $self->{timer}->set (1/30, 1/30);
3718 } else { 4238 } else {
3719 $label->{fg}[3] = $item->{fg}[3] || 1; 4239 $label->{fg}[3] = $item->{fg}[3] || 1;
3720 } 4240 }
3721 4241
3722 push @widgets, $label; 4242 push @widgets, $label;
… …
3784 $self->SUPER::destroy; 4304 $self->SUPER::destroy;
3785} 4305}
3786 4306
3787############################################################################# 4307#############################################################################
3788 4308
3789package CFPlus::UI::Root; 4309package DC::UI::Root;
3790 4310
3791our @ISA = CFPlus::UI::Container::; 4311our @ISA = DC::UI::Container::;
3792 4312
3793use List::Util qw(min max); 4313use List::Util qw(min max);
3794 4314
3795use CFPlus::OpenGL; 4315use DC::OpenGL;
3796 4316
3797sub new { 4317sub new {
3798 my $class = shift; 4318 my $class = shift;
3799 4319
3800 my $self = $class->SUPER::new ( 4320 my $self = $class->SUPER::new (
3801 visible => 1, 4321 visible => 1,
3802 @_, 4322 @_,
3803 ); 4323 );
3804 4324
3805 CFPlus::weaken ($self->{root} = $self); 4325 DC::weaken ($self->{root} = $self);
3806 4326
3807 $self 4327 $self
3808} 4328}
3809 4329
3810sub size_request { 4330sub size_request {
… …
3858} 4378}
3859 4379
3860sub update { 4380sub update {
3861 my ($self) = @_; 4381 my ($self) = @_;
3862 4382
3863 $::WANT_REFRESH++; 4383 $::WANT_REFRESH = 1;
3864} 4384}
3865 4385
3866sub add { 4386sub add {
3867 my ($self, @children) = @_; 4387 my ($self, @children) = @_;
3868 4388
… …
3905 while ($self->{refresh_hook}) { 4425 while ($self->{refresh_hook}) {
3906 $_->() 4426 $_->()
3907 for values %{delete $self->{refresh_hook}}; 4427 for values %{delete $self->{refresh_hook}};
3908 } 4428 }
3909 4429
3910 if ($self->{realloc}) { 4430 while ($self->{realloc}) {
3911 my %queue; 4431 my %queue;
3912 my @queue; 4432 my @queue;
3913 my $widget; 4433 my $widget;
3914 4434
3915 outer: 4435 outer:
… …
3962 } 4482 }
3963 } 4483 }
3964 4484
3965 delete $self->{realloc}{$widget+0}; 4485 delete $self->{realloc}{$widget+0};
3966 } 4486 }
3967 }
3968 4487
3969 while (my $size_alloc = delete $self->{size_alloc}) { 4488 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} } 4489 my @queue = sort { $a->{visible} <=> $b->{visible} }
3971 values %$size_alloc; 4490 values %$size_alloc;
3972 4491
3973 while () { 4492 while () {
3974 my $widget = pop @queue || last; 4493 my $widget = pop @queue || last;
3975 4494
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4495 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 4496
3978 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0;
3980
3981 $w = max $widget->{min_w}, $w; 4497 $w = max $widget->{min_w}, $w;
3982 $h = max $widget->{min_h}, $h; 4498 $h = max $widget->{min_h}, $h;
3983 4499
3984# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4500# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4501# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986 4502
3987 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4503 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4504 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989 4505
3990 $w = int $w + 0.5; 4506 $w = int $w + 0.5;
3991 $h = int $h + 0.5; 4507 $h = int $h + 0.5;
3992 4508
3993 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4509 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3994 $widget->{old_w} = $widget->{w}; 4510 $widget->{old_w} = $widget->{w};
3995 $widget->{old_h} = $widget->{h}; 4511 $widget->{old_h} = $widget->{h};
3996 4512
3997 $widget->{w} = $w; 4513 $widget->{w} = $w;
3998 $widget->{h} = $h; 4514 $widget->{h} = $h;
3999 4515
4000 $widget->emit (size_allocate => $w, $h); 4516 $widget->emit (size_allocate => $w, $h);
4517 }
4001 } 4518 }
4002 } 4519 }
4003 } 4520 }
4004 4521
4005 while ($self->{post_alloc_hook}) { 4522 while ($self->{post_alloc_hook}) {
4006 $_->() 4523 $_->()
4007 for values %{delete $self->{post_alloc_hook}}; 4524 for values %{delete $self->{post_alloc_hook}};
4008 } 4525 }
4009
4010 4526
4011 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4527 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4528 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013 glClear GL_COLOR_BUFFER_BIT; 4529 glClear GL_COLOR_BUFFER_BIT;
4014 4530
… …
4017 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4533 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4018 glMatrixMode GL_MODELVIEW; 4534 glMatrixMode GL_MODELVIEW;
4019 glLoadIdentity; 4535 glLoadIdentity;
4020 4536
4021 { 4537 {
4022 package CFPlus::UI::Base; 4538 package DC::UI::Base;
4023 4539
4024 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4540 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4025 (0, 0, $self->{w}, $self->{h}); 4541 (0, 0, $self->{w}, $self->{h});
4026 4542
4027 $self->_draw; 4543 $self->_draw;
4028 } 4544 }
4029} 4545}
4030 4546
4031############################################################################# 4547#############################################################################
4032 4548
4033package CFPlus::UI; 4549package DC::UI;
4034 4550
4035$ROOT = new CFPlus::UI::Root; 4551$ROOT = new DC::UI::Root;
4036$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4552$TOOLTIP = new DC::UI::Tooltip z => 900;
4037 4553
40381 45541
4039 4555

Diff Legend

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