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.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 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};
… …
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
280 return if $self->{parent}; 281 return if $self->{parent};
281 282
282 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
283} 284}
284 285
285sub set_visible { 286sub set_visible {
286 my ($self) = @_; 287 my ($self) = @_;
287 288
… …
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
… …
337sub hide { 338sub hide {
338 my ($self) = @_; 339 my ($self) = @_;
339 340
340 $self->set_invisible; 341 $self->set_invisible;
341 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 346 $parent->remove ($self);
343 if $self->{parent}; 347 }
344} 348}
345 349
346sub move_abs { 350sub move_abs {
347 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
348 352
… …
360 $self->{force_h} = $h; 364 $self->{force_h} = $h;
361 365
362 $self->realloc; 366 $self->realloc;
363} 367}
364 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
365sub size_request { 387sub size_request {
366 require Carp; 388 require Carp;
367 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
368} 390}
369 391
… …
375 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
376 398
377 if ($self->{aspect}) { 399 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
379 401
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 404
383 # use alignment to adjust x, y 405 # use alignment to adjust x, y
384 406
385 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
… …
427 449
428 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
429 451
430 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
431 453
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 457 }
436} 458}
437 459
438# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
439sub coord2local { 461sub coord2local {
440 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
441 463
442 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
443 465
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 467}
446 468
447# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
448sub coord2global { 470sub coord2global {
449 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
450 472
451 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
452 474
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 476}
455 477
456sub invoke_focus_in { 478sub invoke_focus_in {
… …
505sub connect { 527sub connect {
506 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
507 529
508 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
509 531
510 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
513 } 535 }
514} 536}
515 537
… …
547 569
548 # parent 570 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 572}
551 573
552sub find_widget { 574#sub find_widget {
553 my ($self, $x, $y) = @_; 575# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 576
564sub set_parent { 577sub set_parent {
565 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
566 579
567 CFPlus::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
569} 582}
570 583
571sub realloc { 584sub realloc {
572 my ($self) = @_; 585 my ($self) = @_;
… …
598 611
599# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 613# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 615
603sub draw { 616#sub draw {
604 my ($self) = @_; 617#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 618
650sub _draw { 619sub _draw {
651 my ($self) = @_; 620 my ($self) = @_;
652 621
653 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
654} 623}
655 624
656my $cntx;#d#
657sub DESTROY { 625sub DESTROY {
658 my ($self) = @_; 626 my ($self) = @_;
659 627
660 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
661 629
630 local $@;
662 eval { $self->destroy }; 631 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 633
665 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
666} 635}
667 636
668############################################################################# 637#############################################################################
669 638
670package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
671 640
672our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
673 642
674use strict; 643use strict;
675use CFPlus::OpenGL; 644use DC::OpenGL;
676 645
677sub new { 646sub new {
678 my $class = shift; 647 my $class = shift;
679
680 # range [value, low, high, page]
681 648
682 $class->SUPER::new ( 649 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
685 @_ 652 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
698 665
699 glEnable GL_BLEND; 666 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 668 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 670 glDisable GL_BLEND;
711 } 671 }
712} 672}
713 673
714############################################################################# 674#############################################################################
715 675
716package CFPlus::UI::Empty; 676package DC::UI::Empty;
717 677
718our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
719 679
720sub new { 680sub new {
721 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
723} 683}
… …
730 690
731sub draw { } 691sub draw { }
732 692
733############################################################################# 693#############################################################################
734 694
735package CFPlus::UI::Container; 695package DC::UI::Container;
736 696
737our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
738 698
739sub new { 699sub new {
740 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
741 701
742 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
746 can_events => 0, 706 can_events => 0,
747 %arg, 707 %arg,
748 ); 708 );
749 709
750 $self->add (@$children) 710 $self->add (@$children)
751 if $children; 711 if $children && @$children;
752 712
753 $self 713 $self
754} 714}
755 715
756sub realloc { 716sub realloc {
… …
765 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
766 726
767 $_->set_parent ($self) 727 $_->set_parent ($self)
768 for @widgets; 728 for @widgets;
769 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 731 use sort 'stable';
771 732
772 $self->{children} = [ 733 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
775 ]; 736 ];
776 737
777 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
778} 743}
779 744
780sub children { 745sub children {
781 @{ $_[0]{children} } 746 @{ $_[0]{children} }
782} 747}
783 748
784sub remove { 749sub remove {
785 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
786 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
787 delete $child->{parent}; 755 delete $child->{parent};
788 $child->hide; 756 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
791 759
792 $self->realloc; 760 $self->realloc;
793} 761}
794 762
795sub clear { 763sub clear {
796 my ($self) = @_; 764 my ($self) = @_;
797 765
798 my $children = delete $self->{children}; 766 my $children = $self->{children};
799 $self->{children} = []; 767 $self->{children} = [];
800 768
801 for (@$children) { 769 for (@$children) {
802 delete $_->{parent}; 770 delete $_->{parent};
803 $_->hide; 771 $_->hide;
… …
823} 791}
824 792
825sub _draw { 793sub _draw {
826 my ($self) = @_; 794 my ($self) = @_;
827 795
828 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
829} 797}
830 798
831############################################################################# 799#############################################################################
832 800
833package CFPlus::UI::Bin; 801package DC::UI::Bin;
834 802
835our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
836 804
837sub new { 805sub new {
838 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
839 807
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 809
842 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
843} 811}
844 812
845sub add { 813sub add {
846 my ($self, $child) = @_; 814 my ($self, $child) = @_;
847 815
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
849 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
850} 818}
851 819
852sub remove { 820sub remove {
853 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
854 822
855 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
856 824
857 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 826 unless @{$self->{children}};
859} 827}
860 828
861sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
862 830
… …
871 839
872 1 840 1
873} 841}
874 842
875############################################################################# 843#############################################################################
876
877# back-buffered drawing area 844# back-buffered drawing area
878 845
879package CFPlus::UI::Window; 846package DC::UI::Window;
880 847
881our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
882 849
883use CFPlus::OpenGL; 850use DC::OpenGL;
884 851
885sub new { 852sub new {
886 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
887 854
888 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
910} 877}
911 878
912sub render_child { 879sub render_child {
913 my ($self) = @_; 880 my ($self) = @_;
914 881
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
918 885
919 { 886 {
920 package CFPlus::UI::Base; 887 package DC::UI::Base;
921 888
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
924 891
925 $self->_render; 892 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
943} 910}
944 911
945############################################################################# 912#############################################################################
946 913
947package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
948 915
916use List::Util qw(min max);
917
949our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
950 919
951sub new { 920sub new {
952 my $class = shift; 921 my $class = shift;
953 922
954 $class->SUPER::new ( 923 $class->SUPER::new (
… …
961sub size_request { 930sub size_request {
962 my ($self) = @_; 931 my ($self) = @_;
963 932
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 934
966 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
968 937
969 ($w, $h) 938 ($w, $h)
970} 939}
971 940
972sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
984} 953}
985 954
986sub set_offset { 955sub set_offset {
987 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
988 957
958 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
959 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
960
961 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
991 964
965 $self->emit (changed => $x, $y);
992 $self->update; 966 $self->update;
967 }
968}
969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
993} 986}
994 987
995# hmm, this does not work for topleft of $self... but we should not ask for that 988# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 989sub coord2local {
997 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1013 1006
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1009 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 1011 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1020 } 1013 }
1021} 1014}
1022 1015
1023sub _render { 1016sub _render {
1024 my ($self) = @_; 1017 my ($self) = @_;
1025 1018
1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1019 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1028 1021
1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1030 1023
1031 $self->SUPER::_render; 1024 $self->SUPER::_render;
1032} 1025}
1033 1026
1034############################################################################# 1027#############################################################################
1035 1028
1036package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1037 1030
1038our @ISA = CFPlus::UI::Table::; 1031our @ISA = DC::UI::Table::;
1039 1032
1040sub new { 1033sub new {
1041 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1042 1035
1043 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1044 1037
1045 my $self; 1038 my $self;
1046 1039
1047 my $hslider = new CFPlus::UI::Slider 1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1048 vertical => 0, 1043 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1045 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1046 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1048 },
1054 ; 1049 ;
1055 1050
1056 my $vslider = new CFPlus::UI::Slider 1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
1057 vertical => 1, 1054 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1056 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1057 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1059 },
1063 ; 1060 ;
1064 1061
1065 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1067 can_events => 1, 1065 can_events => 1,
1068 hslider => $hslider, 1066 hslider => $hslider,
1069 vslider => $vslider, 1067 vslider => $vslider,
1070 col_expand => [1, 0], 1068 col_expand => [1, 0],
1071 row_expand => [1, 0], 1069 row_expand => [1, 0],
1072 %arg, 1070 %arg,
1073 ); 1071 );
1074 1072
1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1092 ;
1093
1075 $self->SUPER::add (0, 0, $self->{vp}); 1094 $self->SUPER::add ($self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1095
1079 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1080 1097
1081 $self 1098 $self
1082} 1099}
1083
1084#TODO# update range on size_allocate depending on child
1085 1100
1086sub add { 1101sub add {
1087 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1088 1103
1089 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1090} 1105}
1091 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1111sub update_slider {
1112 my ($self) = @_;
1113
1114 my $child = ($self->{vp} or return)->child;
1115
1116 if ($self->{scroll_x}) {
1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1119
1120 my $visible = $w1 > $w2;
1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1126 }
1127
1128 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1092sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1094 1161
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev); 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1098 1164
1099 1 1165 1
1100} 1166}
1101 1167
1102sub update_slider { 1168sub invoke_button_down {
1103 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1104 1170
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w}); 1171 if ($ev->{button} == 2) {
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1172 $self->start_dragging ($ev);
1107 #$self->{hslider}->set_visibility ($w1 != $w2); 1173 return 1;
1174 }
1108 1175
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h}); 1176 0
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1112} 1177}
1113 1178
1114sub update { 1179sub invoke_button_up {
1115 my ($self) = @_; 1180 my ($self, $ev, $x, $y) = @_;
1116 1181
1117 $self->SUPER::update; 1182 if (delete $self->{motion}) {
1118 $self->update_slider; 1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1119} 1198}
1120 1199
1121sub invoke_size_allocate { 1200sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1123 1202
… …
1125 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1126} 1205}
1127 1206
1128############################################################################# 1207#############################################################################
1129 1208
1130package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1131 1210
1132our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1133 1212
1134use CFPlus::OpenGL; 1213use DC::OpenGL;
1135 1214
1136sub new { 1215sub new {
1137 my $class = shift; 1216 my $class = shift;
1138 1217
1139 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1149 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1150 1229
1151 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1152 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1153 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1154
1155 glBegin GL_QUADS;
1156 glVertex 0 , 0;
1157 glVertex 0 , $h;
1158 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1159 glVertex $w, 0;
1160 glEnd;
1161
1162 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1163 } 1235 }
1164 1236
1165 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1166} 1238}
1167 1239
1168############################################################################# 1240#############################################################################
1169 1241
1170package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1171 1243
1172our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1173 1245
1174use CFPlus::OpenGL; 1246use DC::OpenGL;
1175 1247
1176sub new { 1248sub new {
1177 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1178 1250
1179 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1180 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1181 align => 1, 1253 align => 1,
1182 valign => 0, 1254 valign => 0.5,
1183 text => $arg{label}, 1255 text => $arg{label},
1184 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1185 } 1257 }
1186 1258
1187 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
… …
1197 1269
1198sub add { 1270sub add {
1199 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1200 1272
1201 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1202 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1203} 1275}
1204 1276
1205sub border { 1277sub border {
1206 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1207} 1279}
… …
1265 } 1337 }
1266} 1338}
1267 1339
1268############################################################################# 1340#############################################################################
1269 1341
1270package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1271 1343
1272our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1273 1345
1274use CFPlus::OpenGL; 1346use DC::OpenGL;
1275 1347
1276my $bg = 1348my $bg =
1277 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1278 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1279 1351
1280my @border = 1352my @border =
1281 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1282 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355
1356my @icon =
1357 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1283 1359
1284sub new { 1360sub new {
1285 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1286 1362
1287 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
… …
1292 min_w => 64, 1368 min_w => 64,
1293 min_h => 32, 1369 min_h => 32,
1294 %arg, 1370 %arg,
1295 ); 1371 );
1296 1372
1297 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1298 align => 0, 1374 align => 0.5,
1299 valign => 1, 1375 valign => 1,
1300 text => $self->{title}, 1376 text => $self->{title},
1301 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1302 if exists $self->{title}; 1378 if exists $self->{title};
1303 1379
1304 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1305 $self->{close_button} = 1381 $self->{close_button} =
1306 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1307 path => 'x1_close.png', 1383 path => 'x1_close.png',
1308 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1309 1385
1310 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1311 } 1387 }
1312 1388
1313 $self 1389 $self
1314} 1390}
1315 1391
1316sub add { 1392sub add {
1317 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1318 1394
1319 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1320 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1321 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1322} 1398}
1323 1399
1324sub border { 1400sub border {
1325 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1326} 1411}
1327 1412
1328sub size_request { 1413sub size_request {
1329 my ($self) = @_; 1414 my ($self) = @_;
1330 1415
… …
1456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1457 1542
1458 my $border = $self->border; 1543 my $border = $self->border;
1459 1544
1460 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1461 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1462 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1463 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1464 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550
1551 # move
1552 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557
1558 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1465 1564
1466 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1467 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1468 1567
1469 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1488 if $self->{close_button}; 1587 if $self->{close_button};
1489} 1588}
1490 1589
1491############################################################################# 1590#############################################################################
1492 1591
1493package CFPlus::UI::Table; 1592package DC::UI::Table;
1494 1593
1495our @ISA = CFPlus::UI::Base::; 1594our @ISA = DC::UI::Container::;
1496 1595
1497use List::Util qw(max sum); 1596use List::Util qw(max sum);
1498 1597
1499use CFPlus::OpenGL; 1598use DC::OpenGL;
1500 1599
1501sub new { 1600sub new {
1502 my $class = shift; 1601 my $class = shift;
1503 1602
1504 $class->SUPER::new ( 1603 $class->SUPER::new (
… …
1506 row_expand => [], 1605 row_expand => [],
1507 @_, 1606 @_,
1508 ) 1607 )
1509} 1608}
1510 1609
1511sub children {
1512 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1513}
1514
1515sub add { 1610sub add {
1611 my ($self, @widgets) = @_;
1612
1613 for my $child (@widgets) {
1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1617
1618 $self->SUPER::add (@widgets);
1619}
1620
1621sub add_at {
1516 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1517 1625
1518 while (@_) { 1626 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1520 $child->set_parent ($self);
1521 $self->{children}[$y][$x] = $child;
1522 }
1523 1628
1524 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1525 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1526 $self->realloc;
1527}
1528 1631
1529sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1530 my ($self, $child) = @_; 1639 my ($self) = @_;
1531 1640
1532 # TODO: not yet implemented 1641 my (@w, @h);
1533}
1534
1535# TODO: move to container class maybe? send children a signal on removal?
1536sub clear {
1537 my ($self) = @_;
1538 1642
1539 my @children = $self->children; 1643 my @children = $self->children;
1540 delete $self->{children}; 1644
1645 # first pass, columns
1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1648
1649 my $sw = sum @w[$c .. $c + $cs - 1];
1650
1651 if ($w > $sw) {
1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1653 }
1541 1654 }
1542 for (@children) {
1543 delete $_->{parent};
1544 $_->hide;
1545 }
1546 1655
1547 $self->realloc; 1656 # second pass, rows
1548} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1549
1550sub get_wh {
1551 my ($self) = @_;
1552
1553 my (@w, @h);
1554
1555 for my $y (0 .. $#{$self->{children}}) {
1556 my $row = $self->{children}[$y]
1557 or next;
1558
1559 for my $x (0 .. $#$row) {
1560 my $widget = $row->[$x]
1561 or next;
1562 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1563 1659
1564 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1565 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1566 } 1664 }
1567 } 1665 }
1568 1666
1569 (\@w, \@h) 1667 (\@w, \@h)
1570} 1668}
… …
1586 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1587 1685
1588 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1589 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1590 1688
1591 # TODO: nicer code 1689 # now linearly scale the rows/columns to the allocated size
1592 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1593 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1594 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1595 1693
1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1597 1695
1598 CFPlus::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1599 1697
1600 my @row_expand = @{$self->{row_expand}}; 1698 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand; 1699 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1; 1700 my $row_expand = (sum @row_expand) || 1;
1603 1701
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605 1703
1606 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1607 1705
1608 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1609 1708
1610 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1611 my $row = $self->{children}[$r] 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1612 or next;
1613 1711
1614 my $x = 0; 1712 $widget->configure (
1615 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1616 1715 );
1617 for my $c (0 .. $#$row) { 1716 }
1618 my $col_w = $ws->[$c];
1619 1717
1620 if (my $widget = $row->[$c]) { 1718 1
1621 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1622 }
1623 1720
1624 $x += $col_w; 1721#############################################################################
1722
1723package DC::UI::Fixed;
1724
1725use List::Util qw(min max);
1726
1727our @ISA = DC::UI::Container::;
1728
1729sub _scale($$$) {
1730 my ($rel, $val, $max) = @_;
1731
1732 $rel ? $val * $max : $val
1733}
1734
1735sub size_request {
1736 my ($self) = @_;
1737
1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1739
1740 # determine overall size by querying abs widgets
1741 for my $child ($self->visible_children) {
1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1745
1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1625 } 1748 }
1749 }
1626 1750
1627 $y += $row_h; 1751 my $W = $x2 - $x1;
1752 my $H = $y2 - $y1;
1753
1754 # now layout remaining widgets
1755 for my $child ($self->visible_children) {
1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 ($W, $H)
1769}
1770
1771sub invoke_size_allocate {
1772 my ($self, $W, $H) = @_;
1773
1774 for my $child ($self->visible_children) {
1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1777
1778 $x += $child->{c_halign} * $child->{req_w};
1779 $y += $child->{c_valign} * $child->{req_h};
1780
1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1628 } 1782 }
1629 1783
1630 1 1784 1
1631} 1785}
1632 1786
1633sub find_widget {
1634 my ($self, $x, $y) = @_;
1635
1636 $x -= $self->{x};
1637 $y -= $self->{y};
1638
1639 my $res;
1640
1641 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1642 $res = $_->find_widget ($x, $y)
1643 and return $res;
1644 }
1645
1646 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1647}
1648
1649sub _draw {
1650 my ($self) = @_;
1651
1652 for (grep $_, @{$self->{children}}) {
1653 $_->draw for grep $_, @$_;
1654 }
1655}
1656
1657############################################################################# 1787#############################################################################
1658 1788
1659package CFPlus::UI::Box; 1789package DC::UI::Box;
1660 1790
1661our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1662 1792
1663sub size_request { 1793sub size_request {
1664 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1665 1797
1666 $self->{vertical} 1798 $self->{vertical}
1667 ? ( 1799 ? (
1668 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1669 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1670 ) 1802 )
1671 : ( 1803 : (
1672 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1673 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1674 ) 1806 )
1675} 1807}
1676 1808
1677sub invoke_size_allocate { 1809sub invoke_size_allocate {
1678 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1699 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1700 for 0 .. $#children; 1832 for 0 .. $#children;
1701 } 1833 }
1702 } 1834 }
1703 1835
1704 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1705 1837
1706 my $pos = 0; 1838 my $pos = 0;
1707 for (0 .. $#children) { 1839 for (0 .. $#children) {
1708 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1709 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1714 1 1846 1
1715} 1847}
1716 1848
1717############################################################################# 1849#############################################################################
1718 1850
1719package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1720 1852
1721our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1722 1854
1723sub new { 1855sub new {
1724 my $class = shift; 1856 my $class = shift;
1725 1857
1726 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1729 ) 1861 )
1730} 1862}
1731 1863
1732############################################################################# 1864#############################################################################
1733 1865
1734package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1735 1867
1736our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1737 1869
1738sub new { 1870sub new {
1739 my $class = shift; 1871 my $class = shift;
1740 1872
1741 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1744 ) 1876 )
1745} 1877}
1746 1878
1747############################################################################# 1879#############################################################################
1748 1880
1749package CFPlus::UI::Label; 1881package DC::UI::Label;
1750 1882
1751our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1752 1884
1753use CFPlus::OpenGL; 1885use DC::OpenGL;
1754 1886
1755sub new { 1887sub new {
1756 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1757 1889
1758 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1763 #text => initial text 1895 #text => initial text
1764 #markup => initial narkup 1896 #markup => initial narkup
1765 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1766 #style => 0, # render flags 1898 #style => 0, # render flags
1767 ellipsise => 3, # end 1899 ellipsise => 3, # end
1768 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1769 fontsize => 1, 1901 fontsize => 1,
1770 align => -1, 1902 align => 0.5,
1771 valign => -1, 1903 valign => 0.5,
1772 padding_x => 2, 1904 padding_x => 4,
1773 padding_y => 2, 1905 padding_y => 2,
1774 can_events => 0, 1906 can_events => 0,
1775 %arg 1907 %arg
1776 ); 1908 );
1777 1909
1778 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1779 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1780 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1781 $self->{template} = $layout; 1913 $self->{template} = $layout;
1782 } 1914 }
1783 1915
1784 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1802 1934
1803 delete $self->{ox}; 1935 delete $self->{ox};
1804 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1805} 1937}
1806 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1807sub set_text { 1945sub set_text {
1808 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1809 1947
1810 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1811 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
… …
1834 1972
1835sub size_request { 1973sub size_request {
1836 my ($self) = @_; 1974 my ($self) = @_;
1837 1975
1838 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1839 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1840 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1841 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1842 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1843 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1844 1984
1845 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1846 1986
1847 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1848 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1849 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1850 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1851 1991
1852 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1853 1993
1854 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1910 2050
1911 [$self->{layout}->size] 2051 [$self->{layout}->size]
1912 }; 2052 };
1913 2053
1914 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1915 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1916 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1917 : ($self->{w} - $size->[0]) * 0.5);
1918 2057
1919 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1920 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1921 : ($self->{h} - $size->[1]) * 0.5);
1922 }; 2059 };
1923 2060
1924 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
1925 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
1926 2063# DC::OpenGL::glNewList $self->{list};
1927 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
2069
2070 $self->{layout}->draw;
1928} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
1929 2080
1930############################################################################# 2081#############################################################################
1931 2082
1932package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
1933 2084
1934our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
1935 2086
1936use CFPlus::OpenGL; 2087use DC::OpenGL;
1937 2088
1938sub new { 2089sub new {
1939 my $class = shift; 2090 my $class = shift;
1940 2091
1941 $class->SUPER::new ( 2092 $class->SUPER::new (
1942 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1943 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1944 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1945 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1946 can_hover => 1, 2099 can_hover => 1,
1947 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1948 valign => 0, 2102 valign => 0.5,
1949 can_events => 1, 2103 can_events => 1,
1950 ellipsise => 0, 2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1951 #text => ... 2107 #text => ...
1952 #hidden => "*", 2108 #hidden => "*",
1953 @_ 2109 @_
1954 ) 2110 )
1955} 2111}
… …
2006 2162
2007 if ($uni == 8) { 2163 if ($uni == 8) {
2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2009 } elsif ($uni == 127) { 2165 } elsif ($uni == 127) {
2010 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
2011 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
2012 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
2013 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
2014 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2015 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2016 # what a hack 2172 # what a hack
2017 $self->{cursor} = 2173 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1 2175 ? length $1
2020 : 0; 2176 : 0;
2021 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
2022 # uh, again 2178 # uh, again
2023 $self->{cursor} = 2179 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2025 ? $self->{cursor} + length $1 2181 ? $self->{cursor} + length $1
2026 : length $self->{text}; 2182 : length $self->{text};
… …
2090 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2091 } 2247 }
2092 2248
2093 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2094 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2095 glBegin GL_QUADS;
2096 glVertex 0 , 0;
2097 glVertex 0 , $self->{h};
2098 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2099 glVertex $self->{w}, 0;
2100 glEnd;
2101 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2102 2253
2103 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2104 2255
2105 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
2107 2258
2108 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2109 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2110 utf8::encode $text; 2261 utf8::encode $text;
2111 2262
2112 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2113 } 2264 }
2114 2265
2266 glColor_premultiply @{$self->{active_fg}};
2115 glBegin GL_LINES; 2267 glBegin GL_LINES;
2116 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2118 glEnd; 2270 glEnd;
2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2119 } 2285 }
2120} 2286}
2121 2287
2122############################################################################# 2288#############################################################################
2123 2289
2124package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2125 2291
2126our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2127 2293
2128use CFPlus::OpenGL; 2294use DC::OpenGL;
2129 2295
2130sub invoke_key_down { 2296sub invoke_key_down {
2131 my ($self, $ev) = @_; 2297 my ($self, $ev) = @_;
2132 2298
2133 my $sym = $ev->{sym}; 2299 my $sym = $ev->{sym};
… …
2139 $self->{history_pointer} = -1; 2305 $self->{history_pointer} = -1;
2140 $self->{history_saveback} = ''; 2306 $self->{history_saveback} = '';
2141 $self->emit (activate => $txt); 2307 $self->emit (activate => $txt);
2142 $self->update; 2308 $self->update;
2143 2309
2144 } elsif ($sym == CFPlus::SDLK_UP) { 2310 } elsif ($sym == DC::SDLK_UP) {
2145 if ($self->{history_pointer} < 0) { 2311 if ($self->{history_pointer} < 0) {
2146 $self->{history_saveback} = $self->get_text; 2312 $self->{history_saveback} = $self->get_text;
2147 } 2313 }
2148 if (@{$self->{history} || []} > 0) { 2314 if (@{$self->{history} || []} > 0) {
2149 $self->{history_pointer}++; 2315 $self->{history_pointer}++;
… …
2151 $self->{history_pointer} = @{$self->{history} || []} - 1; 2317 $self->{history_pointer} = @{$self->{history} || []} - 1;
2152 } 2318 }
2153 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2154 } 2320 }
2155 2321
2156 } elsif ($sym == CFPlus::SDLK_DOWN) { 2322 } elsif ($sym == DC::SDLK_DOWN) {
2157 $self->{history_pointer}--; 2323 $self->{history_pointer}--;
2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2159 2325
2160 if ($self->{history_pointer} >= 0) { 2326 if ($self->{history_pointer} >= 0) {
2161 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2327 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2170 1 2336 1
2171} 2337}
2172 2338
2173############################################################################# 2339#############################################################################
2174 2340
2175package CFPlus::UI::TextEdit; 2341package DC::UI::TextEdit;
2176 2342
2177our @ISA = CFPlus::UI::EntryBase::; 2343our @ISA = DC::UI::EntryBase::;
2178 2344
2179use CFPlus::OpenGL; 2345use DC::OpenGL;
2346
2347sub new {
2348 my $class = shift;
2349
2350 $class->SUPER::new (
2351 padding_y => 4,
2352
2353 @_
2354 )
2355}
2180 2356
2181sub move_cursor_ver { 2357sub move_cursor_ver {
2182 my ($self, $dy) = @_; 2358 my ($self, $dy) = @_;
2183 2359
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2360 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185 2361
2186 $y += $dy; 2362 $line += $dy;
2187 2363
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2364 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2189 $self->{cursor} = $index; 2365 $self->{cursor} = $index;
2190 delete $self->{cur_h}; 2366 delete $self->{cur_h};
2191 $self->update; 2367 $self->update;
2192 return; 2368 return;
2193 } 2369 }
… …
2196sub invoke_key_down { 2372sub invoke_key_down {
2197 my ($self, $ev) = @_; 2373 my ($self, $ev) = @_;
2198 2374
2199 my $sym = $ev->{sym}; 2375 my $sym = $ev->{sym};
2200 2376
2201 if ($sym == CFPlus::SDLK_UP) { 2377 if ($sym == DC::SDLK_UP) {
2202 $self->move_cursor_ver (-1); 2378 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) { 2379 } elsif ($sym == DC::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1); 2380 $self->move_cursor_ver (+1);
2205 } else { 2381 } else {
2206 return $self->SUPER::invoke_key_down ($ev) 2382 return $self->SUPER::invoke_key_down ($ev)
2207 } 2383 }
2208 2384
2209 1 2385 1
2210} 2386}
2211 2387
2212############################################################################# 2388#############################################################################
2213 2389
2214package CFPlus::UI::Button; 2390package DC::UI::ButtonBin;
2215 2391
2216our @ISA = CFPlus::UI::Label::; 2392our @ISA = DC::UI::Bin::;
2217 2393
2218use CFPlus::OpenGL; 2394use DC::OpenGL;
2219 2395
2220my @tex = 2396my @tex =
2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2397 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2222 qw(b1_button_active.png); 2398 qw(b1_button_inactive.png b1_button_active.png);
2223 2399
2224sub new { 2400sub new {
2225 my $class = shift; 2401 my $class = shift;
2226 2402
2227 $class->SUPER::new ( 2403 $class->SUPER::new (
2228 padding_x => 4,
2229 padding_y => 4,
2230 fg => [1, 1, 1],
2231 active_fg => [0, 0, 1],
2232 can_hover => 1, 2404 can_hover => 1,
2233 align => 0, 2405 align => 0.5,
2234 valign => 0, 2406 valign => 0.5,
2235 can_events => 1, 2407 can_events => 1,
2236 @_ 2408 @_
2237 ) 2409 )
2238} 2410}
2239 2411
… …
2248} 2420}
2249 2421
2250sub _draw { 2422sub _draw {
2251 my ($self) = @_; 2423 my ($self) = @_;
2252 2424
2253 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2254
2255 glEnable GL_TEXTURE_2D; 2425 glEnable GL_TEXTURE_2D;
2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2426 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2257 glColor 0, 0, 0, 1; 2427 glColor 0, 0, 0, 1;
2258 2428
2429 my $tex = $tex[$GRAB == $self];
2259 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2430 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2260 2431
2261 glDisable GL_TEXTURE_2D; 2432 glDisable GL_TEXTURE_2D;
2262 2433
2263 $self->SUPER::_draw; 2434 $self->SUPER::_draw;
2264} 2435}
2265 2436
2266############################################################################# 2437#############################################################################
2267 2438
2268package CFPlus::UI::CheckBox; 2439package DC::UI::Button;
2269 2440
2270our @ISA = CFPlus::UI::DrawBG::; 2441our @ISA = DC::UI::Label::;
2442
2443use DC::OpenGL;
2271 2444
2272my @tex = 2445my @tex =
2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2446 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2447 qw(b1_button_inactive.png b1_button_active.png);
2448
2449sub new {
2450 my $class = shift;
2451
2452 $class->SUPER::new (
2453 padding_x => 8,
2454 padding_y => 4,
2455 fg => [1.0, 1.0, 1.0],
2456 active_fg => [0.8, 0.8, 0.8],
2457 can_hover => 1,
2458 align => 0.5,
2459 valign => 0.5,
2460 can_events => 1,
2461 @_
2462 )
2463}
2464
2465sub invoke_button_up {
2466 my ($self, $ev, $x, $y) = @_;
2467
2468 $self->emit ("activate")
2469 if $x >= 0 && $x < $self->{w}
2470 && $y >= 0 && $y < $self->{h};
2471
2472 1
2473}
2474
2475sub _draw {
2476 my ($self) = @_;
2477
2478 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2479
2480 glEnable GL_TEXTURE_2D;
2481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2482 glColor 0, 0, 0, 1;
2483
2484 my $tex = $tex[$GRAB == $self];
2485 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2486
2487 glDisable GL_TEXTURE_2D;
2488
2489 $self->SUPER::_draw;
2490}
2491
2492#############################################################################
2493
2494package DC::UI::CheckBox;
2495
2496our @ISA = DC::UI::DrawBG::;
2497
2498my @tex =
2499 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2274 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2500 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2275 2501
2276use CFPlus::OpenGL; 2502use DC::OpenGL;
2277 2503
2278sub new { 2504sub new {
2279 my $class = shift; 2505 my $class = shift;
2280 2506
2281 $class->SUPER::new ( 2507 $class->SUPER::new (
… …
2321sub _draw { 2547sub _draw {
2322 my ($self) = @_; 2548 my ($self) = @_;
2323 2549
2324 $self->SUPER::_draw; 2550 $self->SUPER::_draw;
2325 2551
2326 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2552 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2327 2553
2328 my ($w, $h) = @$self{qw(w h)}; 2554 my ($w, $h) = @$self{qw(w h)};
2329 2555
2330 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2556 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2331 2557
… …
2338 glDisable GL_TEXTURE_2D; 2564 glDisable GL_TEXTURE_2D;
2339} 2565}
2340 2566
2341############################################################################# 2567#############################################################################
2342 2568
2343package CFPlus::UI::Image; 2569package DC::UI::Image;
2344 2570
2345our @ISA = CFPlus::UI::Base::; 2571our @ISA = DC::UI::Base::;
2346 2572
2347use CFPlus::OpenGL; 2573use DC::OpenGL;
2348 2574
2349our %texture_cache; 2575our %texture_cache;
2350 2576
2351sub new { 2577sub new {
2352 my $class = shift; 2578 my $class = shift;
2353 2579
2354 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2355 can_events => 0, 2581 can_events => 0,
2582 scale => 1,
2356 @_, 2583 @_,
2357 ); 2584 );
2358 2585
2359 $self->{path} || $self->{tex} 2586 $self->{path} || $self->{tex}
2360 or Carp::croak "'path' or 'tex' attributes required"; 2587 or Carp::croak "'path' or 'tex' attributes required";
2361 2588
2362 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2589 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2590 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2364 2591
2365 CFPlus::weaken $texture_cache{$self->{path}}; 2592 DC::weaken $texture_cache{$self->{path}};
2366 2593
2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2594 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2368 2595
2369 $self 2596 $self
2370} 2597}
2371 2598
2372sub STORABLE_freeze { 2599sub STORABLE_freeze {
2373 my ($self, $cloning) = @_; 2600 my ($self, $cloning) = @_;
2374 2601
2375 $self->{path} 2602 $self->{path}
2376 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2603 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2377 2604
2378 $self->{path} 2605 $self->{path}
2379} 2606}
2380 2607
2381sub STORABLE_attach { 2608sub STORABLE_attach {
… …
2385} 2612}
2386 2613
2387sub size_request { 2614sub size_request {
2388 my ($self) = @_; 2615 my ($self) = @_;
2389 2616
2390 ($self->{tex}{w}, $self->{tex}{h}) 2617 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2391} 2618}
2392 2619
2393sub _draw { 2620sub _draw {
2394 my ($self) = @_; 2621 my ($self) = @_;
2395 2622
… …
2405 } 2632 }
2406 2633
2407 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409 2636
2410 $tex->draw_quad (0, 0, $w, $h); 2637 $tex->draw_quad_alpha (0, 0, $w, $h);
2411 2638
2412 glDisable GL_TEXTURE_2D; 2639 glDisable GL_TEXTURE_2D;
2413} 2640}
2414 2641
2415############################################################################# 2642#############################################################################
2416 2643
2417package CFPlus::UI::ImageButton; 2644package DC::UI::ImageButton;
2418 2645
2419our @ISA = CFPlus::UI::Image::; 2646our @ISA = DC::UI::Image::;
2420 2647
2421use CFPlus::OpenGL; 2648use DC::OpenGL;
2422 2649
2423my %textures; 2650my %textures;
2424 2651
2425sub new { 2652sub new {
2426 my $class = shift; 2653 my $class = shift;
… …
2429 padding_x => 4, 2656 padding_x => 4,
2430 padding_y => 4, 2657 padding_y => 4,
2431 fg => [1, 1, 1], 2658 fg => [1, 1, 1],
2432 active_fg => [0, 0, 1], 2659 active_fg => [0, 0, 1],
2433 can_hover => 1, 2660 can_hover => 1,
2434 align => 0, 2661 align => 0.5,
2435 valign => 0, 2662 valign => 0.5,
2436 can_events => 1, 2663 can_events => 1,
2437 @_ 2664 @_
2438 ); 2665 );
2439} 2666}
2440 2667
2668sub invoke_button_down {
2669 my ($self, $ev, $x, $y) = @_;
2670
2671 1
2672}
2673
2441sub invoke_button_up { 2674sub invoke_button_up {
2442 my ($self, $ev, $x, $y) = @_; 2675 my ($self, $ev, $x, $y) = @_;
2443 2676
2444 $self->emit ("activate") 2677 $self->emit ("activate")
2445 if $x >= 0 && $x < $self->{w} 2678 if $x >= 0 && $x < $self->{w}
… …
2448 1 2681 1
2449} 2682}
2450 2683
2451############################################################################# 2684#############################################################################
2452 2685
2453package CFPlus::UI::VGauge; 2686package DC::UI::VGauge;
2454 2687
2455our @ISA = CFPlus::UI::Base::; 2688our @ISA = DC::UI::Base::;
2456 2689
2457use List::Util qw(min max); 2690use List::Util qw(min max);
2458 2691
2459use CFPlus::OpenGL; 2692use DC::OpenGL;
2460 2693
2461my %tex = ( 2694my %tex = (
2462 food => [ 2695 food => [
2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2696 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2697 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2465 ], 2698 ],
2466 grace => [ 2699 grace => [
2467 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2700 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2468 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2701 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2469 ], 2702 ],
2470 hp => [ 2703 hp => [
2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2704 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2705 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2473 ], 2706 ],
2474 mana => [ 2707 mana => [
2475 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2708 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2476 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2709 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2477 ], 2710 ],
2478); 2711);
2479 2712
2480# eg. VGauge->new (gauge => 'food'), default gauge: food 2713# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2583 glDisable GL_TEXTURE_2D; 2816 glDisable GL_TEXTURE_2D;
2584} 2817}
2585 2818
2586############################################################################# 2819#############################################################################
2587 2820
2821package DC::UI::Progress;
2822
2823our @ISA = DC::UI::Label::;
2824
2825use DC::OpenGL;
2826
2827sub new {
2828 my ($class, %arg) = @_;
2829
2830 my $self = $class->SUPER::new (
2831 fg => [1, 1, 1],
2832 bg => [0, 0, 1, 0.2],
2833 bar => [0.7, 0.5, 0.1, 0.8],
2834 outline => [0.4, 0.3, 0],
2835 fontsize => 0.9,
2836 valign => 0.5,
2837 align => 0.5,
2838 can_events => 1,
2839 ellipsise => 1,
2840 label => "%d%%",
2841 %arg,
2842 );
2843
2844 $self->set_value ($arg{value} || -1);
2845
2846 $self
2847}
2848
2849sub set_label {
2850 my ($self, $label) = @_;
2851
2852 return if $self->{label} eq $label;
2853 $self->{label} = $label;
2854
2855 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2856}
2857
2858sub set_value {
2859 my ($self, $value) = @_;
2860
2861 if ($self->{value} ne $value) {
2862 $self->{value} = $value;
2863
2864 if ($value < 0) {
2865 $self->set_text ("-");
2866 } else {
2867 $self->set_text (sprintf $self->{label}, $value * 100);
2868 }
2869
2870 $self->update;
2871 }
2872}
2873
2874sub _draw {
2875 my ($self) = @_;
2876
2877 glEnable GL_BLEND;
2878 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2879
2880 if ($self->{value} >= 0) {
2881 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2882
2883 glColor_premultiply @{$self->{bar}};
2884 glRect 2, 2, $s, $self->{h} - 2;
2885 glColor_premultiply @{$self->{bg}};
2886 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2887 }
2888
2889 glColor_premultiply @{$self->{outline}};
2890 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2891
2892 glDisable GL_BLEND;
2893
2894 {
2895 local $self->{bg}; # do not draw background
2896 $self->SUPER::_draw;
2897 }
2898}
2899
2900#############################################################################
2901
2902package DC::UI::ExperienceProgress;
2903
2904our @ISA = DC::UI::Progress::;
2905
2906sub new {
2907 my ($class, %arg) = @_;
2908
2909 my $self = $class->SUPER::new (
2910 tooltip => sub {
2911 my ($self) = @_;
2912
2913 sprintf "level %d\n%s points\n%s next level\n%s to go",
2914 $self->{lvl},
2915 ::formsep ($self->{exp}),
2916 ::formsep ($self->{nxt}),
2917 ::formsep ($self->{nxt} - $self->{exp}),
2918 },
2919 %arg
2920 );
2921
2922 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2923 if $::CONN;
2924
2925 $self
2926}
2927
2928sub DESTROY {
2929 my ($self) = @_;
2930
2931 delete $::CONN->{on_exp_update}{$self+0}
2932 if $::CONN;
2933
2934 $self->SUPER::DESTROY;
2935}
2936
2937sub set_value {
2938 my ($self, $lvl, $exp) = @_;
2939
2940 $self->{lvl} = $lvl;
2941 $self->{exp} = $exp;
2942
2943 my $v = -1;
2944
2945 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2946 my $l0 = $table->[$lvl - 1];
2947 my $l1 = $table->[$lvl];
2948
2949 $self->{nxt} = $l1;
2950
2951 $v = ($exp - $l0) / ($l1 - $l0);
2952 }
2953
2954 $self->SUPER::set_value ($v);
2955}
2956
2957#############################################################################
2958
2588package CFPlus::UI::Gauge; 2959package DC::UI::Gauge;
2589 2960
2590our @ISA = CFPlus::UI::VBox::; 2961our @ISA = DC::UI::VBox::;
2591 2962
2592sub new { 2963sub new {
2593 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2594 2965
2595 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
… …
2597 can_hover => 1, 2968 can_hover => 1,
2598 can_events => 1, 2969 can_events => 1,
2599 %arg, 2970 %arg,
2600 ); 2971 );
2601 2972
2602 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2973 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2603 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2974 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2604 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2975 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2605 2976
2606 $self 2977 $self
2607} 2978}
2608 2979
2609sub set_fontsize { 2980sub set_fontsize {
… …
2630 $self->{value}->set_text ($val); 3001 $self->{value}->set_text ($val);
2631} 3002}
2632 3003
2633############################################################################# 3004#############################################################################
2634 3005
2635package CFPlus::UI::Slider; 3006package DC::UI::Slider;
2636 3007
2637use strict; 3008use strict;
2638 3009
2639use CFPlus::OpenGL; 3010use DC::OpenGL;
2640 3011
2641our @ISA = CFPlus::UI::DrawBG::; 3012our @ISA = DC::UI::DrawBG::;
2642 3013
2643my @tex = 3014my @tex =
2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3015 map { new_from_file DC::Texture DC::find_rcfile $_ }
2645 qw(s1_slider.png s1_slider_bg.png); 3016 qw(s1_slider.png s1_slider_bg.png);
2646 3017
2647sub new { 3018sub new {
2648 my $class = shift; 3019 my $class = shift;
2649 3020
… …
2717 3088
2718 $self->SUPER::invoke_button_down ($ev, $x, $y); 3089 $self->SUPER::invoke_button_down ($ev, $x, $y);
2719 3090
2720 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3091 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2721 3092
2722 $self->invoke_mouse_motion ($ev, $x, $y) 3093 $self->invoke_mouse_motion ($ev, $x, $y);
3094
3095 1
2723} 3096}
2724 3097
2725sub invoke_mouse_motion { 3098sub invoke_mouse_motion {
2726 my ($self, $ev, $x, $y) = @_; 3099 my ($self, $ev, $x, $y) = @_;
2727 3100
… …
2743sub invoke_mouse_wheel { 3116sub invoke_mouse_wheel {
2744 my ($self, $ev) = @_; 3117 my ($self, $ev) = @_;
2745 3118
2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3119 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2747 3120
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3121 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2749 3122
2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3123 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751 3124
2752 ! ! $delta 3125 1
2753} 3126}
2754 3127
2755sub update { 3128sub update {
2756 my ($self) = @_; 3129 my ($self) = @_;
2757 3130
… …
2806 glDisable GL_TEXTURE_2D; 3179 glDisable GL_TEXTURE_2D;
2807} 3180}
2808 3181
2809############################################################################# 3182#############################################################################
2810 3183
2811package CFPlus::UI::ValSlider; 3184package DC::UI::ValSlider;
2812 3185
2813our @ISA = CFPlus::UI::HBox::; 3186our @ISA = DC::UI::HBox::;
2814 3187
2815sub new { 3188sub new {
2816 my ($class, %arg) = @_; 3189 my ($class, %arg) = @_;
2817 3190
2818 my $range = delete $arg{range}; 3191 my $range = delete $arg{range};
2819 3192
2820 my $self = $class->SUPER::new ( 3193 my $self = $class->SUPER::new (
2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3194 slider => (new DC::UI::Slider expand => 1, range => $range),
2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3195 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2823 to_value => sub { shift }, 3196 to_value => sub { shift },
2824 from_value => sub { shift }, 3197 from_value => sub { shift },
2825 %arg, 3198 %arg,
2826 ); 3199 );
2827 3200
… …
2847sub set_range { shift->{slider}->set_range (@_) } 3220sub set_range { shift->{slider}->set_range (@_) }
2848sub set_value { shift->{slider}->set_value (@_) } 3221sub set_value { shift->{slider}->set_value (@_) }
2849 3222
2850############################################################################# 3223#############################################################################
2851 3224
2852package CFPlus::UI::TextScroller; 3225package DC::UI::TextScroller;
2853 3226
2854our @ISA = CFPlus::UI::HBox::; 3227our @ISA = DC::UI::HBox::;
2855 3228
2856use CFPlus::OpenGL; 3229use DC::OpenGL;
2857 3230
2858sub new { 3231sub new {
2859 my $class = shift; 3232 my $class = shift;
2860 3233
2861 my $self = $class->SUPER::new ( 3234 my $self = $class->SUPER::new (
… …
2863 can_events => 1, 3236 can_events => 1,
2864 indent => 0, 3237 indent => 0,
2865 #font => default_font 3238 #font => default_font
2866 @_, 3239 @_,
2867 3240
2868 layout => (new CFPlus::Layout), 3241 layout => (new DC::Layout),
2869 par => [], 3242 par => [],
2870 max_par => 0, 3243 max_par => 0,
2871 height => 0, 3244 height => 0,
2872 children => [ 3245 children => [
2873 (new CFPlus::UI::Empty expand => 1), 3246 (new DC::UI::Empty expand => 1),
2874 (new CFPlus::UI::Slider vertical => 1), 3247 (new DC::UI::Slider vertical => 1),
2875 ], 3248 ],
2876 ); 3249 );
2877 3250
2878 $self->{children}[1]->connect (changed => sub { $self->update }); 3251 $self->{children}[1]->connect (changed => sub { $self->update });
2879 3252
… …
2888} 3261}
2889 3262
2890sub size_request { 3263sub size_request {
2891 my ($self) = @_; 3264 my ($self) = @_;
2892 3265
2893 my ($empty, $slider) = @{ $self->{children} }; 3266 my ($empty, $slider) = $self->visible_children;
2894 3267
2895 local $self->{children} = [$empty, $slider]; 3268 local $self->{children} = [$empty, $slider];
2896 $self->SUPER::size_request 3269 $self->SUPER::size_request
2897} 3270}
2898 3271
… …
2935 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3308 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2936 $layout->set_markup ($para->{markup}); 3309 $layout->set_markup ($para->{markup});
2937 3310
2938 $layout->set_shapes ( 3311 $layout->set_shapes (
2939 map 3312 map
2940 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3313 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2941 @{$para->{widget}} 3314 @{$para->{widget}}
2942 ); 3315 );
2943 3316
2944 $layout 3317 $layout
2945} 3318}
… …
3062 $ROOT->on_post_alloc ($self => sub { 3435 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate; 3436 $self->force_uptodate;
3064 3437
3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3438 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3066 3439
3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3440 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3068 glClearColor 0, 0, 0, 0; 3441 glClearColor 0, 0, 0, 0;
3069 glClear GL_COLOR_BUFFER_BIT; 3442 glClear GL_COLOR_BUFFER_BIT;
3070 3443
3071 package CFPlus::UI::Base; 3444 package DC::UI::Base;
3072 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3445 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3073 (0, 0, $self->{w}, $self->{h}); 3446 (0, 0, $self->{w}, $self->{h});
3074 3447
3075 my $top = int $self->{children}[1]{range}[0]; 3448 my $top = int $self->{children}[1]{range}[0];
3076 3449
… …
3087 3460
3088 if ($y0 < $y + $h && $y < $y1) { 3461 if ($y0 < $y + $h && $y < $y1) {
3089 my $layout = $self->get_layout ($para); 3462 my $layout = $self->get_layout ($para);
3090 3463
3091 $layout->render ($para->{indent}, $y - $y0); 3464 $layout->render ($para->{indent}, $y - $y0);
3465 $layout->draw;
3092 3466
3093 if (my @w = @{ $para->{widget} }) { 3467 if (my @w = @{ $para->{widget} }) {
3094 my @s = $layout->get_shapes; 3468 my @s = $layout->get_shapes;
3095 3469
3096 for (@w) { 3470 for (@w) {
… …
3134 $self->{children}[1]->draw; 3508 $self->{children}[1]->draw;
3135} 3509}
3136 3510
3137############################################################################# 3511#############################################################################
3138 3512
3139package CFPlus::UI::Animator; 3513package DC::UI::Animator;
3140 3514
3141use CFPlus::OpenGL; 3515use DC::OpenGL;
3142 3516
3143our @ISA = CFPlus::UI::Bin::; 3517our @ISA = DC::UI::Bin::;
3144 3518
3145sub moveto { 3519sub moveto {
3146 my ($self, $x, $y) = @_; 3520 my ($self, $x, $y) = @_;
3147 3521
3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3522 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3176 glPopMatrix; 3550 glPopMatrix;
3177} 3551}
3178 3552
3179############################################################################# 3553#############################################################################
3180 3554
3181package CFPlus::UI::Flopper; 3555package DC::UI::Flopper;
3182 3556
3183our @ISA = CFPlus::UI::Button::; 3557our @ISA = DC::UI::Button::;
3184 3558
3185sub new { 3559sub new {
3186 my $class = shift; 3560 my $class = shift;
3187 3561
3188 my $self = $class->SUPER::new ( 3562 my $self = $class->SUPER::new (
… …
3200 $self->{other}->toggle_visibility; 3574 $self->{other}->toggle_visibility;
3201} 3575}
3202 3576
3203############################################################################# 3577#############################################################################
3204 3578
3205package CFPlus::UI::Tooltip; 3579package DC::UI::Tooltip;
3206 3580
3207our @ISA = CFPlus::UI::Bin::; 3581our @ISA = DC::UI::Bin::;
3208 3582
3209use CFPlus::OpenGL; 3583use DC::OpenGL;
3210 3584
3211sub new { 3585sub new {
3212 my $class = shift; 3586 my $class = shift;
3213 3587
3214 $class->SUPER::new ( 3588 $class->SUPER::new (
… …
3218} 3592}
3219 3593
3220sub set_tooltip_from { 3594sub set_tooltip_from {
3221 my ($self, $widget) = @_; 3595 my ($self, $widget) = @_;
3222 3596
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
3225
3226 my $tooltip = $widget->{tooltip}; 3597 my $tip = $widget->{tooltip};
3598 $tip = $tip->($widget) if "CODE" eq ref $tip;
3599
3600 $tip = DC::Pod::section_label tooltip => $1
3601 if $tip =~ /^#(.*)$/;
3227 3602
3228 if ($ENV{CFPLUS_DEBUG} & 2) { 3603 if ($ENV{CFPLUS_DEBUG} & 2) {
3229 $tooltip .= "\n\n" . (ref $widget) . "\n" 3604 $tip .= "\n\n" . (ref $widget) . "\n"
3230 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3605 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3231 . "req $widget->{req_w} $widget->{req_h}\n" 3606 . "req $widget->{req_w} $widget->{req_h}\n"
3232 . "visible $widget->{visible}"; 3607 . "visible $widget->{visible}";
3233 } 3608 }
3234 3609
3235 $tooltip =~ s/^\n+//; 3610 $tip =~ s/^\n+//;
3236 $tooltip =~ s/\n+$//; 3611 $tip =~ s/\n+$//;
3237 3612
3238 $self->add (new CFPlus::UI::Label 3613 $self->add (new DC::UI::Label
3239 markup => $tooltip, 3614 markup => $tip,
3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3615 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3616 align => 0,
3241 fontsize => 0.8, 3617 fontsize => 0.8,
3242 style => 1, # FLAG_INVERSE 3618 style => 1, # FLAG_INVERSE
3243 ellipsise => 0, 3619 ellipsise => 0,
3244 font => ($widget->{tooltip_font} || $::FONT_PROP), 3620 font => ($widget->{tooltip_font} || $::FONT_PROP),
3245 ); 3621 );
… …
3282} 3658}
3283 3659
3284sub _draw { 3660sub _draw {
3285 my ($self) = @_; 3661 my ($self) = @_;
3286 3662
3287 glTranslate 0.375, 0.375;
3288
3289 my ($w, $h) = @$self{qw(w h)}; 3663 my ($w, $h) = @$self{qw(w h)};
3290 3664
3291 glColor 1, 0.8, 0.4; 3665 glColor 1, 0.8, 0.4;
3292 glBegin GL_QUADS; 3666 glRect 0, 0, $w, $h;
3293 glVertex 0 , 0;
3294 glVertex 0 , $h;
3295 glVertex $w, $h;
3296 glVertex $w, 0;
3297 glEnd;
3298 3667
3299 glColor 0, 0, 0; 3668 glColor 0, 0, 0;
3300 glBegin GL_LINE_LOOP; 3669 glRect_lineloop .5, .5, $w + .5, $h + .5;
3301 glVertex 0 , 0;
3302 glVertex 0 , $h;
3303 glVertex $w, $h;
3304 glVertex $w, 0;
3305 glEnd;
3306 3670
3307 glTranslate 2 - 0.375, 2 - 0.375; 3671 glTranslate 2, 2;
3308 3672
3309 $self->SUPER::_draw; 3673 $self->SUPER::_draw;
3310} 3674}
3311 3675
3312############################################################################# 3676#############################################################################
3313 3677
3314package CFPlus::UI::Face; 3678package DC::UI::Face;
3315 3679
3316our @ISA = CFPlus::UI::DrawBG::; 3680our @ISA = DC::UI::DrawBG::;
3317 3681
3318use CFPlus::OpenGL; 3682use DC::OpenGL;
3319 3683
3320sub new { 3684sub new {
3321 my $class = shift; 3685 my $class = shift;
3322 3686
3323 my $self = $class->SUPER::new ( 3687 my $self = $class->SUPER::new (
3688 size_w => 32,
3689 size_h => 8,
3324 aspect => 1, 3690 aspect => 1,
3325 can_events => 0, 3691 can_events => 0,
3326 @_, 3692 @_,
3327 ); 3693 );
3328 3694
3329 if ($self->{anim} && $self->{animspeed}) { 3695 if ($self->{anim} && $self->{animspeed}) {
3330 CFPlus::weaken (my $widget = $self); 3696 DC::weaken (my $widget = $self);
3331 3697
3332 $self->{timer} = Event->timer ( 3698 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3699 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3334 hard => 1, 3700 return unless $::CONN;
3335 interval => $self->{animspeed}, 3701
3336 cb => sub { 3702 my $w = $widget
3703 or return;
3704
3337 ++$widget->{frame}; 3705 ++$w->{frame};
3706 $w->update_face;
3707
3708 # somehow, $widget can go away
3338 $widget->update; 3709 $w->update;
3339 }, 3710 $w->update_timer;
3340 ); 3711 };
3712
3713 $self->update_face;
3714 $self->update_timer;
3341 } 3715 }
3342 3716
3343 $self 3717 $self
3344} 3718}
3345 3719
3720sub update_timer {
3721 my ($self) = @_;
3722
3723 return unless $self->{timer};
3724
3725 if ($self->{visible}) {
3726 $self->{timer}->start;
3727 } else {
3728 $self->{timer}->stop;
3729 }
3730}
3731
3732sub update_face {
3733 my ($self) = @_;
3734
3735 if ($::CONN) {
3736 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3737 if ($anim && @$anim) {
3738 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3739 delete $self->{face_change_cb};
3740
3741 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3742 unless ($tex->{name} || $tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746 }
3747 }
3748 }
3749}
3750
3346sub size_request { 3751sub size_request {
3347 (32, 8) 3752 my ($self) = @_;
3753
3754 if ($::CONN) {
3755 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3756 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3757 if ($tex->{name}) {
3758 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3759 } elsif (!$tex->{loading}) {
3760 $tex->upload (sub { $self->reconfigure });
3761 }
3762 }
3763
3764 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3765 }
3766 }
3767
3768 ($self->{size_w} || 8, $self->{size_h} || 8)
3348} 3769}
3349 3770
3350sub update { 3771sub update {
3351 my ($self) = @_; 3772 my ($self) = @_;
3352 3773
3353 return unless $self->{visible}; 3774 return unless $self->{visible};
3354 3775
3355 $self->SUPER::update; 3776 $self->SUPER::update;
3356} 3777}
3357 3778
3779sub invoke_visibility_change {
3780 my ($self) = @_;
3781
3782 $self->update_timer;
3783
3784 0
3785}
3786
3358sub _draw { 3787sub _draw {
3359 my ($self) = @_; 3788 my ($self) = @_;
3360 3789
3361 return unless $::CONN;
3362
3363 $self->SUPER::_draw; 3790 $self->SUPER::_draw;
3364 3791
3365 my $face; 3792 if (my $tex = $self->{tex}) {
3366
3367 if ($self->{frame}) {
3368 my $anim = $::CONN->{anim}[$self->{anim}];
3369
3370 $face = $anim->[ $self->{frame} % @$anim ]
3371 if $anim && @$anim;
3372 }
3373
3374 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3375
3376 if ($tex) {
3377 glEnable GL_TEXTURE_2D; 3793 glEnable GL_TEXTURE_2D;
3378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3379 glColor 0, 0, 0, 1; 3795 glColor 0, 0, 0, 1;
3380 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3796 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3381 glDisable GL_TEXTURE_2D; 3797 glDisable GL_TEXTURE_2D;
… …
3383} 3799}
3384 3800
3385sub destroy { 3801sub destroy {
3386 my ($self) = @_; 3802 my ($self) = @_;
3387 3803
3388 $self->{timer}->cancel 3804 (delete $self->{timer})->cancel
3389 if $self->{timer}; 3805 if $self->{timer};
3390 3806
3391 $self->SUPER::destroy; 3807 $self->SUPER::destroy;
3392} 3808}
3393 3809
3394############################################################################# 3810#############################################################################
3395 3811
3396package CFPlus::UI::Buttonbar; 3812package DC::UI::Buttonbar;
3397 3813
3398our @ISA = CFPlus::UI::HBox::; 3814our @ISA = DC::UI::HBox::;
3399 3815
3400# TODO: should actually wrap buttons and other goodies. 3816# TODO: should actually wrap buttons and other goodies.
3401 3817
3402############################################################################# 3818#############################################################################
3403 3819
3404package CFPlus::UI::Menu; 3820package DC::UI::Menu;
3405 3821
3406our @ISA = CFPlus::UI::Toplevel::; 3822our @ISA = DC::UI::Toplevel::;
3407 3823
3408use CFPlus::OpenGL; 3824use DC::OpenGL;
3409 3825
3410sub new { 3826sub new {
3411 my $class = shift; 3827 my $class = shift;
3412 3828
3413 my $self = $class->SUPER::new ( 3829 my $self = $class->SUPER::new (
3414 items => [], 3830 items => [],
3415 z => 100, 3831 z => 100,
3416 @_, 3832 @_,
3417 ); 3833 );
3418 3834
3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3835 $self->add ($self->{vbox} = new DC::UI::VBox);
3420 3836
3421 for my $item (@{ $self->{items} }) { 3837 for my $item (@{ $self->{items} }) {
3422 my ($widget, $cb, $tooltip) = @$item; 3838 my ($widget, $cb, $tooltip) = @$item;
3423 3839
3424 # handle various types of items, only text for now 3840 # handle various types of items, only text for now
3425 if (!ref $widget) { 3841 if (!ref $widget) {
3426 if ($widget =~ /\t/) { 3842 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2; 3843 my ($left, $right) = split /\t/, $widget, 2;
3428 3844
3429 $widget = new CFPlus::UI::HBox 3845 $widget = new DC::UI::HBox
3430 can_hover => 1, 3846 can_hover => 1,
3431 can_events => 1, 3847 can_events => 1,
3432 tooltip => $tooltip, 3848 tooltip => $tooltip,
3433 children => [ 3849 children => [
3434 (new CFPlus::UI::Label markup => $left, expand => 1), 3850 (new DC::UI::Label markup => $left, expand => 1),
3435 (new CFPlus::UI::Label markup => $right, align => +1), 3851 (new DC::UI::Label markup => $right, align => 1),
3436 ], 3852 ],
3437 ; 3853 ;
3438 3854
3439 } else { 3855 } else {
3440 $widget = new CFPlus::UI::Label 3856 $widget = new DC::UI::Label
3441 can_hover => 1, 3857 can_hover => 1,
3442 can_events => 1, 3858 can_events => 1,
3859 align => 0,
3443 markup => $widget, 3860 markup => $widget,
3444 tooltip => $tooltip; 3861 tooltip => $tooltip;
3445 } 3862 }
3446 } 3863 }
3447 3864
… …
3493 1 3910 1
3494} 3911}
3495 3912
3496############################################################################# 3913#############################################################################
3497 3914
3498package CFPlus::UI::Multiplexer; 3915package DC::UI::Multiplexer;
3499 3916
3500our @ISA = CFPlus::UI::Container::; 3917our @ISA = DC::UI::Container::;
3501 3918
3502sub new { 3919sub new {
3503 my $class = shift; 3920 my $class = shift;
3504 3921
3505 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3566 $self->{current}->draw; 3983 $self->{current}->draw;
3567} 3984}
3568 3985
3569############################################################################# 3986#############################################################################
3570 3987
3571package CFPlus::UI::Notebook; 3988package DC::UI::Notebook;
3572 3989
3990use DC::OpenGL;
3991
3573our @ISA = CFPlus::UI::VBox::; 3992our @ISA = DC::UI::VBox::;
3574 3993
3575sub new { 3994sub new {
3576 my $class = shift; 3995 my $class = shift;
3577 3996
3578 my $self = $class->SUPER::new ( 3997 my $self = $class->SUPER::new (
3579 buttonbar => (new CFPlus::UI::Buttonbar), 3998 buttonbar => (new DC::UI::Buttonbar),
3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3999 multiplexer => (new DC::UI::Multiplexer expand => 1),
4000 active_outline => [.7, .7, 0.2],
3581 # filter => # will be put between multiplexer and $self 4001 # filter => # will be put between multiplexer and $self
3582 @_, 4002 @_,
3583 ); 4003 );
3584 4004
3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4005 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3586 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4006 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3587 4007
4008 {
4009 Scalar::Util::weaken (my $wself = $self);
4010
4011 $self->{multiplexer}->connect (c_add => sub {
4012 my ($mplex, $widgets) = @_;
4013
4014 for my $child (@$widgets) {
4015 Scalar::Util::weaken $child;
4016 $child->{c_tab_} ||= do {
4017 my $tab =
4018 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4019 ? $child->{c_tab}
4020 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4021
4022 $tab->connect (activate => sub {
4023 $wself->set_current_page ($child);
4024 });
4025
4026 $tab
4027 };
4028
4029 $self->{buttonbar}->add ($child->{c_tab_});
4030 }
4031 });
4032
4033 $self->{multiplexer}->connect (c_remove => sub {
4034 my ($mplex, $widgets) = @_;
4035
4036 for my $child (@$widgets) {
4037 $wself->{buttonbar}->remove ($child->{c_tab_});
4038 }
4039 });
4040 }
4041
3588 $self 4042 $self
3589} 4043}
3590 4044
3591sub add { 4045sub add {
4046 my ($self, @widgets) = @_;
4047
4048 $self->{multiplexer}->add (@widgets)
4049}
4050
4051sub remove {
4052 my ($self, @widgets) = @_;
4053
4054 $self->{multiplexer}->remove (@widgets)
4055}
4056
4057sub pages {
4058 my ($self) = @_;
4059 $self->{multiplexer}->children
4060}
4061
4062sub add_tab {
3592 my ($self, $title, $widget, $tooltip) = @_; 4063 my ($self, $title, $widget, $tooltip) = @_;
3593 4064
3594 CFPlus::weaken $self; 4065 $title = [$title, $tooltip] unless ref $title;
4066 $widget->{c_tab} = $title;
3595 4067
3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3597 markup => $title,
3598 tooltip => $tooltip,
3599 on_activate => sub { $self->set_current_page ($widget) },
3600 );
3601
3602 $self->{multiplexer}->add ($widget); 4068 $self->add ($widget);
3603} 4069}
3604 4070
3605sub get_current_page { 4071sub get_current_page {
3606 my ($self) = @_; 4072 my ($self) = @_;
3607 4073
… …
3613 4079
3614 $self->{multiplexer}->set_current_page ($page); 4080 $self->{multiplexer}->set_current_page ($page);
3615 $self->emit (page_changed => $self->{multiplexer}{current}); 4081 $self->emit (page_changed => $self->{multiplexer}{current});
3616} 4082}
3617 4083
4084sub _draw {
4085 my ($self) = @_;
4086
4087 $self->SUPER::_draw ();
4088
4089 if (my $cur = $self->{multiplexer}{current}) {
4090 if ($cur = $cur->{c_tab_}) {
4091 glTranslate $self->{buttonbar}{x} + $cur->{x},
4092 $self->{buttonbar}{y} + $cur->{y};
4093 glLineWidth 3;
4094 #glEnable GL_BLEND;
4095 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4096 glColor @{$self->{active_outline}};
4097 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4098 glLineWidth 1;
4099 #glDisable GL_BLEND;
4100 }
4101 }
4102}
4103
3618############################################################################# 4104#############################################################################
3619 4105
3620package CFPlus::UI::Selector; 4106package DC::UI::Selector;
3621 4107
3622use utf8; 4108use utf8;
3623 4109
3624our @ISA = CFPlus::UI::Button::; 4110our @ISA = DC::UI::Button::;
3625 4111
3626sub new { 4112sub new {
3627 my $class = shift; 4113 my $class = shift;
3628 4114
3629 my $self = $class->SUPER::new ( 4115 my $self = $class->SUPER::new (
… …
3646 my ($value, $title, $tooltip) = @$_; 4132 my ($value, $title, $tooltip) = @$_;
3647 4133
3648 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4134 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3649 } 4135 }
3650 4136
3651 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4137 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3652} 4138}
3653 4139
3654sub _set_value { 4140sub _set_value {
3655 my ($self, $value) = @_; 4141 my ($self, $value) = @_;
3656 4142
3657 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4143 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4144 $item ||= $self->{options}[0]
3658 or return; 4145 or return;
3659 4146
3660 $self->{value} = $item->[0]; 4147 $self->{value} = $item->[0];
3661 $self->set_markup ("$item->[1] ⇓"); 4148 $self->set_markup ("$item->[1] ⇓");
3662 $self->set_tooltip ($item->[2]); 4149# $self->set_tooltip ($item->[2]);
3663} 4150}
3664 4151
3665sub set_value { 4152sub set_value {
3666 my ($self, $value) = @_; 4153 my ($self, $value) = @_;
3667 4154
… …
3669 4156
3670 $self->_set_value ($value); 4157 $self->_set_value ($value);
3671 $self->emit (changed => $value); 4158 $self->emit (changed => $value);
3672} 4159}
3673 4160
4161sub set_options {
4162 my ($self, $options) = @_;
4163
4164 $self->{options} = $options;
4165 $self->_set_value ($self->{value});
4166}
4167
3674############################################################################# 4168#############################################################################
3675 4169
3676package CFPlus::UI::Statusbox; 4170package DC::UI::Statusbox;
3677 4171
3678our @ISA = CFPlus::UI::VBox::; 4172our @ISA = DC::UI::VBox::;
3679 4173
3680sub new { 4174sub new {
3681 my $class = shift; 4175 my $class = shift;
3682 4176
3683 my $self = $class->SUPER::new ( 4177 my $self = $class->SUPER::new (
3684 fontsize => 0.8, 4178 fontsize => 0.8,
3685 @_, 4179 @_,
3686 ); 4180 );
3687 4181
3688 CFPlus::weaken (my $this = $self); 4182 DC::weaken (my $this = $self);
3689 4183
3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4184 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3691 4185
3692 $self 4186 $self
3693} 4187}
3694 4188
3695sub reorder { 4189sub reorder {
3696 my ($self) = @_; 4190 my ($self) = @_;
3697 my $NOW = Time::HiRes::time; 4191 my $NOW = Time::HiRes::time;
3698 4192
3699 # freeze display when hovering over any label 4193 # freeze display when hovering over any label
3700 return if $CFPlus::UI::TOOLTIP->{owner} 4194 return if $DC::UI::TOOLTIP->{owner}
3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4195 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3702 values %{ $self->{item} }; 4196 values %{ $self->{item} };
3703 4197
3704 while (my ($k, $v) = each %{ $self->{item} }) { 4198 while (my ($k, $v) = each %{ $self->{item} }) {
3705 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4199 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3706 } 4200 }
4201
4202 $self->{timer}->set (1, 1);
3707 4203
3708 my @widgets; 4204 my @widgets;
3709 4205
3710 my @items = sort { 4206 my @items = sort {
3711 $a->{pri} <=> $b->{pri} 4207 $a->{pri} <=> $b->{pri}
3712 or $b->{id} <=> $a->{id} 4208 or $b->{id} <=> $a->{id}
3713 } values %{ $self->{item} }; 4209 } values %{ $self->{item} };
3714
3715 $self->{timer}->interval (1);
3716 4210
3717 my $count = 10 + 1; 4211 my $count = 10 + 1;
3718 for my $item (@items) { 4212 for my $item (@items) {
3719 last unless --$count; 4213 last unless --$count;
3720 4214
… …
3727 for ($short) { 4221 for ($short) {
3728 s/^\s+//; 4222 s/^\s+//;
3729 s/\s+/ /g; 4223 s/\s+/ /g;
3730 } 4224 }
3731 4225
3732 new CFPlus::UI::Label 4226 new DC::UI::Label
3733 markup => $short, 4227 markup => $short,
3734 tooltip => $item->{tooltip}, 4228 tooltip => $item->{tooltip},
3735 tooltip_font => $::FONT_PROP, 4229 tooltip_font => $::FONT_PROP,
3736 tooltip_width => 0.67, 4230 tooltip_width => 0.67,
3737 fontsize => $item->{fontsize} || $self->{fontsize}, 4231 fontsize => $item->{fontsize} || $self->{fontsize},
3738 max_w => $::WIDTH * 0.44, 4232 max_w => $::WIDTH * 0.44,
4233 align => 0,
3739 fg => [@{ $item->{fg} }], 4234 fg => [@{ $item->{fg} }],
3740 can_events => 1, 4235 can_events => 1,
3741 can_hover => 1 4236 can_hover => 1
3742 }; 4237 };
3743 4238
3744 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4239 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3745 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4240 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3746 $label->update; 4241 $label->update;
3747 $label->set_max_size (undef, $label->{req_h} * $diff) 4242 $label->set_max_size (undef, $label->{req_h} * $diff)
3748 if $diff < 1; 4243 if $diff < 1;
3749 $self->{timer}->interval (1/30); 4244 $self->{timer}->set (1/30, 1/30);
3750 } else { 4245 } else {
3751 $label->{fg}[3] = $item->{fg}[3] || 1; 4246 $label->{fg}[3] = $item->{fg}[3] || 1;
3752 } 4247 }
3753 4248
3754 push @widgets, $label; 4249 push @widgets, $label;
… …
3816 $self->SUPER::destroy; 4311 $self->SUPER::destroy;
3817} 4312}
3818 4313
3819############################################################################# 4314#############################################################################
3820 4315
3821package CFPlus::UI::Root; 4316package DC::UI::Root;
3822 4317
3823our @ISA = CFPlus::UI::Container::; 4318our @ISA = DC::UI::Container::;
3824 4319
3825use List::Util qw(min max); 4320use List::Util qw(min max);
3826 4321
3827use CFPlus::OpenGL; 4322use DC::OpenGL;
3828 4323
3829sub new { 4324sub new {
3830 my $class = shift; 4325 my $class = shift;
3831 4326
3832 my $self = $class->SUPER::new ( 4327 my $self = $class->SUPER::new (
3833 visible => 1, 4328 visible => 1,
3834 @_, 4329 @_,
3835 ); 4330 );
3836 4331
3837 CFPlus::weaken ($self->{root} = $self); 4332 DC::weaken ($self->{root} = $self);
3838 4333
3839 $self 4334 $self
3840} 4335}
3841 4336
3842sub size_request { 4337sub size_request {
… …
3890} 4385}
3891 4386
3892sub update { 4387sub update {
3893 my ($self) = @_; 4388 my ($self) = @_;
3894 4389
3895 $::WANT_REFRESH++; 4390 $::WANT_REFRESH = 1;
3896} 4391}
3897 4392
3898sub add { 4393sub add {
3899 my ($self, @children) = @_; 4394 my ($self, @children) = @_;
3900 4395
… …
3937 while ($self->{refresh_hook}) { 4432 while ($self->{refresh_hook}) {
3938 $_->() 4433 $_->()
3939 for values %{delete $self->{refresh_hook}}; 4434 for values %{delete $self->{refresh_hook}};
3940 } 4435 }
3941 4436
3942 if ($self->{realloc}) { 4437 while ($self->{realloc}) {
3943 my %queue; 4438 my %queue;
3944 my @queue; 4439 my @queue;
3945 my $widget; 4440 my $widget;
3946 4441
3947 outer: 4442 outer:
… …
3967 4462
3968 delete $queue{$widget+0}; 4463 delete $queue{$widget+0};
3969 4464
3970 my ($w, $h) = $widget->size_request; 4465 my ($w, $h) = $widget->size_request;
3971 4466
3972 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4467 $w += $widget->{padding_x} * 2;
3973 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4468 $h += $widget->{padding_y} * 2;
4469
4470 $w = max $widget->{min_w}, $w;
4471 $h = max $widget->{min_h}, $h;
3974 4472
3975 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4473 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3976 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4474 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3977 4475
3978 $w = $widget->{force_w} if exists $widget->{force_w}; 4476 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3994 } 4492 }
3995 } 4493 }
3996 4494
3997 delete $self->{realloc}{$widget+0}; 4495 delete $self->{realloc}{$widget+0};
3998 } 4496 }
3999 }
4000 4497
4001 while (my $size_alloc = delete $self->{size_alloc}) { 4498 while (my $size_alloc = delete $self->{size_alloc}) {
4002 my @queue = sort { $b->{visible} <=> $a->{visible} } 4499 my @queue = sort { $a->{visible} <=> $b->{visible} }
4003 values %$size_alloc; 4500 values %$size_alloc;
4004 4501
4005 while () { 4502 while () {
4006 my $widget = pop @queue || last; 4503 my $widget = pop @queue || last;
4007 4504
4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4505 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4009 4506
4010 $w = 0 if $w < 0;
4011 $h = 0 if $h < 0;
4012
4013 $w = max $widget->{min_w}, $w; 4507 $w = max $widget->{min_w}, $w;
4014 $h = max $widget->{min_h}, $h; 4508 $h = max $widget->{min_h}, $h;
4015 4509
4016# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4510# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4511# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018 4512
4019 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4513 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4514 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021 4515
4022 $w = int $w + 0.5; 4516 $w = int $w + 0.5;
4023 $h = int $h + 0.5; 4517 $h = int $h + 0.5;
4024 4518
4025 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4519 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4026 $widget->{old_w} = $widget->{w}; 4520 $widget->{old_w} = $widget->{w};
4027 $widget->{old_h} = $widget->{h}; 4521 $widget->{old_h} = $widget->{h};
4028 4522
4029 $widget->{w} = $w; 4523 $widget->{w} = $w;
4030 $widget->{h} = $h; 4524 $widget->{h} = $h;
4031 4525
4032 $widget->emit (size_allocate => $w, $h); 4526 $widget->emit (size_allocate => $w, $h);
4527 }
4033 } 4528 }
4034 } 4529 }
4035 } 4530 }
4036 4531
4037 while ($self->{post_alloc_hook}) { 4532 while ($self->{post_alloc_hook}) {
4038 $_->() 4533 $_->()
4039 for values %{delete $self->{post_alloc_hook}}; 4534 for values %{delete $self->{post_alloc_hook}};
4040 } 4535 }
4041
4042 4536
4043 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4537 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4044 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4538 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4045 glClear GL_COLOR_BUFFER_BIT; 4539 glClear GL_COLOR_BUFFER_BIT;
4046 4540
… …
4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4543 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4050 glMatrixMode GL_MODELVIEW; 4544 glMatrixMode GL_MODELVIEW;
4051 glLoadIdentity; 4545 glLoadIdentity;
4052 4546
4053 { 4547 {
4054 package CFPlus::UI::Base; 4548 package DC::UI::Base;
4055 4549
4056 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4550 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4057 (0, 0, $self->{w}, $self->{h}); 4551 (0, 0, $self->{w}, $self->{h});
4058 4552
4059 $self->_draw; 4553 $self->_draw;
4060 } 4554 }
4061} 4555}
4062 4556
4063############################################################################# 4557#############################################################################
4064 4558
4065package CFPlus::UI; 4559package DC::UI;
4066 4560
4067$ROOT = new CFPlus::UI::Root; 4561$ROOT = new DC::UI::Root;
4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4562$TOOLTIP = new DC::UI::Tooltip z => 900;
4069 4563
40701 45641
4071 4565

Diff Legend

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