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.420 by root, Wed Jul 25 15:50:17 2007 UTC vs.
Revision 1.478 by root, Tue Dec 22 00:35:44 2009 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use Guard ();
9
10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200 199
201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use strict;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __w_ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
364 $self->{force_h} = $h; 369 $self->{force_h} = $h;
365 370
366 $self->realloc; 371 $self->realloc;
367} 372}
368 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
372} 395}
373 396
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
605} 628}
606 629
607sub DESTROY { 630sub DESTROY {
608 my ($self) = @_; 631 my ($self) = @_;
609 632
610 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
611 634
635 local $@;
612 eval { $self->destroy }; 636 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 638
615 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
616} 640}
617 641
618############################################################################# 642#############################################################################
619 643
620package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
621 645
622our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
623 647
624use strict; 648use strict;
625use CFPlus::OpenGL; 649use DC::OpenGL;
626 650
627sub new { 651sub new {
628 my $class = shift; 652 my $class = shift;
629
630 # range [value, low, high, page]
631 653
632 $class->SUPER::new ( 654 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
635 @_ 657 @_
636 ) 658 )
637} 659}
638 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
639sub _draw { 668sub _draw {
640 my ($self) = @_; 669 my ($self) = @_;
641 670
642 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self
643 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
644 : $self->{bg}; 673 : $self->{bg};
645 674
646 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
647 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
648 677
649 glEnable GL_BLEND; 678 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 680 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 682 glDisable GL_BLEND;
661 } 683 }
662} 684}
663 685
664############################################################################# 686#############################################################################
665 687
666package CFPlus::UI::Empty; 688package DC::UI::Empty;
667 689
668our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
669 691
670sub new { 692sub new {
671 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
673} 695}
680 702
681sub draw { } 703sub draw { }
682 704
683############################################################################# 705#############################################################################
684 706
685package CFPlus::UI::Container; 707package DC::UI::Container;
686 708
687our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
688 710
689sub new { 711sub new {
690 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
691 713
692 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
786 $_->draw for $self->visible_children; 808 $_->draw for $self->visible_children;
787} 809}
788 810
789############################################################################# 811#############################################################################
790 812
791package CFPlus::UI::Bin; 813package DC::UI::Bin;
792 814
793our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
794 816
795sub new { 817sub new {
796 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
797 819
798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
799 821
800 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
801} 823}
802 824
803sub add { 825sub add {
810sub remove { 832sub remove {
811 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
812 834
813 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
814 836
815 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
816 unless @{$self->{children}}; 838 unless @{$self->{children}};
817} 839}
818 840
819sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
820 842
829 851
830 1 852 1
831} 853}
832 854
833############################################################################# 855#############################################################################
834
835# back-buffered drawing area 856# back-buffered drawing area
836 857
837package CFPlus::UI::Window; 858package DC::UI::Window;
838 859
839our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
840 861
841use CFPlus::OpenGL; 862use DC::OpenGL;
842 863
843sub new { 864sub new {
844 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
845 866
846 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
868} 889}
869 890
870sub render_child { 891sub render_child {
871 my ($self) = @_; 892 my ($self) = @_;
872 893
873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 894 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
874 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
875 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
876 897
877 { 898 {
878 package CFPlus::UI::Base; 899 package DC::UI::Base;
879 900
880 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
881 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
882 903
883 $self->_render; 904 $self->_render;
900 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
901} 922}
902 923
903############################################################################# 924#############################################################################
904 925
905package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
906 927
907use List::Util qw(min max); 928use List::Util qw(min max);
908 929
909our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
910 931
911sub new { 932sub new {
912 my $class = shift; 933 my $class = shift;
913 934
914 $class->SUPER::new ( 935 $class->SUPER::new (
998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
999 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1000 ) { 1021 ) {
1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1002 } else { 1023 } else {
1003 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1004 } 1025 }
1005} 1026}
1006 1027
1007sub _render { 1028sub _render {
1008 my ($self) = @_; 1029 my ($self) = @_;
1009 1030
1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1031 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1032 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1012 1033
1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1014 1035
1015 $self->SUPER::_render; 1036 $self->SUPER::_render;
1016} 1037}
1017 1038
1018############################################################################# 1039#############################################################################
1019 1040
1020package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1021 1042
1022our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1023 1044
1024sub new { 1045sub new {
1025 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1026 1047
1027 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1028 1049
1029 my $self; 1050 my $self;
1030 1051
1031 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1032 col => 0, 1053 c_col => 0,
1033 row => 1, 1054 c_row => 1,
1034 vertical => 0, 1055 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1057 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1060 },
1040 ; 1061 ;
1041 1062
1042 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1043 col => 1, 1064 c_col => 1,
1044 row => 0, 1065 c_row => 0,
1045 vertical => 1, 1066 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1068 on_changed => sub {
1048 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 col_expand => [1, 0], 1080 col_expand => [1, 0],
1060 row_expand => [1, 0], 1081 row_expand => [1, 0],
1061 %arg, 1082 %arg,
1062 ); 1083 );
1063 1084
1064 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new DC::UI::ViewPort
1065 col => 0, 1086 c_col => 0,
1066 row => 0, 1087 c_row => 0,
1067 expand => 1, 1088 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1070 on_changed => sub { 1091 on_changed => sub {
1071 my ($vp, $x, $y) = @_; 1092 my ($vp, $x, $y) = @_;
1195 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1196} 1217}
1197 1218
1198############################################################################# 1219#############################################################################
1199 1220
1200package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1201 1222
1202our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1203 1224
1204use CFPlus::OpenGL; 1225use DC::OpenGL;
1205 1226
1206sub new { 1227sub new {
1207 my $class = shift; 1228 my $class = shift;
1208 1229
1209 $class->SUPER::new ( 1230 $class->SUPER::new (
1219 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1220 1241
1221 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1233 } 1247 }
1234 1248
1235 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1236} 1250}
1237 1251
1238############################################################################# 1252#############################################################################
1239 1253
1240package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1241 1255
1242our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1243 1257
1244use CFPlus::OpenGL; 1258use DC::OpenGL;
1245 1259
1246sub new { 1260sub new {
1247 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1248 1262
1249 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1251 align => 1, 1265 align => 1,
1252 valign => 0, 1266 valign => 0.5,
1253 text => $arg{label}, 1267 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1255 } 1269 }
1256 1270
1257 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1258 # label => "", 1272 # label => "",
1259 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1260 border => 0.8, 1274 border => 0.8,
1261 style => 'single', 1275 style => 'single',
1262 %arg, 1276 %arg,
1263 ); 1277 );
1264 1278
1267 1281
1268sub add { 1282sub add {
1269 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1270 1284
1271 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273} 1287}
1274 1288
1275sub border { 1289sub border {
1276 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1277} 1291}
1317 my $border = $self->border; 1331 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1319 1333
1320 $child->draw; 1334 $child->draw;
1321 1335
1322 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1323 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 } 1349 }
1336} 1350}
1337 1351
1338############################################################################# 1352#############################################################################
1339 1353
1340package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1341 1355
1342our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1343 1357
1344use CFPlus::OpenGL; 1358use DC::OpenGL;
1345 1359
1346my $bg = 1360my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1348 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1349 1363
1350my @border = 1364my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1366 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353 1367
1354my @icon = 1368my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png); 1370 qw(x1_move.png x1_resize.png);
1357 1371
1358sub new { 1372sub new {
1359 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1360 1374
1361 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1362 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1363 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1364 border => 0.6, 1378 border => 0.8,
1365 can_events => 1, 1379 can_events => 1,
1366 min_w => 64, 1380 min_w => 64,
1367 min_h => 32, 1381 min_h => 32,
1368 %arg, 1382 %arg,
1369 ); 1383 );
1370 1384
1371 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1372 align => 0, 1386 align => 0.5,
1373 valign => 1, 1387 valign => 1,
1374 text => $self->{title}, 1388 text => $self->{title},
1375 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1376 if exists $self->{title}; 1390 if exists $self->{title};
1377 1391
1378 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1379 $self->{close_button} = 1393 $self->{close_button} =
1380 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1381 path => 'x1_close.png', 1395 path => 'x1_close.png',
1382 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1383 1397
1384 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1385 } 1399 }
1386 1400
1387 $self 1401 $self
1388} 1402}
1389 1403
1390sub add { 1404sub add {
1391 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1392 1406
1393 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1396} 1410}
1397 1411
1398sub border { 1412sub border {
1399 int $_[0]{border} * $::FONTSIZE 1413 int $_[0]{border} * $::FONTSIZE
1414}
1415
1416sub get_max_wh {
1417 my ($self) = @_;
1418
1419 return ($self->{w}, $self->{h})
1420 if $self->{visible} && $self->{w};
1421
1422 $self->SUPER::get_max_wh
1400} 1423}
1401 1424
1402sub size_request { 1425sub size_request {
1403 my ($self) = @_; 1426 my ($self) = @_;
1404 1427
1529 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 1554
1532 my $border = $self->border; 1555 my $border = $self->border;
1533 1556
1557 if ($border) {
1534 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539 1563
1540 # move 1564 # move
1541 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546 1570
1547 # resize 1571 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1553 1578
1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1555 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1556 1581
1557 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
1576 if $self->{close_button}; 1601 if $self->{close_button};
1577} 1602}
1578 1603
1579############################################################################# 1604#############################################################################
1580 1605
1581package CFPlus::UI::Table; 1606package DC::UI::Table;
1582 1607
1583our @ISA = CFPlus::UI::Container::; 1608our @ISA = DC::UI::Container::;
1584 1609
1585use List::Util qw(max sum); 1610use List::Util qw(max sum);
1586 1611
1587use CFPlus::OpenGL; 1612use DC::OpenGL;
1588 1613
1589sub new { 1614sub new {
1590 my $class = shift; 1615 my $class = shift;
1591 1616
1592 $class->SUPER::new ( 1617 $class->SUPER::new (
1598 1623
1599sub add { 1624sub add {
1600 my ($self, @widgets) = @_; 1625 my ($self, @widgets) = @_;
1601 1626
1602 for my $child (@widgets) { 1627 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1; 1628 $child->{c_rowspan} ||= 1;
1604 $child->{colspan} ||= 1; 1629 $child->{c_colspan} ||= 1;
1605 } 1630 }
1606 1631
1607 $self->SUPER::add (@widgets); 1632 $self->SUPER::add (@widgets);
1608} 1633}
1609 1634
1613 my @widgets; 1638 my @widgets;
1614 1639
1615 while (@_) { 1640 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1617 1642
1618 $child->{row} = $row; 1643 $child->{c_row} = $row;
1619 $child->{col} = $col; 1644 $child->{c_col} = $col;
1620 1645
1621 push @widgets, $child; 1646 push @widgets, $child;
1622 } 1647 }
1623 1648
1624 $self->add (@widgets); 1649 $self->add (@widgets);
1630 my (@w, @h); 1655 my (@w, @h);
1631 1656
1632 my @children = $self->children; 1657 my @children = $self->children;
1633 1658
1634 # first pass, columns 1659 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1660 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1661 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1662
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1663 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1664
1640 if ($w > $sw) { 1665 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1666 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1667 }
1643 } 1668 }
1644 1669
1645 # second pass, rows 1670 # second pass, rows
1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1673
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1675
1651 if ($h > $sh) { 1676 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1653 } 1678 }
1654 } 1679 }
1655 1680
1656 (\@w, \@h) 1681 (\@w, \@h)
1657} 1682}
1680 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1681 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1682 1707
1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1684 1709
1685 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1686 1711
1687 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1690 1715
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692 1717
1693 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1694 1719
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1722
1698 for my $widget ($self->children) { 1723 for my $widget ($self->children) {
1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1724 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1700 1725
1701 $widget->configure ( 1726 $widget->configure (
1702 $x[$c], $y[$r], 1727 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1704 ); 1729 );
1707 1 1732 1
1708} 1733}
1709 1734
1710############################################################################# 1735#############################################################################
1711 1736
1712package CFPlus::UI::Fixed; 1737package DC::UI::Fixed;
1713 1738
1714use List::Util qw(min max); 1739use List::Util qw(min max);
1715 1740
1716our @ISA = CFPlus::UI::Container::; 1741our @ISA = DC::UI::Container::;
1717 1742
1718sub _scale($$$) { 1743sub _scale($$$) {
1719 my ($rel, $val, $max) = @_; 1744 my ($rel, $val, $max) = @_;
1720 1745
1721 $rel ? $val * $max : $val 1746 $rel ? $val * $max : $val
1773 1 1798 1
1774} 1799}
1775 1800
1776############################################################################# 1801#############################################################################
1777 1802
1778package CFPlus::UI::Box; 1803package DC::UI::Box;
1779 1804
1780our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1781 1806
1782sub size_request { 1807sub size_request {
1783 my ($self) = @_; 1808 my ($self) = @_;
1784 1809
1785 my @children = $self->visible_children; 1810 my @children = $self->visible_children;
1820 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1821 for 0 .. $#children; 1846 for 0 .. $#children;
1822 } 1847 }
1823 } 1848 }
1824 1849
1825 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1826 1851
1827 my $pos = 0; 1852 my $pos = 0;
1828 for (0 .. $#children) { 1853 for (0 .. $#children) {
1829 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1855 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1835 1 1860 1
1836} 1861}
1837 1862
1838############################################################################# 1863#############################################################################
1839 1864
1840package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1841 1866
1842our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1843 1868
1844sub new { 1869sub new {
1845 my $class = shift; 1870 my $class = shift;
1846 1871
1847 $class->SUPER::new ( 1872 $class->SUPER::new (
1850 ) 1875 )
1851} 1876}
1852 1877
1853############################################################################# 1878#############################################################################
1854 1879
1855package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1856 1881
1857our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1858 1883
1859sub new { 1884sub new {
1860 my $class = shift; 1885 my $class = shift;
1861 1886
1862 $class->SUPER::new ( 1887 $class->SUPER::new (
1865 ) 1890 )
1866} 1891}
1867 1892
1868############################################################################# 1893#############################################################################
1869 1894
1870package CFPlus::UI::Label; 1895package DC::UI::Label;
1871 1896
1872our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1873 1898
1874use CFPlus::OpenGL; 1899use DC::OpenGL;
1875 1900
1876sub new { 1901sub new {
1877 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1878 1903
1879 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
1884 #text => initial text 1909 #text => initial text
1885 #markup => initial narkup 1910 #markup => initial narkup
1886 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1887 #style => 0, # render flags 1912 #style => 0, # render flags
1888 ellipsise => 3, # end 1913 ellipsise => 3, # end
1889 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1890 fontsize => 1, 1915 fontsize => 1,
1891 align => -1, 1916 align => 0.5,
1892 valign => -1, 1917 valign => 0.5,
1893 padding_x => 2, 1918 padding_x => 4,
1894 padding_y => 2, 1919 padding_y => 2,
1895 can_events => 0, 1920 can_events => 0,
1896 %arg 1921 %arg
1897 ); 1922 );
1898 1923
1899 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1900 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1901 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1902 $self->{template} = $layout; 1927 $self->{template} = $layout;
1903 } 1928 }
1904 1929
1905 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
1923 1948
1924 delete $self->{ox}; 1949 delete $self->{ox};
1925 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1926} 1951}
1927 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1928sub set_text { 1959sub set_text {
1929 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1930 1961
1931 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
1955 1986
1956sub size_request { 1987sub size_request {
1957 my ($self) = @_; 1988 my ($self) = @_;
1958 1989
1959 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1960 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1962 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1965 1998
1966 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1967 2000
1968 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1969 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
1970 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1972 2005
1973 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1974 2007
1975 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
2031 2064
2032 [$self->{layout}->size] 2065 [$self->{layout}->size]
2033 }; 2066 };
2034 2067
2035 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
2036 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2069 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2037 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2070 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2038 : ($self->{w} - $size->[0]) * 0.5);
2039 2071
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5);
2043 }; 2073 };
2044 2074
2045# unless ($self->{list}) { 2075# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2076# $self->{list} = DC::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2077# DC::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList; 2079# DC::OpenGL::glEndList;
2050# } 2080# }
2051# 2081#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2082# DC::OpenGL::glCallList $self->{list};
2053 2083
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2084 $self->{layout}->draw;
2055} 2085}
2056 2086
2057#sub destroy { 2087#sub destroy {
2058# my ($self) = @_; 2088# my ($self) = @_;
2059# 2089#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2090# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061# 2091#
2062# $self->SUPER::destroy; 2092# $self->SUPER::destroy;
2063#} 2093#}
2064 2094
2065############################################################################# 2095#############################################################################
2066 2096
2067package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
2068 2098
2069our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
2070 2100
2071use CFPlus::OpenGL; 2101use DC::OpenGL;
2072 2102
2073sub new { 2103sub new {
2074 my $class = shift; 2104 my $class = shift;
2075 2105
2076 $class->SUPER::new ( 2106 $class->SUPER::new (
2077 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1], 2109 outline => undef,
2080 active_bg => [0, 0, 1, .2], 2110 active_bg => [0, 0, 1, .2],
2081 active_fg => [1, 1, 1], 2111 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0], 2112 active_outline => [1, 1, 0],
2083 can_hover => 1, 2113 can_hover => 1,
2084 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
2085 valign => 0, 2116 valign => 0.5,
2086 can_events => 1, 2117 can_events => 1,
2087 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
2088 #text => ... 2121 #text => ...
2089 #hidden => "*", 2122 #hidden => "*",
2090 @_ 2123 @_
2091 ) 2124 )
2092} 2125}
2139 2172
2140 my $text = $self->get_text; 2173 my $text = $self->get_text;
2141 2174
2142 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2143 2176
2144 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2146 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2147 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2148 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2149 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2150 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2151 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2152 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2153 # what a hack 2186 # what a hack
2154 $self->{cursor} = 2187 $self->{cursor} =
2155 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2156 ? length $1 2189 ? length $1
2157 : 0; 2190 : 0;
2158 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2159 # uh, again 2192 # uh, again
2160 $self->{cursor} = 2193 $self->{cursor} =
2161 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2162 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2163 : length $self->{text}; 2196 : length $self->{text};
2227 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2228 } 2261 }
2229 2262
2230 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2232 glBegin GL_QUADS;
2233 glVertex 0 , 0;
2234 glVertex 0 , $self->{h};
2235 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2236 glVertex $self->{w}, 0;
2237 glEnd;
2238 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2239 2267
2240 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2241 2269
2242 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2277 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2250 } 2278 }
2251 2279
2252 glColor_premultiply @{$self->{active_fg}}; 2280 glColor_premultiply @{$self->{active_fg}};
2253 glBegin GL_LINES; 2281 glBegin GL_LINES;
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2256 glEnd; 2284 glEnd;
2257 2285
2258 glLineWidth 3; 2286 glLineWidth 3;
2259 glColor @{$self->{active_outline}}; 2287 glColor @{$self->{active_outline}};
2288 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2289 glLineWidth 1;
2290
2291 } else {
2292 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2260 glBegin GL_LINE_LOOP; 2293 glBegin GL_LINE_STRIP;
2261 glVertex 0, 0; 2294 glVertex .5, $self->{h} * .5;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h} - 1; 2295 glVertex .5, $self->{h} - 2.5;
2296 glVertex $self->{w} - .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} * .5;
2265 glEnd; 2298 glEnd;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2276 glEnd;
2277 } 2299 }
2278} 2300}
2279 2301
2280############################################################################# 2302#############################################################################
2281 2303
2282package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2283 2305
2284our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2285 2307
2286use CFPlus::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2287 2319
2288sub invoke_key_down { 2320sub invoke_key_down {
2289 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2290 2322
2291 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
2297 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2298 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2299 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2300 $self->update; 2332 $self->update;
2301 2333
2302 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2303 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2304 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2305 } 2337 }
2306 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2307 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
2309 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2310 } 2342 }
2311 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2312 } 2344 }
2313 2345
2314 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2315 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2317 2349
2318 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2319 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2320 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2321 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2322 } 2357 }
2323 2358
2324 } else { 2359 } else {
2325 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2326 } 2361 }
2328 1 2363 1
2329} 2364}
2330 2365
2331############################################################################# 2366#############################################################################
2332 2367
2333package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2334 2369
2335our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2336 2371
2337use CFPlus::OpenGL; 2372use DC::OpenGL;
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 padding_y => 4,
2379
2380 @_
2381 )
2382}
2338 2383
2339sub move_cursor_ver { 2384sub move_cursor_ver {
2340 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2341 2386
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343 2388
2344 $y += $dy; 2389 $line += $dy;
2345 2390
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2391 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2347 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2348 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2349 $self->update; 2394 $self->update;
2350 return; 2395 return;
2351 } 2396 }
2354sub invoke_key_down { 2399sub invoke_key_down {
2355 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2356 2401
2357 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2358 2403
2359 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2360 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2363 } else { 2408 } else {
2364 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2365 } 2410 }
2366 2411
2367 1 2412 1
2368} 2413}
2369 2414
2370############################################################################# 2415#############################################################################
2371 2416
2372package CFPlus::UI::ButtonBin; 2417package DC::UI::ButtonBin;
2373 2418
2374our @ISA = CFPlus::UI::Bin::; 2419our @ISA = DC::UI::Bin::;
2375 2420
2376use CFPlus::OpenGL; 2421use DC::OpenGL;
2377 2422
2378my @tex = 2423my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2380 qw(b1_button_inactive.png b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2381 2426
2382sub new { 2427sub new {
2383 my $class = shift; 2428 my $class = shift;
2384 2429
2385 $class->SUPER::new ( 2430 $class->SUPER::new (
2386 can_hover => 1, 2431 can_hover => 1,
2387 align => 0, 2432 align => 0.5,
2388 valign => 0, 2433 valign => 0.5,
2389 can_events => 1, 2434 can_events => 1,
2390 @_ 2435 @_
2391 ) 2436 )
2392} 2437}
2393 2438
2416 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2417} 2462}
2418 2463
2419############################################################################# 2464#############################################################################
2420 2465
2421package CFPlus::UI::Button; 2466package DC::UI::Button;
2422 2467
2423our @ISA = CFPlus::UI::Label::; 2468our @ISA = DC::UI::Label::;
2424 2469
2425use CFPlus::OpenGL; 2470use DC::OpenGL;
2426 2471
2427my @tex = 2472my @tex =
2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2429 qw(b1_button_inactive.png b1_button_active.png); 2474 qw(b1_button_inactive.png b1_button_active.png);
2430 2475
2431sub new { 2476sub new {
2432 my $class = shift; 2477 my $class = shift;
2433 2478
2434 $class->SUPER::new ( 2479 $class->SUPER::new (
2435 padding_x => 4, 2480 padding_x => 8,
2436 padding_y => 4, 2481 padding_y => 4,
2437 fg => [1.0, 1.0, 1.0], 2482 fg => [1.0, 1.0, 1.0],
2438 active_fg => [0.8, 0.8, 0.8], 2483 active_fg => [0.8, 0.8, 0.8],
2439 can_hover => 1, 2484 can_hover => 1,
2440 align => 0, 2485 align => 0.5,
2441 valign => 0, 2486 valign => 0.5,
2442 can_events => 1, 2487 can_events => 1,
2443 @_ 2488 @_
2444 ) 2489 )
2445} 2490}
2446 2491
2471 $self->SUPER::_draw; 2516 $self->SUPER::_draw;
2472} 2517}
2473 2518
2474############################################################################# 2519#############################################################################
2475 2520
2476package CFPlus::UI::CheckBox; 2521package DC::UI::CheckBox;
2477 2522
2478our @ISA = CFPlus::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2479 2524
2480my @tex = 2525my @tex =
2481 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2482 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2483 2528
2484use CFPlus::OpenGL; 2529use DC::OpenGL;
2485 2530
2486sub new { 2531sub new {
2487 my $class = shift; 2532 my $class = shift;
2488 2533
2489 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2490 padding_x => 2, 2536 padding_x => 2,
2491 padding_y => 2, 2537 padding_y => 2,
2492 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2493 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2494 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
2500} 2546}
2501 2547
2502sub size_request { 2548sub size_request {
2503 my ($self) = @_; 2549 my ($self) = @_;
2504 2550
2505 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2506} 2552}
2507 2553
2508sub toggle { 2554sub toggle {
2509 my ($self) = @_; 2555 my ($self) = @_;
2510 2556
2529sub _draw { 2575sub _draw {
2530 my ($self) = @_; 2576 my ($self) = @_;
2531 2577
2532 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2533 2579
2534 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2535 2581
2536 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2537 2583
2538 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2584 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2539 2585
2546 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2547} 2593}
2548 2594
2549############################################################################# 2595#############################################################################
2550 2596
2551package CFPlus::UI::Image; 2597package DC::UI::Image;
2552 2598
2553our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2554 2600
2555use CFPlus::OpenGL; 2601use DC::OpenGL;
2556 2602
2557our %texture_cache; 2603our %texture_cache;
2558 2604
2559sub new { 2605sub new {
2560 my $class = shift; 2606 my $class = shift;
2567 2613
2568 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2569 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2570 2616
2571 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2572 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2573 2619
2574 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2575 2621
2576 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2577 2623
2578 $self 2624 $self
2579} 2625}
2580 2626
2581sub STORABLE_freeze { 2627sub STORABLE_freeze {
2582 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2583 2629
2584 $self->{path} 2630 $self->{path}
2585 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2586 2632
2587 $self->{path} 2633 $self->{path}
2588} 2634}
2589 2635
2590sub STORABLE_attach { 2636sub STORABLE_attach {
2591 my ($self, $cloning, $path) = @_; 2637 my ($self, $cloning, $path) = @_;
2592 2638
2593 $self->new (path => $path) 2639 $self->new (path => $path)
2594} 2640}
2595 2641
2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2647}
2648
2596sub size_request { 2649sub size_request {
2597 my ($self) = @_; 2650 my ($self) = @_;
2598 2651
2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2600} 2653}
2601 2654
2602sub _draw { 2655sub _draw {
2603 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2604 2659
2605 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2606 2661
2607 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2608 2663
2621 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2622} 2677}
2623 2678
2624############################################################################# 2679#############################################################################
2625 2680
2626package CFPlus::UI::ImageButton; 2681package DC::UI::ImageButton;
2627 2682
2628our @ISA = CFPlus::UI::Image::; 2683our @ISA = DC::UI::Image::;
2629 2684
2630use CFPlus::OpenGL; 2685use DC::OpenGL;
2631
2632my %textures;
2633 2686
2634sub new { 2687sub new {
2635 my $class = shift; 2688 my $class = shift;
2636 2689
2637 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2638 padding_x => 4, 2691 padding_x => 4,
2639 padding_y => 4, 2692 padding_y => 4,
2640 fg => [1, 1, 1], 2693 fg => [1, 1, 1],
2641 active_fg => [0, 0, 1], 2694 active_fg => [0, 0, 1],
2642 can_hover => 1, 2695 can_hover => 1,
2643 align => 0, 2696 align => 0.5,
2644 valign => 0, 2697 valign => 0.5,
2645 can_events => 1, 2698 can_events => 1,
2646 @_ 2699 @_
2647 ); 2700 );
2648} 2701}
2649 2702
2703sub invoke_button_down {
2704 my ($self, $ev, $x, $y) = @_;
2705
2706 1
2707}
2708
2650sub invoke_button_up { 2709sub invoke_button_up {
2651 my ($self, $ev, $x, $y) = @_; 2710 my ($self, $ev, $x, $y) = @_;
2652 2711
2653 $self->emit ("activate") 2712 $self->emit ("activate")
2654 if $x >= 0 && $x < $self->{w} 2713 if $x >= 0 && $x < $self->{w}
2657 1 2716 1
2658} 2717}
2659 2718
2660############################################################################# 2719#############################################################################
2661 2720
2662package CFPlus::UI::VGauge; 2721package DC::UI::VGauge;
2663 2722
2664our @ISA = CFPlus::UI::Base::; 2723our @ISA = DC::UI::Base::;
2665 2724
2666use List::Util qw(min max); 2725use List::Util qw(min max);
2667 2726
2668use CFPlus::OpenGL; 2727use DC::OpenGL;
2669 2728
2670my %tex = ( 2729my %tex = (
2671 food => [ 2730 food => [
2672 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2673 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2674 ], 2733 ],
2675 grace => [ 2734 grace => [
2676 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2677 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2736 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2678 ], 2737 ],
2679 hp => [ 2738 hp => [
2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2681 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2682 ], 2741 ],
2683 mana => [ 2742 mana => [
2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2685 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2744 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2686 ], 2745 ],
2687); 2746);
2688 2747
2689# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
2792 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2793} 2852}
2794 2853
2795############################################################################# 2854#############################################################################
2796 2855
2856package DC::UI::Progress;
2857
2858our @ISA = DC::UI::Label::;
2859
2860use DC::OpenGL;
2861
2862sub new {
2863 my ($class, %arg) = @_;
2864
2865 my $self = $class->SUPER::new (
2866 padding_x => 2,
2867 padding_y => 2,
2868 fg => [1, 1, 1],
2869 bg => [0, 0, 1, 0.2],
2870 bar => [0.7, 0.5, 0.1, 0.8],
2871 outline => [0.4, 0.3, 0],
2872 fontsize => 0.9,
2873 valign => 0.5,
2874 align => 0.5,
2875 can_events => 1,
2876 ellipsise => 1,
2877 label => "%d%%",
2878 %arg,
2879 );
2880
2881 $self->set_value ($arg{value} || -1);
2882
2883 $self
2884}
2885
2886sub set_label {
2887 my ($self, $label) = @_;
2888
2889 return if $self->{label} eq $label;
2890 $self->{label} = $label;
2891
2892 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2893}
2894
2895sub set_value {
2896 my ($self, $value) = @_;
2897
2898 if ($self->{value} ne $value) {
2899 $self->{value} = $value;
2900
2901 if ($value < 0) {
2902 $self->set_text ("-");
2903 } else {
2904 $self->set_text (sprintf $self->{label}, $value * 100);
2905 }
2906
2907 $self->update;
2908 }
2909}
2910
2911sub _draw {
2912 my ($self) = @_;
2913
2914 glEnable GL_BLEND;
2915 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2916
2917 my $px = $self->{padding_x};
2918 my $py = $self->{padding_y};
2919
2920 if ($self->{value} >= 0) {
2921 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2922
2923 glColor_premultiply @{$self->{bar}};
2924 glRect $px, $py, $s, $self->{h} - $py;
2925 glColor_premultiply @{$self->{bg}};
2926 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2927 }
2928
2929 glColor_premultiply @{$self->{outline}};
2930
2931 $px -= .5;
2932 $py -= .5;
2933
2934 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2935
2936 glDisable GL_BLEND;
2937
2938 {
2939 local $self->{bg}; # do not draw background
2940 $self->SUPER::_draw;
2941 }
2942}
2943
2944#############################################################################
2945
2946package DC::UI::ExperienceProgress;
2947
2948our @ISA = DC::UI::Progress::;
2949
2950sub new {
2951 my ($class, %arg) = @_;
2952
2953 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2954
2955 my $self = $class->SUPER::new (
2956 %arg,
2957 tooltip => sub {
2958 my ($self) = @_;
2959
2960 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2961 $tt,
2962 $self->{lvl},
2963 ::formsep ($self->{exp}),
2964 ::formsep ($self->{nxt}),
2965 ::formsep ($self->{nxt} - $self->{exp}),
2966 $self->_percent * 100,
2967 },
2968 );
2969
2970 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2971 if $::CONN;
2972
2973 $self
2974}
2975
2976sub DESTROY {
2977 my ($self) = @_;
2978
2979 delete $::CONN->{on_exp_update}{$self+0}
2980 if $::CONN;
2981
2982 $self->SUPER::DESTROY;
2983}
2984
2985sub _percent {
2986 my ($self) = @_;
2987
2988 my $table = $::CONN && $::CONN->{exp_table}
2989 or return -1;
2990
2991 my $l0 = $table->[$self->{lvl} - 1];
2992 my $l1 = $table->[$self->{lvl}];
2993
2994 $self->{nxt} = $l1;
2995
2996 ($self->{exp} - $l0) / ($l1 - $l0)
2997}
2998
2999sub set_value {
3000 my ($self, $lvl, $exp) = @_;
3001
3002 $self->{lvl} = $lvl;
3003 $self->{exp} = $exp;
3004
3005 $self->SUPER::set_value ($self->_percent);
3006}
3007
3008#############################################################################
3009
2797package CFPlus::UI::Gauge; 3010package DC::UI::Gauge;
2798 3011
2799our @ISA = CFPlus::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2800 3013
2801sub new { 3014sub new {
2802 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2803 3016
2804 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
2806 can_hover => 1, 3019 can_hover => 1,
2807 can_events => 1, 3020 can_events => 1,
2808 %arg, 3021 %arg,
2809 ); 3022 );
2810 3023
2811 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3024 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2812 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3025 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2813 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3026 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2814 3027
2815 $self 3028 $self
2816} 3029}
2817 3030
2818sub set_fontsize { 3031sub set_fontsize {
2839 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2840} 3053}
2841 3054
2842############################################################################# 3055#############################################################################
2843 3056
2844package CFPlus::UI::Slider; 3057package DC::UI::Slider;
2845 3058
2846use strict; 3059use strict;
2847 3060
2848use CFPlus::OpenGL; 3061use DC::OpenGL;
2849 3062
2850our @ISA = CFPlus::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2851 3064
2852my @tex = 3065my @tex =
2853 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2854 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2855 3068
2856sub new { 3069sub new {
2857 my $class = shift; 3070 my $class = shift;
2858 3071
2895sub set_value { 3108sub set_value {
2896 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2897 3110
2898 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2899 3112
2900 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2901 3114
2902 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2903
2904 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2905 $value = $hi - $page if $value > $hi - $page;
2906 3117
2907 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2908 if $unit; 3119 if $unit;
2909 3120
2910 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2954sub invoke_mouse_wheel { 3165sub invoke_mouse_wheel {
2955 my ($self, $ev) = @_; 3166 my ($self, $ev) = @_;
2956 3167
2957 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3168 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2958 3169
2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3170 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2960 3171
2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3172 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2962 3173
2963 1 3174 1
2964} 3175}
2974 my ($self) = @_; 3185 my ($self) = @_;
2975 3186
2976 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
2977 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2978 3189
2979 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2980 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2981 3192
2982 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3193 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2983 3194
2984 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3195 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2985 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2986 3197
2987 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
3017 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
3018} 3229}
3019 3230
3020############################################################################# 3231#############################################################################
3021 3232
3022package CFPlus::UI::ValSlider; 3233package DC::UI::ValSlider;
3023 3234
3024our @ISA = CFPlus::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
3025 3236
3026sub new { 3237sub new {
3027 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
3028 3239
3029 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
3030 3241
3031 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
3032 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
3033 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3034 to_value => sub { shift }, 3245 to_value => sub { shift },
3035 from_value => sub { shift }, 3246 from_value => sub { shift },
3036 %arg, 3247 %arg,
3037 ); 3248 );
3038 3249
3058sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
3059sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
3060 3271
3061############################################################################# 3272#############################################################################
3062 3273
3063package CFPlus::UI::TextScroller; 3274package DC::UI::TextScroller;
3064 3275
3065our @ISA = CFPlus::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
3066 3277
3067use CFPlus::OpenGL; 3278use DC::OpenGL;
3068 3279
3069sub new { 3280sub new {
3070 my $class = shift; 3281 my $class = shift;
3071 3282
3072 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
3074 can_events => 1, 3285 can_events => 1,
3075 indent => 0, 3286 indent => 0,
3076 #font => default_font 3287 #font => default_font
3077 @_, 3288 @_,
3078 3289
3079 layout => (new CFPlus::Layout), 3290 layout => (new DC::Layout),
3080 par => [], 3291 par => [],
3081 max_par => 0, 3292 max_par => 0,
3082 height => 0, 3293 height => 0,
3083 children => [ 3294 children => [
3084 (new CFPlus::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
3085 (new CFPlus::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
3086 ], 3297 ],
3087 ); 3298 );
3088 3299
3089 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
3090 3301
3146 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3147 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
3148 3359
3149 $layout->set_shapes ( 3360 $layout->set_shapes (
3150 map 3361 map
3151 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3152 @{$para->{widget}} 3363 @{$para->{widget}}
3153 ); 3364 );
3154 3365
3155 $layout 3366 $layout
3156} 3367}
3273 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3274 $self->force_uptodate; 3485 $self->force_uptodate;
3275 3486
3276 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3277 3488
3278 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3279 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
3280 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
3281 3492
3282 package CFPlus::UI::Base; 3493 package DC::UI::Base;
3283 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3494 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3284 (0, 0, $self->{w}, $self->{h}); 3495 (0, 0, $self->{w}, $self->{h});
3285 3496
3286 my $top = int $self->{children}[1]{range}[0]; 3497 my $top = int $self->{children}[1]{range}[0];
3287 3498
3298 3509
3299 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
3300 my $layout = $self->get_layout ($para); 3511 my $layout = $self->get_layout ($para);
3301 3512
3302 $layout->render ($para->{indent}, $y - $y0); 3513 $layout->render ($para->{indent}, $y - $y0);
3514 $layout->draw;
3303 3515
3304 if (my @w = @{ $para->{widget} }) { 3516 if (my @w = @{ $para->{widget} }) {
3305 my @s = $layout->get_shapes; 3517 my @s = $layout->get_shapes;
3306 3518
3307 for (@w) { 3519 for (@w) {
3345 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
3346} 3558}
3347 3559
3348############################################################################# 3560#############################################################################
3349 3561
3350package CFPlus::UI::Animator; 3562package DC::UI::Animator;
3351 3563
3352use CFPlus::OpenGL; 3564use DC::OpenGL;
3353 3565
3354our @ISA = CFPlus::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
3355 3567
3356sub moveto { 3568sub moveto {
3357 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
3358 3570
3359 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3387 glPopMatrix; 3599 glPopMatrix;
3388} 3600}
3389 3601
3390############################################################################# 3602#############################################################################
3391 3603
3392package CFPlus::UI::Flopper; 3604package DC::UI::Flopper;
3393 3605
3394our @ISA = CFPlus::UI::Button::; 3606our @ISA = DC::UI::Button::;
3395 3607
3396sub new { 3608sub new {
3397 my $class = shift; 3609 my $class = shift;
3398 3610
3399 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
3411 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
3412} 3624}
3413 3625
3414############################################################################# 3626#############################################################################
3415 3627
3416package CFPlus::UI::Tooltip; 3628package DC::UI::Tooltip;
3417 3629
3418our @ISA = CFPlus::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
3419 3631
3420use CFPlus::OpenGL; 3632use DC::OpenGL;
3421 3633
3422sub new { 3634sub new {
3423 my $class = shift; 3635 my $class = shift;
3424 3636
3425 $class->SUPER::new ( 3637 $class->SUPER::new (
3429} 3641}
3430 3642
3431sub set_tooltip_from { 3643sub set_tooltip_from {
3432 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
3433 3645
3434 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3435 if $widget->{tooltip} =~ /^#(.*)$/;
3436
3437 my $tooltip = $widget->{tooltip}; 3646 my $tip = $widget->{tooltip};
3647 $tip = $tip->($widget) if "CODE" eq ref $tip;
3648
3649 $tip = DC::Pod::section_label tooltip => $1
3650 if $tip =~ /^#(.*)$/;
3438 3651
3439 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
3440 $tooltip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
3441 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3442 . "req $widget->{req_w} $widget->{req_h}\n" 3655 . "req $widget->{req_w} $widget->{req_h}\n"
3443 . "visible $widget->{visible}"; 3656 . "visible $widget->{visible}";
3444 } 3657 }
3445 3658
3446 $tooltip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
3447 $tooltip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
3448 3661
3449 $self->add (new CFPlus::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
3450 markup => $tooltip, 3664 markup => $tip,
3451 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
3452 fontsize => 0.8, 3667 fontsize => 0.8,
3453 style => 1, # FLAG_INVERSE 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3454 ellipsise => 0, 3669 ellipsise => 0,
3455 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
3456 ); 3671 );
3457} 3672}
3458 3673
3493} 3708}
3494 3709
3495sub _draw { 3710sub _draw {
3496 my ($self) = @_; 3711 my ($self) = @_;
3497 3712
3498 glTranslate 0.375, 0.375;
3499
3500 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
3501 3714
3502 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
3503 glRect 0, 0, $w, $h; 3716 glRect 0, 0, $w, $h;
3504 3717
3505 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
3506 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
3507 glVertex 0 , 0;
3508 glVertex 0 , $h;
3509 glVertex $w, $h;
3510 glVertex $w, 0;
3511 glEnd;
3512 3720
3513 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
3514 3722
3515 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
3516} 3724}
3517 3725
3518############################################################################# 3726#############################################################################
3519 3727
3520package CFPlus::UI::Face; 3728package DC::UI::Face;
3521 3729
3522our @ISA = CFPlus::UI::DrawBG::; 3730our @ISA = DC::UI::DrawBG::;
3523 3731
3524use CFPlus::OpenGL; 3732use DC::OpenGL;
3525 3733
3526sub new { 3734sub new {
3527 my $class = shift; 3735 my $class = shift;
3528 3736
3529 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
3532 aspect => 1, 3740 aspect => 1,
3533 can_events => 0, 3741 can_events => 0,
3534 @_, 3742 @_,
3535 ); 3743 );
3536 3744
3537 if ($self->{anim} && $self->{animspeed}) {
3538 CFPlus::weaken (my $widget = $self);
3539
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3542 $self->{timer} = Event->timer (
3543 parked => 1,
3544 cb => sub {
3545 return unless $::CONN && $widget;
3546
3547 ++$widget->{frame};
3548 $widget->update_face;
3549 $widget->update;
3550
3551 $widget->update_timer;
3552 },
3553 );
3554
3555 $self->update_face;
3556 $self->update_timer; 3745 $self->update_anim;
3557 }
3558 3746
3559 $self 3747 $self
3560} 3748}
3561 3749
3562sub update_timer { 3750sub update_timer {
3563 my ($self) = @_; 3751 my ($self) = @_;
3564 3752
3565 return unless $self->{timer}; 3753 return unless $self->{timer};
3566 3754
3567 if ($self->{visible}) { 3755 if ($self->{visible}) {
3568 $self->{timer}->at (
3569 $self->{anim_start}
3570 + $self->{animspeed}
3571 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572 );
3573 $self->{timer}->start; 3756 $self->{timer}->start;
3574 } else { 3757 } else {
3575 $self->{timer}->stop; 3758 $self->{timer}->stop;
3576 } 3759 }
3577} 3760}
3578 3761
3579sub update_face { 3762sub update_face {
3580 my ($self) = @_; 3763 my ($self) = @_;
3581 3764
3582 return unless $::CONN;
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3589 }
3590 }
3591}
3592
3593sub size_request {
3594 my ($self) = @_;
3595
3596 if ($::CONN) { 3765 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3766 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) { 3767 if ($anim && @$anim) {
3599 $self->{tex} = $tex; 3768 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3769 delete $self->{face_change_cb};
3601 } else { 3770
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3771 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3603 $self->realloc; 3772 unless ($tex->{name} || $tex->{loading}) {
3773 $tex->upload (sub { $self->reconfigure });
3774 }
3604 }); 3775 }
3605 } 3776 }
3606 } 3777 }
3607 } 3778 }
3779}
3780
3781sub update_anim {
3782 my ($self) = @_;
3783
3784 if ($self->{anim} && $self->{animspeed}) {
3785 DC::weaken (my $widget = $self);
3786
3787 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3788 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3789 return unless $::CONN;
3790
3791 my $w = $widget
3792 or return;
3793
3794 ++$w->{frame};
3795 $w->update_face;
3796
3797 # somehow, $widget can go away
3798 $w->update;
3799 $w->update_timer;
3800 };
3801
3802 $self->update_face;
3803 $self->update_timer;
3804 } else {
3805 delete $self->{timer};
3806 }
3807}
3808
3809sub size_request {
3810 my ($self) = @_;
3811
3812 if ($::CONN) {
3813 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3814 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3815 if ($tex->{name}) {
3816 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3817 } elsif (!$tex->{loading}) {
3818 $tex->upload (sub { $self->reconfigure });
3819 }
3820 }
3821
3822 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3823 }
3824 }
3608 3825
3609 ($self->{size_w} || 8, $self->{size_h} || 8) 3826 ($self->{size_w} || 8, $self->{size_h} || 8)
3610} 3827}
3611 3828
3612sub update { 3829sub update {
3613 my ($self) = @_; 3830 my ($self) = @_;
3614 3831
3615 return unless $self->{visible}; 3832 return unless $self->{visible};
3616 3833
3617 $self->SUPER::update; 3834 $self->SUPER::update;
3835}
3836
3837sub set_face {
3838 my ($self, $face) = @_;
3839
3840 $self->{face} = $face;
3841 $self->reconfigure;
3842}
3843
3844sub set_anim {
3845 my ($self, $anim) = @_;
3846
3847 $self->{anim} = $anim;
3848 $self->update_anim;
3849}
3850
3851sub set_animspeed {
3852 my ($self, $animspeed) = @_;
3853
3854 $self->{animspeed} = $animspeed;
3855 $self->update_anim;
3618} 3856}
3619 3857
3620sub invoke_visibility_change { 3858sub invoke_visibility_change {
3621 my ($self) = @_; 3859 my ($self) = @_;
3622 3860
3648 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3649} 3887}
3650 3888
3651############################################################################# 3889#############################################################################
3652 3890
3653package CFPlus::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3654 3892
3655our @ISA = CFPlus::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3656 3894
3657# TODO: should actually wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3658 3896
3659############################################################################# 3897#############################################################################
3660 3898
3661package CFPlus::UI::Menu; 3899package DC::UI::Menu;
3662 3900
3663our @ISA = CFPlus::UI::Toplevel::; 3901our @ISA = DC::UI::Toplevel::;
3664 3902
3665use CFPlus::OpenGL; 3903use DC::OpenGL;
3666 3904
3667sub new { 3905sub new {
3668 my $class = shift; 3906 my $class = shift;
3669 3907
3670 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3671 items => [], 3909 items => [],
3672 z => 100, 3910 z => 100,
3673 @_, 3911 @_,
3674 ); 3912 );
3675 3913
3676 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3677 3915
3678 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3679 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3680 3918
3681 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3682 if (!ref $widget) { 3920 if (!ref $widget) {
3683 if ($widget =~ /\t/) { 3921 if ($widget =~ /\t/) {
3684 my ($left, $right) = split /\t/, $widget, 2; 3922 my ($left, $right) = split /\t/, $widget, 2;
3685 3923
3686 $widget = new CFPlus::UI::HBox 3924 $widget = new DC::UI::HBox
3687 can_hover => 1, 3925 can_hover => 1,
3688 can_events => 1, 3926 can_events => 1,
3689 tooltip => $tooltip, 3927 tooltip => $tooltip,
3690 children => [ 3928 children => [
3691 (new CFPlus::UI::Label markup => $left, expand => 1), 3929 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3692 (new CFPlus::UI::Label markup => $right, align => +1), 3930 (new DC::UI::Label markup => $right, align => 1),
3693 ], 3931 ],
3694 ; 3932 ;
3695 3933
3696 } else { 3934 } else {
3697 $widget = new CFPlus::UI::Label 3935 $widget = new DC::UI::Label
3698 can_hover => 1, 3936 can_hover => 1,
3699 can_events => 1, 3937 can_events => 1,
3938 align => 0,
3700 markup => $widget, 3939 markup => $widget,
3701 tooltip => $tooltip; 3940 tooltip => $tooltip;
3702 } 3941 }
3703 } 3942 }
3704 3943
3719 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3720 $GRAB = $self; 3959 $GRAB = $self;
3721 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3722 3961
3723 $self->show; 3962 $self->show;
3724 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3963
3964 my $x = $ev->{x};
3965 my $y = $ev->{y};
3966
3967 $self->{root}->on_post_alloc ($self => sub {
3968 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3969 });
3970
3971 1 # so it can be used inside event handlers
3725} 3972}
3726 3973
3727sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3728 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3729 3976
3750 1 3997 1
3751} 3998}
3752 3999
3753############################################################################# 4000#############################################################################
3754 4001
3755package CFPlus::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3756 4003
3757our @ISA = CFPlus::UI::Container::; 4004our @ISA = DC::UI::Container::;
3758 4005
3759sub new { 4006sub new {
3760 my $class = shift; 4007 my $class = shift;
3761 4008
3762 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3763 @_, 4010 @_,
3764 ); 4011 );
3765 4012
3766 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3767 if @{ $self->{children} };
3768 4014
3769 $self 4015 $self
3770} 4016}
3771 4017
3772sub add { 4018sub add {
3773 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3774 4020
3775 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3776 4022
3777 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3778 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
3779} 4025}
3780 4026
3781sub get_current_page { 4027sub get_current_page {
3782 my ($self) = @_; 4028 my ($self) = @_;
3783 4029
3789 4035
3790 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3791 ? $page_or_widget 4037 ? $page_or_widget
3792 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3793 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3794 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3795 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3796 4045
3797 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3798 4048
3799 $self->realloc; 4049 $self->realloc;
3800} 4050}
3801 4051
3802sub visible_children { 4052sub visible_children {
3803 $_[0]{current} 4053 $_[0]{current} || ()
3804} 4054}
3805 4055
3806sub size_request { 4056sub size_request {
3807 my ($self) = @_; 4057 my ($self) = @_;
3808 4058
4059 $self->{current}
3809 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3810} 4062}
3811 4063
3812sub invoke_size_allocate { 4064sub invoke_size_allocate {
3813 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3814 4066
3815 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3816 4069
3817 1 4070 1
3818} 4071}
3819 4072
3820sub _draw { 4073sub _draw {
3821 my ($self) = @_; 4074 my ($self) = @_;
3822 4075
3823 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3824} 4078}
3825 4079
3826############################################################################# 4080#############################################################################
3827 4081
3828package CFPlus::UI::Notebook; 4082package DC::UI::Notebook;
3829 4083
4084use DC::OpenGL;
4085
3830our @ISA = CFPlus::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3831 4087
3832sub new { 4088sub new {
3833 my $class = shift; 4089 my $class = shift;
3834 4090
3835 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3836 buttonbar => (new CFPlus::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
4094 active_outline => [.7, .7, 0.2],
3838 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3839 @_, 4096 @_,
3840 ); 4097 );
3841 4098
3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4099 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3850 4107
3851 for my $child (@$widgets) { 4108 for my $child (@$widgets) {
3852 Scalar::Util::weaken $child; 4109 Scalar::Util::weaken $child;
3853 $child->{c_tab_} ||= do { 4110 $child->{c_tab_} ||= do {
3854 my $tab = 4111 my $tab =
3855 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4112 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
3856 ? $child->{c_tab} 4113 ? $child->{c_tab}
3857 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4114 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858 4115
3859 $tab->connect (activate => sub { 4116 $tab->connect (activate => sub {
3860 $wself->set_current_page ($child); 4117 $wself->set_current_page ($child);
3861 }); 4118 });
3862 4119
3894sub pages { 4151sub pages {
3895 my ($self) = @_; 4152 my ($self) = @_;
3896 $self->{multiplexer}->children 4153 $self->{multiplexer}->children
3897} 4154}
3898 4155
4156sub page_index {
4157 my ($self, $widget) = @_;
4158
4159 my $i = 0;
4160 for ($self->pages) {
4161 if ($_ eq $widget) { return $i };
4162 $i++;
4163 }
4164
4165 undef
4166}
4167
3899sub add_tab { 4168sub add_tab {
3900 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
3901 4170
3902 $title = [$title, $tooltip] unless ref $title; 4171 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title; 4172 $widget->{c_tab} = $title;
3916 4185
3917 $self->{multiplexer}->set_current_page ($page); 4186 $self->{multiplexer}->set_current_page ($page);
3918 $self->emit (page_changed => $self->{multiplexer}{current}); 4187 $self->emit (page_changed => $self->{multiplexer}{current});
3919} 4188}
3920 4189
4190sub _draw {
4191 my ($self) = @_;
4192
4193 $self->SUPER::_draw ();
4194
4195 if (my $cur = $self->{multiplexer}{current}) {
4196 if ($cur = $cur->{c_tab_}) {
4197 glTranslate $self->{buttonbar}{x} + $cur->{x},
4198 $self->{buttonbar}{y} + $cur->{y};
4199 glLineWidth 3;
4200 #glEnable GL_BLEND;
4201 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4202 glColor @{$self->{active_outline}};
4203 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4204 glLineWidth 1;
4205 #glDisable GL_BLEND;
4206 }
4207 }
4208}
4209
3921############################################################################# 4210#############################################################################
3922 4211
3923package CFPlus::UI::Selector; 4212package DC::UI::Selector;
3924 4213
3925use utf8; 4214use utf8;
3926 4215
3927our @ISA = CFPlus::UI::Button::; 4216our @ISA = DC::UI::Button::;
3928 4217
3929sub new { 4218sub new {
3930 my $class = shift; 4219 my $class = shift;
3931 4220
3932 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
3949 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
3950 4239
3951 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3952 } 4241 }
3953 4242
3954 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3955} 4244}
3956 4245
3957sub _set_value { 4246sub _set_value {
3958 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
3959 4248
3960 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4249 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4250 $item ||= $self->{options}[0]
3961 or return; 4251 or return;
3962 4252
3963 $self->{value} = $item->[0]; 4253 $self->{value} = $item->[0];
3964 $self->set_markup ("$item->[1] ⇓"); 4254 $self->set_markup ("$item->[1] ⇓");
3965 $self->set_tooltip ($item->[2]); 4255# $self->set_tooltip ($item->[2]);
3966} 4256}
3967 4257
3968sub set_value { 4258sub set_value {
3969 my ($self, $value) = @_; 4259 my ($self, $value) = @_;
3970 4260
3972 4262
3973 $self->_set_value ($value); 4263 $self->_set_value ($value);
3974 $self->emit (changed => $value); 4264 $self->emit (changed => $value);
3975} 4265}
3976 4266
4267sub set_options {
4268 my ($self, $options) = @_;
4269
4270 $self->{options} = $options;
4271 $self->_set_value ($self->{value});
4272}
4273
3977############################################################################# 4274#############################################################################
3978 4275
3979package CFPlus::UI::Statusbox; 4276package DC::UI::Statusbox;
3980 4277
3981our @ISA = CFPlus::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
3982 4279
3983sub new { 4280sub new {
3984 my $class = shift; 4281 my $class = shift;
3985 4282
3986 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
3987 fontsize => 0.8, 4284 fontsize => 0.8,
3988 @_, 4285 @_,
3989 ); 4286 );
3990 4287
3991 CFPlus::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
3992 4289
3993 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3994 4291
3995 $self 4292 $self
3996} 4293}
3997 4294
3998sub reorder { 4295sub reorder {
3999 my ($self) = @_; 4296 my ($self) = @_;
4000 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
4001 4298
4002 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
4003 return if $CFPlus::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
4004 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4005 values %{ $self->{item} }; 4302 values %{ $self->{item} };
4006 4303
4007 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
4008 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4009 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
4010 4309
4011 my @widgets; 4310 my @widgets;
4012 4311
4013 my @items = sort { 4312 my @items = sort {
4014 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
4015 or $b->{id} <=> $a->{id} 4314 or $b->{id} <=> $a->{id}
4016 } values %{ $self->{item} }; 4315 } values %{ $self->{item} };
4017
4018 $self->{timer}->interval (1);
4019 4316
4020 my $count = 10 + 1; 4317 my $count = 10 + 1;
4021 for my $item (@items) { 4318 for my $item (@items) {
4022 last unless --$count; 4319 last unless --$count;
4023 4320
4030 for ($short) { 4327 for ($short) {
4031 s/^\s+//; 4328 s/^\s+//;
4032 s/\s+/ /g; 4329 s/\s+/ /g;
4033 } 4330 }
4034 4331
4035 new CFPlus::UI::Label 4332 new DC::UI::Label
4036 markup => $short, 4333 markup => $short,
4037 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
4038 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
4039 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
4040 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
4041 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
4042 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
4043 can_events => 1, 4341 can_events => 1,
4044 can_hover => 1 4342 can_hover => 1
4045 }; 4343 };
4046 4344
4047 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4345 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4048 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4346 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4049 $label->update; 4347 $label->update;
4050 $label->set_max_size (undef, $label->{req_h} * $diff) 4348 $label->set_max_size (undef, $label->{req_h} * $diff)
4051 if $diff < 1; 4349 if $diff < 1;
4052 $self->{timer}->interval (1/30); 4350 $self->{timer}->set (1/30, 1/30);
4053 } else { 4351 } else {
4054 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
4055 } 4353 }
4056 4354
4057 push @widgets, $label; 4355 push @widgets, $label;
4058 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
4059 4361
4060 $self->clear; 4362 $self->clear;
4061 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
4062} 4364}
4063 4365
4119 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
4120} 4422}
4121 4423
4122############################################################################# 4424#############################################################################
4123 4425
4124package CFPlus::UI::Root; 4426package DC::UI::Root;
4125 4427
4126our @ISA = CFPlus::UI::Container::; 4428our @ISA = DC::UI::Container::;
4127 4429
4128use List::Util qw(min max); 4430use List::Util qw(min max);
4129 4431
4130use CFPlus::OpenGL; 4432use DC::OpenGL;
4131 4433
4132sub new { 4434sub new {
4133 my $class = shift; 4435 my $class = shift;
4134 4436
4135 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
4136 visible => 1, 4438 visible => 1,
4137 @_, 4439 @_,
4138 ); 4440 );
4139 4441
4140 CFPlus::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
4141 4443
4142 $self 4444 $self
4143} 4445}
4144 4446
4145sub size_request { 4447sub size_request {
4193} 4495}
4194 4496
4195sub update { 4497sub update {
4196 my ($self) = @_; 4498 my ($self) = @_;
4197 4499
4198 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
4199} 4501}
4200 4502
4201sub add { 4503sub add {
4202 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
4203 4505
4270 4572
4271 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
4272 4574
4273 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
4274 4576
4275 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
4276 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4578 $h += $widget->{padding_y} * 2;
4579
4580 $w = max $widget->{min_w}, $w;
4581 $h = max $widget->{min_h}, $h;
4277 4582
4278 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4279 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4280 4585
4281 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
4348 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4349 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
4350 glLoadIdentity; 4655 glLoadIdentity;
4351 4656
4352 { 4657 {
4353 package CFPlus::UI::Base; 4658 package DC::UI::Base;
4354 4659
4355 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4356 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
4357 4662
4358 $self->_draw; 4663 $self->_draw;
4359 } 4664 }
4360} 4665}
4361 4666
4362############################################################################# 4667#############################################################################
4363 4668
4364package CFPlus::UI; 4669package DC::UI;
4365 4670
4366$ROOT = new CFPlus::UI::Root; 4671$ROOT = new DC::UI::Root;
4367$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
4368 4673
43691 46741
4370

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines