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.412 by root, Sun Jul 22 20:08:17 2007 UTC vs.
Revision 1.474 by root, Sun Jan 11 22:11:23 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 { __widget_ref__ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
… …
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
… …
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
… …
364 $self->{force_h} = $h; 369 $self->{force_h} = $h;
365 370
366 $self->realloc; 371 $self->realloc;
367} 372}
368 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
372} 395}
373 396
… …
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
… …
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
… …
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
… …
605} 628}
606 629
607sub DESTROY { 630sub DESTROY {
608 my ($self) = @_; 631 my ($self) = @_;
609 632
610 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
611 634
635 local $@;
612 eval { $self->destroy }; 636 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 638
615 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
616} 640}
617 641
618############################################################################# 642#############################################################################
619 643
620package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
621 645
622our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
623 647
624use strict; 648use 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 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 669 my ($w, $h) = @$self{qw(w h)};
648 670
649 glEnable GL_BLEND; 671 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 673 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 674 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 675 glDisable GL_BLEND;
661 } 676 }
662} 677}
663 678
664############################################################################# 679#############################################################################
665 680
666package CFPlus::UI::Empty; 681package DC::UI::Empty;
667 682
668our @ISA = CFPlus::UI::Base::; 683our @ISA = DC::UI::Base::;
669 684
670sub new { 685sub new {
671 my ($class, %arg) = @_; 686 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 687 $class->SUPER::new (can_events => 0, %arg);
673} 688}
… …
680 695
681sub draw { } 696sub draw { }
682 697
683############################################################################# 698#############################################################################
684 699
685package CFPlus::UI::Container; 700package DC::UI::Container;
686 701
687our @ISA = CFPlus::UI::Base::; 702our @ISA = DC::UI::Base::;
688 703
689sub new { 704sub new {
690 my ($class, %arg) = @_; 705 my ($class, %arg) = @_;
691 706
692 my $children = delete $arg{children}; 707 my $children = delete $arg{children};
… …
725 @{$self->{children}}, @widgets 740 @{$self->{children}}, @widgets
726 ]; 741 ];
727 742
728 $self->realloc; 743 $self->realloc;
729 744
745 $self->emit (c_add => \@widgets);
746
730 map $_+0, @widgets 747 map $_+0, @widgets
731} 748}
732 749
733sub children { 750sub children {
734 @{ $_[0]{children} } 751 @{ $_[0]{children} }
735} 752}
736 753
737sub remove { 754sub remove {
738 my ($self, $child) = @_; 755 my ($self, @widgets) = @_;
739 756
757 $self->emit (c_remove => \@widgets);
758
759 for my $child (@widgets) {
740 delete $child->{parent}; 760 delete $child->{parent};
741 $child->hide; 761 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 762 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
763 }
744 764
745 $self->realloc; 765 $self->realloc;
746} 766}
747 767
748sub clear { 768sub clear {
… …
776} 796}
777 797
778sub _draw { 798sub _draw {
779 my ($self) = @_; 799 my ($self) = @_;
780 800
781 $_->draw for @{$self->{children}}; 801 $_->draw for $self->visible_children;
782} 802}
783 803
784############################################################################# 804#############################################################################
785 805
786package CFPlus::UI::Bin; 806package DC::UI::Bin;
787 807
788our @ISA = CFPlus::UI::Container::; 808our @ISA = DC::UI::Container::;
789 809
790sub new { 810sub new {
791 my ($class, %arg) = @_; 811 my ($class, %arg) = @_;
792 812
793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 813 my $child = (delete $arg{child}) || new DC::UI::Empty::;
794 814
795 $class->SUPER::new (children => [$child], %arg) 815 $class->SUPER::new (children => [$child], %arg)
796} 816}
797 817
798sub add { 818sub add {
799 my ($self, $child) = @_; 819 my ($self, $child) = @_;
800 820
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 821 $self->clear;
802 $self->SUPER::add ($child); 822 $self->SUPER::add ($child);
803} 823}
804 824
805sub remove { 825sub remove {
806 my ($self, $widget) = @_; 826 my ($self, $widget) = @_;
807 827
808 $self->SUPER::remove ($widget); 828 $self->SUPER::remove ($widget);
809 829
810 $self->{children} = [new CFPlus::UI::Empty] 830 $self->{children} = [new DC::UI::Empty]
811 unless @{$self->{children}}; 831 unless @{$self->{children}};
812} 832}
813 833
814sub child { $_[0]->{children}[0] } 834sub child { $_[0]->{children}[0] }
815 835
… …
824 844
825 1 845 1
826} 846}
827 847
828############################################################################# 848#############################################################################
829
830# back-buffered drawing area 849# back-buffered drawing area
831 850
832package CFPlus::UI::Window; 851package DC::UI::Window;
833 852
834our @ISA = CFPlus::UI::Bin::; 853our @ISA = DC::UI::Bin::;
835 854
836use CFPlus::OpenGL; 855use DC::OpenGL;
837 856
838sub new { 857sub new {
839 my ($class, %arg) = @_; 858 my ($class, %arg) = @_;
840 859
841 my $self = $class->SUPER::new (%arg); 860 my $self = $class->SUPER::new (%arg);
… …
863} 882}
864 883
865sub render_child { 884sub render_child {
866 my ($self) = @_; 885 my ($self) = @_;
867 886
868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 887 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869 glClearColor 0, 0, 0, 0; 888 glClearColor 0, 0, 0, 0;
870 glClear GL_COLOR_BUFFER_BIT; 889 glClear GL_COLOR_BUFFER_BIT;
871 890
872 { 891 {
873 package CFPlus::UI::Base; 892 package DC::UI::Base;
874 893
875 local ($draw_x, $draw_y, $draw_w, $draw_h) = 894 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h}); 895 (0, 0, $self->{w}, $self->{h});
877 896
878 $self->_render; 897 $self->_render;
… …
895 glDisable GL_TEXTURE_2D; 914 glDisable GL_TEXTURE_2D;
896} 915}
897 916
898############################################################################# 917#############################################################################
899 918
900package CFPlus::UI::ViewPort; 919package DC::UI::ViewPort;
901 920
902use List::Util qw(min max); 921use List::Util qw(min max);
903 922
904our @ISA = CFPlus::UI::Window::; 923our @ISA = DC::UI::Window::;
905 924
906sub new { 925sub new {
907 my $class = shift; 926 my $class = shift;
908 927
909 $class->SUPER::new ( 928 $class->SUPER::new (
… …
951 $self->emit (changed => $x, $y); 970 $self->emit (changed => $x, $y);
952 $self->update; 971 $self->update;
953 } 972 }
954} 973}
955 974
975sub set_center {
976 my ($self, $x, $y) = @_;
977
978 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
979}
980
981sub make_visible {
982 my ($self, $x, $y, $border) = @_;
983
984 if ( $x < $self->{view_x} + $self->{w} * $border
985 || $x > $self->{view_x} + $self->{w} * (1 - $border)
986 || $y < $self->{view_y} + $self->{h} * $border
987 || $y > $self->{view_y} + $self->{h} * (1 - $border)
988 ) {
989 $self->set_center ($x, $y);
990 }
991}
992
956# hmm, this does not work for topleft of $self... but we should not ask for that 993# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 994sub coord2local {
958 my ($self, $x, $y) = @_; 995 my ($self, $x, $y) = @_;
959 996
960 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 997 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1012 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1013 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
977 ) { 1014 ) {
978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1015 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979 } else { 1016 } else {
980 $self->CFPlus::UI::Base::find_widget ($x, $y) 1017 $self->DC::UI::Base::find_widget ($x, $y)
981 } 1018 }
982} 1019}
983 1020
984sub _render { 1021sub _render {
985 my ($self) = @_; 1022 my ($self) = @_;
986 1023
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1024 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1025 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989 1026
990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1027 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991 1028
992 $self->SUPER::_render; 1029 $self->SUPER::_render;
993} 1030}
994 1031
995############################################################################# 1032#############################################################################
996 1033
997package CFPlus::UI::ScrolledWindow; 1034package DC::UI::ScrolledWindow;
998 1035
999our @ISA = CFPlus::UI::Table::; 1036our @ISA = DC::UI::Table::;
1000 1037
1001sub new { 1038sub new {
1002 my ($class, %arg) = @_; 1039 my ($class, %arg) = @_;
1003 1040
1004 my $child = delete $arg{child}; 1041 my $child = delete $arg{child};
1005 1042
1006 my $self; 1043 my $self;
1007 1044
1008 my $hslider = new CFPlus::UI::Slider 1045 my $hslider = new DC::UI::Slider
1009 col => 0, 1046 c_col => 0,
1010 row => 1, 1047 c_row => 1,
1011 vertical => 0, 1048 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1050 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1051 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1053 },
1017 ; 1054 ;
1018 1055
1019 my $vslider = new CFPlus::UI::Slider 1056 my $vslider = new DC::UI::Slider
1020 col => 1, 1057 c_col => 1,
1021 row => 0, 1058 c_row => 0,
1022 vertical => 1, 1059 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1061 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1062 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1036 col_expand => [1, 0], 1073 col_expand => [1, 0],
1037 row_expand => [1, 0], 1074 row_expand => [1, 0],
1038 %arg, 1075 %arg,
1039 ); 1076 );
1040 1077
1041 $self->{vp} = new CFPlus::UI::ViewPort 1078 $self->{vp} = new DC::UI::ViewPort
1042 col => 0, 1079 c_col => 0,
1043 row => 0, 1080 c_row => 0,
1044 expand => 1, 1081 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1082 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1083 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1084 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1085 my ($vp, $x, $y) = @_;
… …
1070 my ($self, $widget) = @_; 1107 my ($self, $widget) = @_;
1071 1108
1072 $self->{vp}->add ($self->{child} = $widget); 1109 $self->{vp}->add ($self->{child} = $widget);
1073} 1110}
1074 1111
1112sub set_offset { shift->{vp}->set_offset (@_) }
1113sub set_center { shift->{vp}->set_center (@_) }
1114sub make_visible { shift->{vp}->make_visible (@_) }
1115
1075sub update_slider { 1116sub update_slider {
1076 my ($self) = @_; 1117 my ($self) = @_;
1077 1118
1078 my $child = ($self->{vp} or return)->child; 1119 my $child = ($self->{vp} or return)->child;
1079 1120
… …
1168 $self->SUPER::invoke_size_allocate ($w, $h) 1209 $self->SUPER::invoke_size_allocate ($w, $h)
1169} 1210}
1170 1211
1171############################################################################# 1212#############################################################################
1172 1213
1173package CFPlus::UI::Frame; 1214package DC::UI::Frame;
1174 1215
1175our @ISA = CFPlus::UI::Bin::; 1216our @ISA = DC::UI::Bin::;
1176 1217
1177use CFPlus::OpenGL; 1218use DC::OpenGL;
1178 1219
1179sub new { 1220sub new {
1180 my $class = shift; 1221 my $class = shift;
1181 1222
1182 $class->SUPER::new ( 1223 $class->SUPER::new (
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1233 my ($w, $h) = @$self{qw(w h)};
1193 1234
1194 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1237 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1238 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1239 glDisable GL_BLEND;
1206 } 1240 }
1207 1241
1208 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1209} 1243}
1210 1244
1211############################################################################# 1245#############################################################################
1212 1246
1213package CFPlus::UI::FancyFrame; 1247package DC::UI::FancyFrame;
1214 1248
1215our @ISA = CFPlus::UI::Bin::; 1249our @ISA = DC::UI::Bin::;
1216 1250
1217use CFPlus::OpenGL; 1251use DC::OpenGL;
1218 1252
1219sub new { 1253sub new {
1220 my ($class, %arg) = @_; 1254 my ($class, %arg) = @_;
1221 1255
1222 if ((exists $arg{label}) && !ref $arg{label}) { 1256 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label 1257 $arg{label} = new DC::UI::Label
1224 align => 1, 1258 align => 1,
1225 valign => 0, 1259 valign => 0.5,
1226 text => $arg{label}, 1260 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75; 1261 fontsize => ($arg{border} || 0.8) * 0.75;
1228 } 1262 }
1229 1263
1230 my $self = $class->SUPER::new ( 1264 my $self = $class->SUPER::new (
1231 # label => "", 1265 # label => "",
1232 fg => [0.6, 0.3, 0.1], 1266 fg => undef,
1233 border => 0.8, 1267 border => 0.8,
1234 style => 'single', 1268 style => 'single',
1235 %arg, 1269 %arg,
1236 ); 1270 );
1237 1271
… …
1240 1274
1241sub add { 1275sub add {
1242 my ($self, @widgets) = @_; 1276 my ($self, @widgets) = @_;
1243 1277
1244 $self->SUPER::add (@widgets); 1278 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1279 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246} 1280}
1247 1281
1248sub border { 1282sub border {
1249 int $_[0]{border} * $::FONTSIZE 1283 int $_[0]{border} * $::FONTSIZE
1250} 1284}
… …
1290 my $border = $self->border; 1324 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h}); 1325 my ($w, $h) = ($self->{w}, $self->{h});
1292 1326
1293 $child->draw; 1327 $child->draw;
1294 1328
1295 glColor @{$self->{fg}}; 1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296 glBegin GL_LINE_STRIP; 1330 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1308 } 1342 }
1309} 1343}
1310 1344
1311############################################################################# 1345#############################################################################
1312 1346
1313package CFPlus::UI::Toplevel; 1347package DC::UI::Toplevel;
1314 1348
1315our @ISA = CFPlus::UI::Bin::; 1349our @ISA = DC::UI::Bin::;
1316 1350
1317use CFPlus::OpenGL; 1351use DC::OpenGL;
1318 1352
1319my $bg = 1353my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1321 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1322 1356
1323my @border = 1357my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1358 map { new_from_resource DC::Texture $_, mipmap => 1 }
1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326 1360
1327my @icon = 1361my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png); 1363 qw(x1_move.png x1_resize.png);
1330 1364
1331sub new { 1365sub new {
1332 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1333 1367
1334 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1337 border => 0.6, 1371 border => 0.8,
1338 can_events => 1, 1372 can_events => 1,
1339 min_w => 64, 1373 min_w => 64,
1340 min_h => 32, 1374 min_h => 32,
1341 %arg, 1375 %arg,
1342 ); 1376 );
1343 1377
1344 $self->{title_widget} = new CFPlus::UI::Label 1378 $self->{title_widget} = new DC::UI::Label
1345 align => 0, 1379 align => 0.5,
1346 valign => 1, 1380 valign => 1,
1347 text => $self->{title}, 1381 text => $self->{title},
1348 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1349 if exists $self->{title}; 1383 if exists $self->{title};
1350 1384
1351 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1352 $self->{close_button} = 1386 $self->{close_button} =
1353 new CFPlus::UI::ImageButton 1387 new DC::UI::ImageButton
1354 path => 'x1_close.png', 1388 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") }; 1389 on_activate => sub { $self->emit ("delete") };
1356 1390
1357 $self->CFPlus::UI::Container::add ($self->{close_button}); 1391 $self->DC::UI::Container::add ($self->{close_button});
1358 } 1392 }
1359 1393
1360 $self 1394 $self
1361} 1395}
1362 1396
1363sub add { 1397sub add {
1364 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1365 1399
1366 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1401 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1402 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369} 1403}
1370 1404
1371sub border { 1405sub border {
1372 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1407}
1408
1409sub get_max_wh {
1410 my ($self) = @_;
1411
1412 return ($self->{w}, $self->{h})
1413 if $self->{visible} && $self->{w};
1414
1415 $self->SUPER::get_max_wh
1373} 1416}
1374 1417
1375sub size_request { 1418sub size_request {
1376 my ($self) = @_; 1419 my ($self) = @_;
1377 1420
… …
1502 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504 1547
1505 my $border = $self->border; 1548 my $border = $self->border;
1506 1549
1550 if ($border) {
1507 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512 1556
1513 # move 1557 # move
1514 my $w2 = ($w - $border) * .5; 1558 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5; 1559 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519 1563
1520 # resize 1564 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button}; 1567 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1526 1571
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1529 1574
1530 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
… …
1549 if $self->{close_button}; 1594 if $self->{close_button};
1550} 1595}
1551 1596
1552############################################################################# 1597#############################################################################
1553 1598
1554package CFPlus::UI::Table; 1599package DC::UI::Table;
1555 1600
1556our @ISA = CFPlus::UI::Container::; 1601our @ISA = DC::UI::Container::;
1557 1602
1558use List::Util qw(max sum); 1603use List::Util qw(max sum);
1559 1604
1560use CFPlus::OpenGL; 1605use DC::OpenGL;
1561 1606
1562sub new { 1607sub new {
1563 my $class = shift; 1608 my $class = shift;
1564 1609
1565 $class->SUPER::new ( 1610 $class->SUPER::new (
… …
1571 1616
1572sub add { 1617sub add {
1573 my ($self, @widgets) = @_; 1618 my ($self, @widgets) = @_;
1574 1619
1575 for my $child (@widgets) { 1620 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1621 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1622 $child->{c_colspan} ||= 1;
1578 } 1623 }
1579 1624
1580 $self->SUPER::add (@widgets); 1625 $self->SUPER::add (@widgets);
1581} 1626}
1582 1627
… …
1586 my @widgets; 1631 my @widgets;
1587 1632
1588 while (@_) { 1633 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1634 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1635
1591 $child->{row} = $row; 1636 $child->{c_row} = $row;
1592 $child->{col} = $col; 1637 $child->{c_col} = $col;
1593 1638
1594 push @widgets, $child; 1639 push @widgets, $child;
1595 } 1640 }
1596 1641
1597 $self->add (@widgets); 1642 $self->add (@widgets);
… …
1603 my (@w, @h); 1648 my (@w, @h);
1604 1649
1605 my @children = $self->children; 1650 my @children = $self->children;
1606 1651
1607 # first pass, columns 1652 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1653 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1654 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1655
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1656 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1657
1613 if ($w > $sw) { 1658 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1659 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1660 }
1616 } 1661 }
1617 1662
1618 # second pass, rows 1663 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1664 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1665 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1666
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1667 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1668
1624 if ($h > $sh) { 1669 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1670 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626 } 1671 }
1627 } 1672 }
1628 1673
1629 (\@w, \@h) 1674 (\@w, \@h)
1630} 1675}
… …
1653 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1654 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1655 1700
1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657 1702
1658 CFPlus::UI::harmonize $ws; 1703 DC::UI::harmonize $ws;
1659 1704
1660 my @row_expand = @{$self->{row_expand}}; 1705 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand; 1706 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1; 1707 my $row_expand = (sum @row_expand) || 1;
1663 1708
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665 1710
1666 CFPlus::UI::harmonize $hs; 1711 DC::UI::harmonize $hs;
1667 1712
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1713 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1714 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1715
1671 for my $widget ($self->children) { 1716 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1717 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1718
1674 $widget->configure ( 1719 $widget->configure (
1675 $x[$c], $y[$r], 1720 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1721 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1722 );
… …
1680 1 1725 1
1681} 1726}
1682 1727
1683############################################################################# 1728#############################################################################
1684 1729
1685package CFPlus::UI::Fixed; 1730package DC::UI::Fixed;
1686 1731
1687use List::Util qw(min max); 1732use List::Util qw(min max);
1688 1733
1689our @ISA = CFPlus::UI::Container::; 1734our @ISA = DC::UI::Container::;
1690 1735
1691sub _scale($$$) { 1736sub _scale($$$) {
1692 my ($rel, $val, $max) = @_; 1737 my ($rel, $val, $max) = @_;
1693 1738
1694 $rel ? $val * $max : $val 1739 $rel ? $val * $max : $val
… …
1746 1 1791 1
1747} 1792}
1748 1793
1749############################################################################# 1794#############################################################################
1750 1795
1751package CFPlus::UI::Box; 1796package DC::UI::Box;
1752 1797
1753our @ISA = CFPlus::UI::Container::; 1798our @ISA = DC::UI::Container::;
1754 1799
1755sub size_request { 1800sub size_request {
1756 my ($self) = @_; 1801 my ($self) = @_;
1802
1803 my @children = $self->visible_children;
1757 1804
1758 $self->{vertical} 1805 $self->{vertical}
1759 ? ( 1806 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1807 (List::Util::max map $_->{req_w}, @children),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1808 (List::Util::sum map $_->{req_h}, @children),
1762 ) 1809 )
1763 : ( 1810 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1811 (List::Util::sum map $_->{req_w}, @children),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1812 (List::Util::max map $_->{req_h}, @children),
1766 ) 1813 )
1767} 1814}
1768 1815
1769sub invoke_size_allocate { 1816sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_; 1817 my ($self, $w, $h) = @_;
… …
1791 $req[$_] += $space * $children[$_]{expand} 1838 $req[$_] += $space * $children[$_]{expand}
1792 for 0 .. $#children; 1839 for 0 .. $#children;
1793 } 1840 }
1794 } 1841 }
1795 1842
1796 CFPlus::UI::harmonize \@req; 1843 DC::UI::harmonize \@req;
1797 1844
1798 my $pos = 0; 1845 my $pos = 0;
1799 for (0 .. $#children) { 1846 for (0 .. $#children) {
1800 my $alloc = $req[$_]; 1847 my $alloc = $req[$_];
1801 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1848 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1806 1 1853 1
1807} 1854}
1808 1855
1809############################################################################# 1856#############################################################################
1810 1857
1811package CFPlus::UI::HBox; 1858package DC::UI::HBox;
1812 1859
1813our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1814 1861
1815sub new { 1862sub new {
1816 my $class = shift; 1863 my $class = shift;
1817 1864
1818 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1821 ) 1868 )
1822} 1869}
1823 1870
1824############################################################################# 1871#############################################################################
1825 1872
1826package CFPlus::UI::VBox; 1873package DC::UI::VBox;
1827 1874
1828our @ISA = CFPlus::UI::Box::; 1875our @ISA = DC::UI::Box::;
1829 1876
1830sub new { 1877sub new {
1831 my $class = shift; 1878 my $class = shift;
1832 1879
1833 $class->SUPER::new ( 1880 $class->SUPER::new (
… …
1836 ) 1883 )
1837} 1884}
1838 1885
1839############################################################################# 1886#############################################################################
1840 1887
1841package CFPlus::UI::Label; 1888package DC::UI::Label;
1842 1889
1843our @ISA = CFPlus::UI::DrawBG::; 1890our @ISA = DC::UI::DrawBG::;
1844 1891
1845use CFPlus::OpenGL; 1892use DC::OpenGL;
1846 1893
1847sub new { 1894sub new {
1848 my ($class, %arg) = @_; 1895 my ($class, %arg) = @_;
1849 1896
1850 my $self = $class->SUPER::new ( 1897 my $self = $class->SUPER::new (
… …
1855 #text => initial text 1902 #text => initial text
1856 #markup => initial narkup 1903 #markup => initial narkup
1857 #max_w => maximum pixel width 1904 #max_w => maximum pixel width
1858 #style => 0, # render flags 1905 #style => 0, # render flags
1859 ellipsise => 3, # end 1906 ellipsise => 3, # end
1860 layout => (new CFPlus::Layout), 1907 layout => (new DC::Layout),
1861 fontsize => 1, 1908 fontsize => 1,
1862 align => -1, 1909 align => 0.5,
1863 valign => -1, 1910 valign => 0.5,
1864 padding_x => 2, 1911 padding_x => 4,
1865 padding_y => 2, 1912 padding_y => 2,
1866 can_events => 0, 1913 can_events => 0,
1867 %arg 1914 %arg
1868 ); 1915 );
1869 1916
1870 if (exists $self->{template}) { 1917 if (exists $self->{template}) {
1871 my $layout = new CFPlus::Layout; 1918 my $layout = new DC::Layout;
1872 $layout->set_text (delete $self->{template}); 1919 $layout->set_text (delete $self->{template});
1873 $self->{template} = $layout; 1920 $self->{template} = $layout;
1874 } 1921 }
1875 1922
1876 if (exists $self->{markup}) { 1923 if (exists $self->{markup}) {
… …
1894 1941
1895 delete $self->{ox}; 1942 delete $self->{ox};
1896 $self->SUPER::realloc; 1943 $self->SUPER::realloc;
1897} 1944}
1898 1945
1946sub clear {
1947 my ($self) = @_;
1948
1949 $self->set_text ("");
1950}
1951
1899sub set_text { 1952sub set_text {
1900 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1901 1954
1902 return if $self->{text} eq "T$text"; 1955 return if $self->{text} eq "T$text";
1903 $self->{text} = "T$text"; 1956 $self->{text} = "T$text";
… …
1926 1979
1927sub size_request { 1980sub size_request {
1928 my ($self) = @_; 1981 my ($self) = @_;
1929 1982
1930 $self->{size_req} ||= do { 1983 $self->{size_req} ||= do {
1984 my ($max_w, $max_h) = $self->get_max_wh;
1985
1931 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1932 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($max_w);
1933 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1934 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1935 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1936 1991
1937 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1938 1993
1939 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1940 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1941 $self->{template}->set_width ($self->{max_w} || -1); 1996 $self->{template}->set_width ($max_w);
1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1943 1998
1944 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1945 2000
1946 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
2002 2057
2003 [$self->{layout}->size] 2058 [$self->{layout}->size]
2004 }; 2059 };
2005 2060
2006 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
2007 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2008 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2063 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2009 : ($self->{w} - $size->[0]) * 0.5);
2010 2064
2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2013 : ($self->{h} - $size->[1]) * 0.5);
2014 }; 2066 };
2015 2067
2016# unless ($self->{list}) { 2068# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList; 2069# $self->{list} = DC::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list}; 2070# DC::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2071# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList; 2072# DC::OpenGL::glEndList;
2021# } 2073# }
2022# 2074#
2023# CFPlus::OpenGL::glCallList $self->{list}; 2075# DC::OpenGL::glCallList $self->{list};
2024 2076
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2077 $self->{layout}->draw;
2026} 2078}
2027 2079
2028#sub destroy { 2080#sub destroy {
2029# my ($self) = @_; 2081# my ($self) = @_;
2030# 2082#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2083# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032# 2084#
2033# $self->SUPER::destroy; 2085# $self->SUPER::destroy;
2034#} 2086#}
2035 2087
2036############################################################################# 2088#############################################################################
2037 2089
2038package CFPlus::UI::EntryBase; 2090package DC::UI::EntryBase;
2039 2091
2040our @ISA = CFPlus::UI::Label::; 2092our @ISA = DC::UI::Label::;
2041 2093
2042use CFPlus::OpenGL; 2094use DC::OpenGL;
2043 2095
2044sub new { 2096sub new {
2045 my $class = shift; 2097 my $class = shift;
2046 2098
2047 $class->SUPER::new ( 2099 $class->SUPER::new (
2048 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
2049 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2102 outline => undef,
2050 active_bg => [1, 1, 1, 0.5], 2103 active_bg => [0, 0, 1, .2],
2051 active_fg => [0, 0, 0], 2104 active_fg => [1, 1, 1],
2105 active_outline => [1, 1, 0],
2052 can_hover => 1, 2106 can_hover => 1,
2053 can_focus => 1, 2107 can_focus => 1,
2108 align => 0,
2054 valign => 0, 2109 valign => 0.5,
2055 can_events => 1, 2110 can_events => 1,
2056 ellipsise => 0, 2111 ellipsise => 0,
2112 padding_x => 4,
2113 padding_y => 2,
2057 #text => ... 2114 #text => ...
2058 #hidden => "*", 2115 #hidden => "*",
2059 @_ 2116 @_
2060 ) 2117 )
2061} 2118}
… …
2108 2165
2109 my $text = $self->get_text; 2166 my $text = $self->get_text;
2110 2167
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2168 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2112 2169
2113 if ($uni == 8) { 2170 if ($sym == DC::SDLK_BACKSPACE) {
2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2115 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
2116 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
2117 } elsif ($sym == CFPlus::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
2118 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
2119 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
2120 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2121 } elsif ($sym == CFPlus::SDLK_HOME) { 2178 } elsif ($sym == DC::SDLK_HOME) {
2122 # what a hack 2179 # what a hack
2123 $self->{cursor} = 2180 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2181 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1 2182 ? length $1
2126 : 0; 2183 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) { 2184 } elsif ($sym == DC::SDLK_END) {
2128 # uh, again 2185 # uh, again
2129 $self->{cursor} = 2186 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2187 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1 2188 ? $self->{cursor} + length $1
2132 : length $self->{text}; 2189 : length $self->{text};
… …
2196 glColor_premultiply @{$self->{bg}}; 2253 glColor_premultiply @{$self->{bg}};
2197 } 2254 }
2198 2255
2199 glEnable GL_BLEND; 2256 glEnable GL_BLEND;
2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2257 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glBegin GL_QUADS;
2202 glVertex 0 , 0;
2203 glVertex 0 , $self->{h};
2204 glVertex $self->{w}, $self->{h}; 2258 glRect 0, 0, $self->{w}, $self->{h};
2205 glVertex $self->{w}, 0;
2206 glEnd;
2207 glDisable GL_BLEND; 2259 glDisable GL_BLEND;
2208 2260
2209 $self->SUPER::_draw; 2261 $self->SUPER::_draw;
2210 2262
2211 #TODO: force update every cursor change :( 2263 #TODO: force update every cursor change :(
… …
2213 2265
2214 unless (exists $self->{cur_h}) { 2266 unless (exists $self->{cur_h}) {
2215 my $text = substr $self->{text}, 0, $self->{cursor}; 2267 my $text = substr $self->{text}, 0, $self->{cursor};
2216 utf8::encode $text; 2268 utf8::encode $text;
2217 2269
2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2219 } 2271 }
2220 2272
2273 glColor_premultiply @{$self->{active_fg}};
2221 glBegin GL_LINES; 2274 glBegin GL_LINES;
2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2224 glEnd; 2277 glEnd;
2278
2279 glLineWidth 3;
2280 glColor @{$self->{active_outline}};
2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2282 glLineWidth 1;
2283
2284 } else {
2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2286 glBegin GL_LINE_STRIP;
2287 glVertex .5, $self->{h} * .5;
2288 glVertex .5, $self->{h} - 2.5;
2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2290 glVertex $self->{w} - .5, $self->{h} * .5;
2291 glEnd;
2225 } 2292 }
2226} 2293}
2227 2294
2228############################################################################# 2295#############################################################################
2229 2296
2230package CFPlus::UI::Entry; 2297package DC::UI::Entry;
2231 2298
2232our @ISA = CFPlus::UI::EntryBase::; 2299our @ISA = DC::UI::EntryBase::;
2233 2300
2234use CFPlus::OpenGL; 2301use DC::OpenGL;
2302
2303sub new {
2304 my $class = shift;
2305
2306 $class->SUPER::new (
2307 history_pointer => -1,
2308 @_
2309 )
2310}
2311
2235 2312
2236sub invoke_key_down { 2313sub invoke_key_down {
2237 my ($self, $ev) = @_; 2314 my ($self, $ev) = @_;
2238 2315
2239 my $sym = $ev->{sym}; 2316 my $sym = $ev->{sym};
… …
2245 $self->{history_pointer} = -1; 2322 $self->{history_pointer} = -1;
2246 $self->{history_saveback} = ''; 2323 $self->{history_saveback} = '';
2247 $self->emit (activate => $txt); 2324 $self->emit (activate => $txt);
2248 $self->update; 2325 $self->update;
2249 2326
2250 } elsif ($sym == CFPlus::SDLK_UP) { 2327 } elsif ($sym == DC::SDLK_UP) {
2251 if ($self->{history_pointer} < 0) { 2328 if ($self->{history_pointer} < 0) {
2252 $self->{history_saveback} = $self->get_text; 2329 $self->{history_saveback} = $self->get_text;
2253 } 2330 }
2254 if (@{$self->{history} || []} > 0) { 2331 if (@{$self->{history} || []} > 0) {
2255 $self->{history_pointer}++; 2332 $self->{history_pointer}++;
… …
2257 $self->{history_pointer} = @{$self->{history} || []} - 1; 2334 $self->{history_pointer} = @{$self->{history} || []} - 1;
2258 } 2335 }
2259 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2336 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2260 } 2337 }
2261 2338
2262 } elsif ($sym == CFPlus::SDLK_DOWN) { 2339 } elsif ($sym == DC::SDLK_DOWN) {
2263 $self->{history_pointer}--; 2340 $self->{history_pointer}--;
2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2341 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2265 2342
2266 if ($self->{history_pointer} >= 0) { 2343 if ($self->{history_pointer} >= 0) {
2267 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2268 } else { 2345 } else {
2346 if (defined $self->{history_saveback}) {
2269 $self->set_text ($self->{history_saveback}); 2347 $self->set_text ($self->{history_saveback});
2348 $self->{history_saveback} = undef;
2349 }
2270 } 2350 }
2271 2351
2272 } else { 2352 } else {
2273 return $self->SUPER::invoke_key_down ($ev) 2353 return $self->SUPER::invoke_key_down ($ev)
2274 } 2354 }
… …
2276 1 2356 1
2277} 2357}
2278 2358
2279############################################################################# 2359#############################################################################
2280 2360
2281package CFPlus::UI::TextEdit; 2361package DC::UI::TextEdit;
2282 2362
2283our @ISA = CFPlus::UI::EntryBase::; 2363our @ISA = DC::UI::EntryBase::;
2284 2364
2285use CFPlus::OpenGL; 2365use DC::OpenGL;
2366
2367sub new {
2368 my $class = shift;
2369
2370 $class->SUPER::new (
2371 padding_y => 4,
2372
2373 @_
2374 )
2375}
2286 2376
2287sub move_cursor_ver { 2377sub move_cursor_ver {
2288 my ($self, $dy) = @_; 2378 my ($self, $dy) = @_;
2289 2379
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2380 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291 2381
2292 $y += $dy; 2382 $line += $dy;
2293 2383
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2384 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2295 $self->{cursor} = $index; 2385 $self->{cursor} = $index;
2296 delete $self->{cur_h}; 2386 delete $self->{cur_h};
2297 $self->update; 2387 $self->update;
2298 return; 2388 return;
2299 } 2389 }
… …
2302sub invoke_key_down { 2392sub invoke_key_down {
2303 my ($self, $ev) = @_; 2393 my ($self, $ev) = @_;
2304 2394
2305 my $sym = $ev->{sym}; 2395 my $sym = $ev->{sym};
2306 2396
2307 if ($sym == CFPlus::SDLK_UP) { 2397 if ($sym == DC::SDLK_UP) {
2308 $self->move_cursor_ver (-1); 2398 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) { 2399 } elsif ($sym == DC::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1); 2400 $self->move_cursor_ver (+1);
2311 } else { 2401 } else {
2312 return $self->SUPER::invoke_key_down ($ev) 2402 return $self->SUPER::invoke_key_down ($ev)
2313 } 2403 }
2314 2404
2315 1 2405 1
2316} 2406}
2317 2407
2318############################################################################# 2408#############################################################################
2319 2409
2320package CFPlus::UI::Button; 2410package DC::UI::ButtonBin;
2321 2411
2322our @ISA = CFPlus::UI::Label::; 2412our @ISA = DC::UI::Bin::;
2323 2413
2324use CFPlus::OpenGL; 2414use DC::OpenGL;
2325 2415
2326my @tex = 2416my @tex =
2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2328 qw(b1_button_inactive.png b1_button_active.png); 2418 qw(b1_button_inactive.png b1_button_active.png);
2329 2419
2330sub new { 2420sub new {
2331 my $class = shift; 2421 my $class = shift;
2332 2422
2333 $class->SUPER::new ( 2423 $class->SUPER::new (
2424 can_hover => 1,
2425 align => 0.5,
2426 valign => 0.5,
2427 can_events => 1,
2428 @_
2429 )
2430}
2431
2432sub invoke_button_up {
2433 my ($self, $ev, $x, $y) = @_;
2434
2435 $self->emit ("activate")
2436 if $x >= 0 && $x < $self->{w}
2437 && $y >= 0 && $y < $self->{h};
2438
2439 1
2440}
2441
2442sub _draw {
2443 my ($self) = @_;
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2451
2452 glDisable GL_TEXTURE_2D;
2453
2454 $self->SUPER::_draw;
2455}
2456
2457#############################################################################
2458
2459package DC::UI::Button;
2460
2461our @ISA = DC::UI::Label::;
2462
2463use DC::OpenGL;
2464
2465my @tex =
2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2467 qw(b1_button_inactive.png b1_button_active.png);
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2334 padding_x => 4, 2473 padding_x => 8,
2335 padding_y => 4, 2474 padding_y => 4,
2336 fg => [1.0, 1.0, 1.0], 2475 fg => [1.0, 1.0, 1.0],
2337 active_fg => [0.8, 0.8, 0.8], 2476 active_fg => [0.8, 0.8, 0.8],
2338 can_hover => 1, 2477 can_hover => 1,
2339 align => 0, 2478 align => 0.5,
2340 valign => 0, 2479 valign => 0.5,
2341 can_events => 1, 2480 can_events => 1,
2342 @_ 2481 @_
2343 ) 2482 )
2344} 2483}
2345 2484
… …
2370 $self->SUPER::_draw; 2509 $self->SUPER::_draw;
2371} 2510}
2372 2511
2373############################################################################# 2512#############################################################################
2374 2513
2375package CFPlus::UI::CheckBox; 2514package DC::UI::CheckBox;
2376 2515
2377our @ISA = CFPlus::UI::DrawBG::; 2516our @ISA = DC::UI::DrawBG::;
2378 2517
2379my @tex = 2518my @tex =
2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2381 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2382 2521
2383use CFPlus::OpenGL; 2522use DC::OpenGL;
2384 2523
2385sub new { 2524sub new {
2386 my $class = shift; 2525 my $class = shift;
2387 2526
2388 $class->SUPER::new ( 2527 $class->SUPER::new (
2528 fontsize => 1,
2389 padding_x => 2, 2529 padding_x => 2,
2390 padding_y => 2, 2530 padding_y => 2,
2391 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2392 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2393 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
… …
2399} 2539}
2400 2540
2401sub size_request { 2541sub size_request {
2402 my ($self) = @_; 2542 my ($self) = @_;
2403 2543
2404 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2405} 2545}
2406 2546
2407sub toggle { 2547sub toggle {
2408 my ($self) = @_; 2548 my ($self) = @_;
2409 2549
… …
2428sub _draw { 2568sub _draw {
2429 my ($self) = @_; 2569 my ($self) = @_;
2430 2570
2431 $self->SUPER::_draw; 2571 $self->SUPER::_draw;
2432 2572
2433 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2573 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2434 2574
2435 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2436 2576
2437 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2577 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2438 2578
… …
2445 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2446} 2586}
2447 2587
2448############################################################################# 2588#############################################################################
2449 2589
2450package CFPlus::UI::Image; 2590package DC::UI::Image;
2451 2591
2452our @ISA = CFPlus::UI::Base::; 2592our @ISA = DC::UI::Base::;
2453 2593
2454use CFPlus::OpenGL; 2594use DC::OpenGL;
2455 2595
2456our %texture_cache; 2596our %texture_cache;
2457 2597
2458sub new { 2598sub new {
2459 my $class = shift; 2599 my $class = shift;
2460 2600
2461 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2462 can_events => 0, 2602 can_events => 0,
2603 scale => 1,
2463 @_, 2604 @_,
2464 ); 2605 );
2465 2606
2466 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2468 2609
2469 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2471 2612
2472 CFPlus::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2473 2614
2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2475 2616
2476 $self 2617 $self
2477} 2618}
2478 2619
2479sub STORABLE_freeze { 2620sub STORABLE_freeze {
2480 my ($self, $cloning) = @_; 2621 my ($self, $cloning) = @_;
2481 2622
2482 $self->{path} 2623 $self->{path}
2483 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2624 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2484 2625
2485 $self->{path} 2626 $self->{path}
2486} 2627}
2487 2628
2488sub STORABLE_attach { 2629sub STORABLE_attach {
… …
2492} 2633}
2493 2634
2494sub size_request { 2635sub size_request {
2495 my ($self) = @_; 2636 my ($self) = @_;
2496 2637
2497 ($self->{tex}{w}, $self->{tex}{h}) 2638 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2498} 2639}
2499 2640
2500sub _draw { 2641sub _draw {
2501 my ($self) = @_; 2642 my ($self) = @_;
2502 2643
… …
2512 } 2653 }
2513 2654
2514 glEnable GL_TEXTURE_2D; 2655 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516 2657
2517 $tex->draw_quad (0, 0, $w, $h); 2658 $tex->draw_quad_alpha (0, 0, $w, $h);
2518 2659
2519 glDisable GL_TEXTURE_2D; 2660 glDisable GL_TEXTURE_2D;
2520} 2661}
2521 2662
2522############################################################################# 2663#############################################################################
2523 2664
2524package CFPlus::UI::ImageButton; 2665package DC::UI::ImageButton;
2525 2666
2526our @ISA = CFPlus::UI::Image::; 2667our @ISA = DC::UI::Image::;
2527 2668
2528use CFPlus::OpenGL; 2669use DC::OpenGL;
2529 2670
2530my %textures; 2671my %textures;
2531 2672
2532sub new { 2673sub new {
2533 my $class = shift; 2674 my $class = shift;
… …
2536 padding_x => 4, 2677 padding_x => 4,
2537 padding_y => 4, 2678 padding_y => 4,
2538 fg => [1, 1, 1], 2679 fg => [1, 1, 1],
2539 active_fg => [0, 0, 1], 2680 active_fg => [0, 0, 1],
2540 can_hover => 1, 2681 can_hover => 1,
2541 align => 0, 2682 align => 0.5,
2542 valign => 0, 2683 valign => 0.5,
2543 can_events => 1, 2684 can_events => 1,
2544 @_ 2685 @_
2545 ); 2686 );
2546} 2687}
2547 2688
2689sub invoke_button_down {
2690 my ($self, $ev, $x, $y) = @_;
2691
2692 1
2693}
2694
2548sub invoke_button_up { 2695sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_; 2696 my ($self, $ev, $x, $y) = @_;
2550 2697
2551 $self->emit ("activate") 2698 $self->emit ("activate")
2552 if $x >= 0 && $x < $self->{w} 2699 if $x >= 0 && $x < $self->{w}
… …
2555 1 2702 1
2556} 2703}
2557 2704
2558############################################################################# 2705#############################################################################
2559 2706
2560package CFPlus::UI::VGauge; 2707package DC::UI::VGauge;
2561 2708
2562our @ISA = CFPlus::UI::Base::; 2709our @ISA = DC::UI::Base::;
2563 2710
2564use List::Util qw(min max); 2711use List::Util qw(min max);
2565 2712
2566use CFPlus::OpenGL; 2713use DC::OpenGL;
2567 2714
2568my %tex = ( 2715my %tex = (
2569 food => [ 2716 food => [
2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2572 ], 2719 ],
2573 grace => [ 2720 grace => [
2574 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2722 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2576 ], 2723 ],
2577 hp => [ 2724 hp => [
2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2580 ], 2727 ],
2581 mana => [ 2728 mana => [
2582 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2729 map { new_from_resource DC::Texture $_, mipmap => 1 }
2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2730 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2584 ], 2731 ],
2585); 2732);
2586 2733
2587# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2690 glDisable GL_TEXTURE_2D; 2837 glDisable GL_TEXTURE_2D;
2691} 2838}
2692 2839
2693############################################################################# 2840#############################################################################
2694 2841
2842package DC::UI::Progress;
2843
2844our @ISA = DC::UI::Label::;
2845
2846use DC::OpenGL;
2847
2848sub new {
2849 my ($class, %arg) = @_;
2850
2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2854 fg => [1, 1, 1],
2855 bg => [0, 0, 1, 0.2],
2856 bar => [0.7, 0.5, 0.1, 0.8],
2857 outline => [0.4, 0.3, 0],
2858 fontsize => 0.9,
2859 valign => 0.5,
2860 align => 0.5,
2861 can_events => 1,
2862 ellipsise => 1,
2863 label => "%d%%",
2864 %arg,
2865 );
2866
2867 $self->set_value ($arg{value} || -1);
2868
2869 $self
2870}
2871
2872sub set_label {
2873 my ($self, $label) = @_;
2874
2875 return if $self->{label} eq $label;
2876 $self->{label} = $label;
2877
2878 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2879}
2880
2881sub set_value {
2882 my ($self, $value) = @_;
2883
2884 if ($self->{value} ne $value) {
2885 $self->{value} = $value;
2886
2887 if ($value < 0) {
2888 $self->set_text ("-");
2889 } else {
2890 $self->set_text (sprintf $self->{label}, $value * 100);
2891 }
2892
2893 $self->update;
2894 }
2895}
2896
2897sub _draw {
2898 my ($self) = @_;
2899
2900 glEnable GL_BLEND;
2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2906 if ($self->{value} >= 0) {
2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2908
2909 glColor_premultiply @{$self->{bar}};
2910 glRect $px, $py, $s, $self->{h} - $py;
2911 glColor_premultiply @{$self->{bg}};
2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2913 }
2914
2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2921
2922 glDisable GL_BLEND;
2923
2924 {
2925 local $self->{bg}; # do not draw background
2926 $self->SUPER::_draw;
2927 }
2928}
2929
2930#############################################################################
2931
2932package DC::UI::ExperienceProgress;
2933
2934our @ISA = DC::UI::Progress::;
2935
2936sub new {
2937 my ($class, %arg) = @_;
2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2941 my $self = $class->SUPER::new (
2942 %arg,
2943 tooltip => sub {
2944 my ($self) = @_;
2945
2946 sprintf "%slevel %d\n%s points\n%s next level\n%s to go / %d%%",
2947 $tt,
2948 $self->{lvl},
2949 ::formsep ($self->{exp}),
2950 ::formsep ($self->{nxt}),
2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2953 },
2954 );
2955
2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2957 if $::CONN;
2958
2959 $self
2960}
2961
2962sub DESTROY {
2963 my ($self) = @_;
2964
2965 delete $::CONN->{on_exp_update}{$self+0}
2966 if $::CONN;
2967
2968 $self->SUPER::DESTROY;
2969}
2970
2971sub _percent {
2972 my ($self) = @_;
2973
2974 my $table = $::CONN && $::CONN->{exp_table}
2975 or return -1;
2976
2977 my $l0 = $table->[$self->{lvl} - 1];
2978 my $l1 = $table->[$self->{lvl}];
2979
2980 $self->{nxt} = $l1;
2981
2982 ($self->{exp} - $l0) / ($l1 - $l0)
2983}
2984
2985sub set_value {
2986 my ($self, $lvl, $exp) = @_;
2987
2988 $self->{lvl} = $lvl;
2989 $self->{exp} = $exp;
2990
2991 $self->SUPER::set_value ($self->_percent);
2992}
2993
2994#############################################################################
2995
2695package CFPlus::UI::Gauge; 2996package DC::UI::Gauge;
2696 2997
2697our @ISA = CFPlus::UI::VBox::; 2998our @ISA = DC::UI::VBox::;
2698 2999
2699sub new { 3000sub new {
2700 my ($class, %arg) = @_; 3001 my ($class, %arg) = @_;
2701 3002
2702 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
… …
2704 can_hover => 1, 3005 can_hover => 1,
2705 can_events => 1, 3006 can_events => 1,
2706 %arg, 3007 %arg,
2707 ); 3008 );
2708 3009
2709 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3010 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2710 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3011 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2711 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3012 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2712 3013
2713 $self 3014 $self
2714} 3015}
2715 3016
2716sub set_fontsize { 3017sub set_fontsize {
… …
2737 $self->{value}->set_text ($val); 3038 $self->{value}->set_text ($val);
2738} 3039}
2739 3040
2740############################################################################# 3041#############################################################################
2741 3042
2742package CFPlus::UI::Slider; 3043package DC::UI::Slider;
2743 3044
2744use strict; 3045use strict;
2745 3046
2746use CFPlus::OpenGL; 3047use DC::OpenGL;
2747 3048
2748our @ISA = CFPlus::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
2749 3050
2750my @tex = 3051my @tex =
2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
2752 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
2753 3054
2754sub new { 3055sub new {
2755 my $class = shift; 3056 my $class = shift;
2756 3057
… …
2793sub set_value { 3094sub set_value {
2794 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
2795 3096
2796 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2797 3098
2798 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
2799 3100
2800 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
2801
2802 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
2803 $value = $hi - $page if $value > $hi - $page;
2804 3103
2805 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2806 if $unit; 3105 if $unit;
2807 3106
2808 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2852sub invoke_mouse_wheel { 3151sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_; 3152 my ($self, $ev) = @_;
2854 3153
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3154 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856 3155
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3156 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2858 3157
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3158 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860 3159
2861 1 3160 1
2862} 3161}
… …
2872 my ($self) = @_; 3171 my ($self) = @_;
2873 3172
2874 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
2875 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
2876 3175
2877 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2878 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
2879 3178
2880 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3179 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2881 3180
2882 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3181 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2883 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2884 3183
2885 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
… …
2915 glDisable GL_TEXTURE_2D; 3214 glDisable GL_TEXTURE_2D;
2916} 3215}
2917 3216
2918############################################################################# 3217#############################################################################
2919 3218
2920package CFPlus::UI::ValSlider; 3219package DC::UI::ValSlider;
2921 3220
2922our @ISA = CFPlus::UI::HBox::; 3221our @ISA = DC::UI::HBox::;
2923 3222
2924sub new { 3223sub new {
2925 my ($class, %arg) = @_; 3224 my ($class, %arg) = @_;
2926 3225
2927 my $range = delete $arg{range}; 3226 my $range = delete $arg{range};
2928 3227
2929 my $self = $class->SUPER::new ( 3228 my $self = $class->SUPER::new (
2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3229 slider => (new DC::UI::Slider expand => 1, range => $range),
2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3230 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2932 to_value => sub { shift }, 3231 to_value => sub { shift },
2933 from_value => sub { shift }, 3232 from_value => sub { shift },
2934 %arg, 3233 %arg,
2935 ); 3234 );
2936 3235
… …
2956sub set_range { shift->{slider}->set_range (@_) } 3255sub set_range { shift->{slider}->set_range (@_) }
2957sub set_value { shift->{slider}->set_value (@_) } 3256sub set_value { shift->{slider}->set_value (@_) }
2958 3257
2959############################################################################# 3258#############################################################################
2960 3259
2961package CFPlus::UI::TextScroller; 3260package DC::UI::TextScroller;
2962 3261
2963our @ISA = CFPlus::UI::HBox::; 3262our @ISA = DC::UI::HBox::;
2964 3263
2965use CFPlus::OpenGL; 3264use DC::OpenGL;
2966 3265
2967sub new { 3266sub new {
2968 my $class = shift; 3267 my $class = shift;
2969 3268
2970 my $self = $class->SUPER::new ( 3269 my $self = $class->SUPER::new (
… …
2972 can_events => 1, 3271 can_events => 1,
2973 indent => 0, 3272 indent => 0,
2974 #font => default_font 3273 #font => default_font
2975 @_, 3274 @_,
2976 3275
2977 layout => (new CFPlus::Layout), 3276 layout => (new DC::Layout),
2978 par => [], 3277 par => [],
2979 max_par => 0, 3278 max_par => 0,
2980 height => 0, 3279 height => 0,
2981 children => [ 3280 children => [
2982 (new CFPlus::UI::Empty expand => 1), 3281 (new DC::UI::Empty expand => 1),
2983 (new CFPlus::UI::Slider vertical => 1), 3282 (new DC::UI::Slider vertical => 1),
2984 ], 3283 ],
2985 ); 3284 );
2986 3285
2987 $self->{children}[1]->connect (changed => sub { $self->update }); 3286 $self->{children}[1]->connect (changed => sub { $self->update });
2988 3287
… …
2997} 3296}
2998 3297
2999sub size_request { 3298sub size_request {
3000 my ($self) = @_; 3299 my ($self) = @_;
3001 3300
3002 my ($empty, $slider) = @{ $self->{children} }; 3301 my ($empty, $slider) = $self->visible_children;
3003 3302
3004 local $self->{children} = [$empty, $slider]; 3303 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3304 $self->SUPER::size_request
3006} 3305}
3007 3306
… …
3044 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3343 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3045 $layout->set_markup ($para->{markup}); 3344 $layout->set_markup ($para->{markup});
3046 3345
3047 $layout->set_shapes ( 3346 $layout->set_shapes (
3048 map 3347 map
3049 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3348 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3050 @{$para->{widget}} 3349 @{$para->{widget}}
3051 ); 3350 );
3052 3351
3053 $layout 3352 $layout
3054} 3353}
… …
3171 $ROOT->on_post_alloc ($self => sub { 3470 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate; 3471 $self->force_uptodate;
3173 3472
3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3473 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3175 3474
3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3475 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3177 glClearColor 0, 0, 0, 0; 3476 glClearColor 0, 0, 0, 0;
3178 glClear GL_COLOR_BUFFER_BIT; 3477 glClear GL_COLOR_BUFFER_BIT;
3179 3478
3180 package CFPlus::UI::Base; 3479 package DC::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3480 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h}); 3481 (0, 0, $self->{w}, $self->{h});
3183 3482
3184 my $top = int $self->{children}[1]{range}[0]; 3483 my $top = int $self->{children}[1]{range}[0];
3185 3484
… …
3196 3495
3197 if ($y0 < $y + $h && $y < $y1) { 3496 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3497 my $layout = $self->get_layout ($para);
3199 3498
3200 $layout->render ($para->{indent}, $y - $y0); 3499 $layout->render ($para->{indent}, $y - $y0);
3500 $layout->draw;
3201 3501
3202 if (my @w = @{ $para->{widget} }) { 3502 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3503 my @s = $layout->get_shapes;
3204 3504
3205 for (@w) { 3505 for (@w) {
… …
3243 $self->{children}[1]->draw; 3543 $self->{children}[1]->draw;
3244} 3544}
3245 3545
3246############################################################################# 3546#############################################################################
3247 3547
3248package CFPlus::UI::Animator; 3548package DC::UI::Animator;
3249 3549
3250use CFPlus::OpenGL; 3550use DC::OpenGL;
3251 3551
3252our @ISA = CFPlus::UI::Bin::; 3552our @ISA = DC::UI::Bin::;
3253 3553
3254sub moveto { 3554sub moveto {
3255 my ($self, $x, $y) = @_; 3555 my ($self, $x, $y) = @_;
3256 3556
3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3557 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3285 glPopMatrix; 3585 glPopMatrix;
3286} 3586}
3287 3587
3288############################################################################# 3588#############################################################################
3289 3589
3290package CFPlus::UI::Flopper; 3590package DC::UI::Flopper;
3291 3591
3292our @ISA = CFPlus::UI::Button::; 3592our @ISA = DC::UI::Button::;
3293 3593
3294sub new { 3594sub new {
3295 my $class = shift; 3595 my $class = shift;
3296 3596
3297 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3309 $self->{other}->toggle_visibility; 3609 $self->{other}->toggle_visibility;
3310} 3610}
3311 3611
3312############################################################################# 3612#############################################################################
3313 3613
3314package CFPlus::UI::Tooltip; 3614package DC::UI::Tooltip;
3315 3615
3316our @ISA = CFPlus::UI::Bin::; 3616our @ISA = DC::UI::Bin::;
3317 3617
3318use CFPlus::OpenGL; 3618use DC::OpenGL;
3319 3619
3320sub new { 3620sub new {
3321 my $class = shift; 3621 my $class = shift;
3322 3622
3323 $class->SUPER::new ( 3623 $class->SUPER::new (
… …
3327} 3627}
3328 3628
3329sub set_tooltip_from { 3629sub set_tooltip_from {
3330 my ($self, $widget) = @_; 3630 my ($self, $widget) = @_;
3331 3631
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
3334
3335 my $tooltip = $widget->{tooltip}; 3632 my $tip = $widget->{tooltip};
3633 $tip = $tip->($widget) if "CODE" eq ref $tip;
3634
3635 $tip = DC::Pod::section_label tooltip => $1
3636 if $tip =~ /^#(.*)$/;
3336 3637
3337 if ($ENV{CFPLUS_DEBUG} & 2) { 3638 if ($ENV{CFPLUS_DEBUG} & 2) {
3338 $tooltip .= "\n\n" . (ref $widget) . "\n" 3639 $tip .= "\n\n" . (ref $widget) . "\n"
3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3640 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3340 . "req $widget->{req_w} $widget->{req_h}\n" 3641 . "req $widget->{req_w} $widget->{req_h}\n"
3341 . "visible $widget->{visible}"; 3642 . "visible $widget->{visible}";
3342 } 3643 }
3343 3644
3344 $tooltip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
3346 3647
3347 $self->add (new CFPlus::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
3348 markup => $tooltip, 3650 markup => $tip,
3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3652 align => 0,
3350 fontsize => 0.8, 3653 fontsize => 0.8,
3351 style => 1, # FLAG_INVERSE 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3352 ellipsise => 0, 3655 ellipsise => 0,
3353 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
3354 ); 3657 );
3355} 3658}
3356 3659
… …
3391} 3694}
3392 3695
3393sub _draw { 3696sub _draw {
3394 my ($self) = @_; 3697 my ($self) = @_;
3395 3698
3396 glTranslate 0.375, 0.375;
3397
3398 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
3399 3700
3400 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
3401 glBegin GL_QUADS; 3702 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3703
3408 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
3409 glBegin GL_LINE_LOOP; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
3410 glVertex 0 , 0;
3411 glVertex 0 , $h;
3412 glVertex $w, $h;
3413 glVertex $w, 0;
3414 glEnd;
3415 3706
3416 glTranslate 2 - 0.375, 2 - 0.375; 3707 glTranslate 2, 2;
3417 3708
3418 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
3419} 3710}
3420 3711
3421############################################################################# 3712#############################################################################
3422 3713
3423package CFPlus::UI::Face; 3714package DC::UI::Face;
3424 3715
3425our @ISA = CFPlus::UI::DrawBG::; 3716our @ISA = DC::UI::DrawBG::;
3426 3717
3427use CFPlus::OpenGL; 3718use DC::OpenGL;
3428 3719
3429sub new { 3720sub new {
3430 my $class = shift; 3721 my $class = shift;
3431 3722
3432 my $self = $class->SUPER::new ( 3723 my $self = $class->SUPER::new (
… …
3436 can_events => 0, 3727 can_events => 0,
3437 @_, 3728 @_,
3438 ); 3729 );
3439 3730
3440 if ($self->{anim} && $self->{animspeed}) { 3731 if ($self->{anim} && $self->{animspeed}) {
3441 CFPlus::weaken (my $widget = $self); 3732 DC::weaken (my $widget = $self);
3442 3733
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3734 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3735 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3445 $self->{timer} = Event->timer (
3446 parked => 1,
3447 cb => sub {
3448 return unless $::CONN && $widget; 3736 return unless $::CONN;
3449 3737
3738 my $w = $widget
3739 or return;
3740
3450 ++$widget->{frame}; 3741 ++$w->{frame};
3451 $widget->update_face; 3742 $w->update_face;
3743
3744 # somehow, $widget can go away
3452 $widget->update; 3745 $w->update;
3453
3454 $widget->update_timer; 3746 $w->update_timer;
3455 },
3456 ); 3747 };
3457 3748
3458 $self->update_face; 3749 $self->update_face;
3459 $self->update_timer; 3750 $self->update_timer;
3460 } 3751 }
3461 3752
… …
3466 my ($self) = @_; 3757 my ($self) = @_;
3467 3758
3468 return unless $self->{timer}; 3759 return unless $self->{timer};
3469 3760
3470 if ($self->{visible}) { 3761 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start; 3762 $self->{timer}->start;
3477 } else { 3763 } else {
3478 $self->{timer}->stop; 3764 $self->{timer}->stop;
3479 } 3765 }
3480} 3766}
3481 3767
3482sub update_face { 3768sub update_face {
3483 my ($self) = @_; 3769 my ($self) = @_;
3484 3770
3485 return unless $::CONN; 3771 if ($::CONN) {
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3772 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) { 3773 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3774 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3775 delete $self->{face_change_cb};
3776
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3777 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3778 unless ($tex->{name} || $tex->{loading}) {
3779 $tex->upload (sub { $self->reconfigure });
3780 }
3781 }
3782 }
3492 } 3783 }
3493 } 3784 }
3494} 3785}
3495 3786
3496sub size_request { 3787sub size_request {
3497 my ($self) = @_; 3788 my ($self) = @_;
3498 3789
3499 if ($::CONN) { 3790 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3791 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3792 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex; 3793 if ($tex->{name}) {
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3794 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else { 3795 } elsif (!$tex->{loading}) {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3796 $tex->upload (sub { $self->reconfigure });
3506 $self->realloc;
3507 }); 3797 }
3508 } 3798 }
3799
3800 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3509 } 3801 }
3510 } 3802 }
3511 3803
3512 ($self->{size_w} || 8, $self->{size_h} || 8) 3804 ($self->{size_w} || 8, $self->{size_h} || 8)
3513} 3805}
… …
3551 $self->SUPER::destroy; 3843 $self->SUPER::destroy;
3552} 3844}
3553 3845
3554############################################################################# 3846#############################################################################
3555 3847
3556package CFPlus::UI::Buttonbar; 3848package DC::UI::Buttonbar;
3557 3849
3558our @ISA = CFPlus::UI::HBox::; 3850our @ISA = DC::UI::HBox::;
3559 3851
3560# TODO: should actually wrap buttons and other goodies. 3852# TODO: should actually wrap buttons and other goodies.
3561 3853
3562############################################################################# 3854#############################################################################
3563 3855
3564package CFPlus::UI::Menu; 3856package DC::UI::Menu;
3565 3857
3566our @ISA = CFPlus::UI::Toplevel::; 3858our @ISA = DC::UI::Toplevel::;
3567 3859
3568use CFPlus::OpenGL; 3860use DC::OpenGL;
3569 3861
3570sub new { 3862sub new {
3571 my $class = shift; 3863 my $class = shift;
3572 3864
3573 my $self = $class->SUPER::new ( 3865 my $self = $class->SUPER::new (
3574 items => [], 3866 items => [],
3575 z => 100, 3867 z => 100,
3576 @_, 3868 @_,
3577 ); 3869 );
3578 3870
3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3871 $self->add ($self->{vbox} = new DC::UI::VBox);
3580 3872
3581 for my $item (@{ $self->{items} }) { 3873 for my $item (@{ $self->{items} }) {
3582 my ($widget, $cb, $tooltip) = @$item; 3874 my ($widget, $cb, $tooltip) = @$item;
3583 3875
3584 # handle various types of items, only text for now 3876 # handle various types of items, only text for now
3585 if (!ref $widget) { 3877 if (!ref $widget) {
3586 if ($widget =~ /\t/) { 3878 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2; 3879 my ($left, $right) = split /\t/, $widget, 2;
3588 3880
3589 $widget = new CFPlus::UI::HBox 3881 $widget = new DC::UI::HBox
3590 can_hover => 1, 3882 can_hover => 1,
3591 can_events => 1, 3883 can_events => 1,
3592 tooltip => $tooltip, 3884 tooltip => $tooltip,
3593 children => [ 3885 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3886 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3887 (new DC::UI::Label markup => $right, align => 1),
3596 ], 3888 ],
3597 ; 3889 ;
3598 3890
3599 } else { 3891 } else {
3600 $widget = new CFPlus::UI::Label 3892 $widget = new DC::UI::Label
3601 can_hover => 1, 3893 can_hover => 1,
3602 can_events => 1, 3894 can_events => 1,
3895 align => 0,
3603 markup => $widget, 3896 markup => $widget,
3604 tooltip => $tooltip; 3897 tooltip => $tooltip;
3605 } 3898 }
3606 } 3899 }
3607 3900
… …
3622 # maybe save $GRAB? must be careful about events... 3915 # maybe save $GRAB? must be careful about events...
3623 $GRAB = $self; 3916 $GRAB = $self;
3624 $self->{button} = $ev->{button}; 3917 $self->{button} = $ev->{button};
3625 3918
3626 $self->show; 3919 $self->show;
3627 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3920
3921 my $x = $ev->{x};
3922 my $y = $ev->{y};
3923
3924 $self->{root}->on_post_alloc ($self => sub {
3925 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3926 });
3927
3928 1 # so it can be used inside event handlers
3628} 3929}
3629 3930
3630sub invoke_mouse_motion { 3931sub invoke_mouse_motion {
3631 my ($self, $ev, $x, $y) = @_; 3932 my ($self, $ev, $x, $y) = @_;
3632 3933
… …
3653 1 3954 1
3654} 3955}
3655 3956
3656############################################################################# 3957#############################################################################
3657 3958
3658package CFPlus::UI::Multiplexer; 3959package DC::UI::Multiplexer;
3659 3960
3660our @ISA = CFPlus::UI::Container::; 3961our @ISA = DC::UI::Container::;
3661 3962
3662sub new { 3963sub new {
3663 my $class = shift; 3964 my $class = shift;
3664 3965
3665 my $self = $class->SUPER::new ( 3966 my $self = $class->SUPER::new (
3666 @_, 3967 @_,
3667 ); 3968 );
3668 3969
3669 $self->{current} = $self->{children}[0] 3970 $self->set_current_page (0);
3670 if @{ $self->{children} };
3671 3971
3672 $self 3972 $self
3673} 3973}
3674 3974
3675sub add { 3975sub add {
3676 my ($self, @widgets) = @_; 3976 my ($self, @widgets) = @_;
3677 3977
3678 $self->SUPER::add (@widgets); 3978 $self->SUPER::add (@widgets);
3679 3979
3680 $self->{current} = $self->{children}[0] 3980 $self->set_current_page (0)
3681 if @{ $self->{children} }; 3981 if @widgets == @{ $self->{children} };
3682} 3982}
3683 3983
3684sub get_current_page { 3984sub get_current_page {
3685 my ($self) = @_; 3985 my ($self) = @_;
3686 3986
… …
3692 3992
3693 my $widget = ref $page_or_widget 3993 my $widget = ref $page_or_widget
3694 ? $page_or_widget 3994 ? $page_or_widget
3695 : $self->{children}[$page_or_widget]; 3995 : $self->{children}[$page_or_widget];
3696 3996
3997 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3998
3697 $self->{current} = $widget; 3999 if (($self->{current} = $widget)) {
4000 $self->{current}->set_visible if $self->{current} && $self->{visible};
3698 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4001 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3699 4002
3700 $self->emit (page_changed => $self->{current}); 4003 $self->emit (page_changed => $self->{current});
4004 }
3701 4005
3702 $self->realloc; 4006 $self->realloc;
3703} 4007}
3704 4008
3705sub visible_children { 4009sub visible_children {
3706 $_[0]{current} 4010 $_[0]{current} || ()
3707} 4011}
3708 4012
3709sub size_request { 4013sub size_request {
3710 my ($self) = @_; 4014 my ($self) = @_;
3711 4015
4016 $self->{current}
3712 $self->{current}->size_request 4017 ? $self->{current}->size_request
4018 : (0, 0)
3713} 4019}
3714 4020
3715sub invoke_size_allocate { 4021sub invoke_size_allocate {
3716 my ($self, $w, $h) = @_; 4022 my ($self, $w, $h) = @_;
3717 4023
3718 $self->{current}->configure (0, 0, $w, $h); 4024 $self->{current}->configure (0, 0, $w, $h)
4025 if $self->{current};
3719 4026
3720 1 4027 1
3721} 4028}
3722 4029
3723sub _draw { 4030sub _draw {
3724 my ($self) = @_; 4031 my ($self) = @_;
3725 4032
3726 $self->{current}->draw; 4033 $self->{current}->draw
4034 if $self->{current};
3727} 4035}
3728 4036
3729############################################################################# 4037#############################################################################
3730 4038
3731package CFPlus::UI::Notebook; 4039package DC::UI::Notebook;
3732 4040
4041use DC::OpenGL;
4042
3733our @ISA = CFPlus::UI::VBox::; 4043our @ISA = DC::UI::VBox::;
3734 4044
3735sub new { 4045sub new {
3736 my $class = shift; 4046 my $class = shift;
3737 4047
3738 my $self = $class->SUPER::new ( 4048 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar), 4049 buttonbar => (new DC::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4050 multiplexer => (new DC::UI::Multiplexer expand => 1),
4051 active_outline => [.7, .7, 0.2],
3741 # filter => # will be put between multiplexer and $self 4052 # filter => # will be put between multiplexer and $self
3742 @_, 4053 @_,
3743 ); 4054 );
3744 4055
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 4058
4059 {
4060 Scalar::Util::weaken (my $wself = $self);
4061
4062 $self->{multiplexer}->connect (c_add => sub {
4063 my ($mplex, $widgets) = @_;
4064
4065 for my $child (@$widgets) {
4066 Scalar::Util::weaken $child;
4067 $child->{c_tab_} ||= do {
4068 my $tab =
4069 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4070 ? $child->{c_tab}
4071 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4072
4073 $tab->connect (activate => sub {
4074 $wself->set_current_page ($child);
4075 });
4076
4077 $tab
4078 };
4079
4080 $self->{buttonbar}->add ($child->{c_tab_});
4081 }
4082 });
4083
4084 $self->{multiplexer}->connect (c_remove => sub {
4085 my ($mplex, $widgets) = @_;
4086
4087 for my $child (@$widgets) {
4088 $wself->{buttonbar}->remove ($child->{c_tab_});
4089 }
4090 });
4091 }
4092
3748 $self 4093 $self
3749} 4094}
3750 4095
3751sub add { 4096sub add {
4097 my ($self, @widgets) = @_;
4098
4099 $self->{multiplexer}->add (@widgets)
4100}
4101
4102sub remove {
4103 my ($self, @widgets) = @_;
4104
4105 $self->{multiplexer}->remove (@widgets)
4106}
4107
4108sub pages {
4109 my ($self) = @_;
4110 $self->{multiplexer}->children
4111}
4112
4113sub page_index {
4114 my ($self, $widget) = @_;
4115
4116 my $i = 0;
4117 for ($self->pages) {
4118 if ($_ eq $widget) { return $i };
4119 $i++;
4120 }
4121
4122 undef
4123}
4124
4125sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 4126 my ($self, $title, $widget, $tooltip) = @_;
3753 4127
3754 CFPlus::weaken $self; 4128 $title = [$title, $tooltip] unless ref $title;
4129 $widget->{c_tab} = $title;
3755 4130
3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3758 markup => $title,
3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3764 $self->{buttonbar}->add ($title);
3765
3766 $self->{multiplexer}->add ($widget); 4131 $self->add ($widget);
3767} 4132}
3768 4133
3769sub get_current_page { 4134sub get_current_page {
3770 my ($self) = @_; 4135 my ($self) = @_;
3771 4136
… …
3777 4142
3778 $self->{multiplexer}->set_current_page ($page); 4143 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current}); 4144 $self->emit (page_changed => $self->{multiplexer}{current});
3780} 4145}
3781 4146
4147sub _draw {
4148 my ($self) = @_;
4149
4150 $self->SUPER::_draw ();
4151
4152 if (my $cur = $self->{multiplexer}{current}) {
4153 if ($cur = $cur->{c_tab_}) {
4154 glTranslate $self->{buttonbar}{x} + $cur->{x},
4155 $self->{buttonbar}{y} + $cur->{y};
4156 glLineWidth 3;
4157 #glEnable GL_BLEND;
4158 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4159 glColor @{$self->{active_outline}};
4160 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4161 glLineWidth 1;
4162 #glDisable GL_BLEND;
4163 }
4164 }
4165}
4166
3782############################################################################# 4167#############################################################################
3783 4168
3784package CFPlus::UI::Selector; 4169package DC::UI::Selector;
3785 4170
3786use utf8; 4171use utf8;
3787 4172
3788our @ISA = CFPlus::UI::Button::; 4173our @ISA = DC::UI::Button::;
3789 4174
3790sub new { 4175sub new {
3791 my $class = shift; 4176 my $class = shift;
3792 4177
3793 my $self = $class->SUPER::new ( 4178 my $self = $class->SUPER::new (
… …
3810 my ($value, $title, $tooltip) = @$_; 4195 my ($value, $title, $tooltip) = @$_;
3811 4196
3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4197 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3813 } 4198 }
3814 4199
3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4200 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3816} 4201}
3817 4202
3818sub _set_value { 4203sub _set_value {
3819 my ($self, $value) = @_; 4204 my ($self, $value) = @_;
3820 4205
3821 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4206 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4207 $item ||= $self->{options}[0]
3822 or return; 4208 or return;
3823 4209
3824 $self->{value} = $item->[0]; 4210 $self->{value} = $item->[0];
3825 $self->set_markup ("$item->[1] ⇓"); 4211 $self->set_markup ("$item->[1] ⇓");
3826 $self->set_tooltip ($item->[2]); 4212# $self->set_tooltip ($item->[2]);
3827} 4213}
3828 4214
3829sub set_value { 4215sub set_value {
3830 my ($self, $value) = @_; 4216 my ($self, $value) = @_;
3831 4217
… …
3833 4219
3834 $self->_set_value ($value); 4220 $self->_set_value ($value);
3835 $self->emit (changed => $value); 4221 $self->emit (changed => $value);
3836} 4222}
3837 4223
4224sub set_options {
4225 my ($self, $options) = @_;
4226
4227 $self->{options} = $options;
4228 $self->_set_value ($self->{value});
4229}
4230
3838############################################################################# 4231#############################################################################
3839 4232
3840package CFPlus::UI::Statusbox; 4233package DC::UI::Statusbox;
3841 4234
3842our @ISA = CFPlus::UI::VBox::; 4235our @ISA = DC::UI::VBox::;
3843 4236
3844sub new { 4237sub new {
3845 my $class = shift; 4238 my $class = shift;
3846 4239
3847 my $self = $class->SUPER::new ( 4240 my $self = $class->SUPER::new (
3848 fontsize => 0.8, 4241 fontsize => 0.8,
3849 @_, 4242 @_,
3850 ); 4243 );
3851 4244
3852 CFPlus::weaken (my $this = $self); 4245 DC::weaken (my $this = $self);
3853 4246
3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4247 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3855 4248
3856 $self 4249 $self
3857} 4250}
3858 4251
3859sub reorder { 4252sub reorder {
3860 my ($self) = @_; 4253 my ($self) = @_;
3861 my $NOW = Time::HiRes::time; 4254 my $NOW = EV::time;
3862 4255
3863 # freeze display when hovering over any label 4256 # freeze display when hovering over any label
3864 return if $CFPlus::UI::TOOLTIP->{owner} 4257 return if $DC::UI::TOOLTIP->{owner}
3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4258 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3866 values %{ $self->{item} }; 4259 values %{ $self->{item} };
3867 4260
3868 while (my ($k, $v) = each %{ $self->{item} }) { 4261 while (my ($k, $v) = each %{ $self->{item} }) {
3869 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4262 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3870 } 4263 }
4264
4265 $self->{timer}->set (1, 1);
3871 4266
3872 my @widgets; 4267 my @widgets;
3873 4268
3874 my @items = sort { 4269 my @items = sort {
3875 $a->{pri} <=> $b->{pri} 4270 $a->{pri} <=> $b->{pri}
3876 or $b->{id} <=> $a->{id} 4271 or $b->{id} <=> $a->{id}
3877 } values %{ $self->{item} }; 4272 } values %{ $self->{item} };
3878
3879 $self->{timer}->interval (1);
3880 4273
3881 my $count = 10 + 1; 4274 my $count = 10 + 1;
3882 for my $item (@items) { 4275 for my $item (@items) {
3883 last unless --$count; 4276 last unless --$count;
3884 4277
… …
3891 for ($short) { 4284 for ($short) {
3892 s/^\s+//; 4285 s/^\s+//;
3893 s/\s+/ /g; 4286 s/\s+/ /g;
3894 } 4287 }
3895 4288
3896 new CFPlus::UI::Label 4289 new DC::UI::Label
3897 markup => $short, 4290 markup => $short,
3898 tooltip => $item->{tooltip}, 4291 tooltip => $item->{tooltip},
3899 tooltip_font => $::FONT_PROP, 4292 tooltip_font => $::FONT_PROP,
3900 tooltip_width => 0.67, 4293 tooltip_width => 0.67,
3901 fontsize => $item->{fontsize} || $self->{fontsize}, 4294 fontsize => $item->{fontsize} || $self->{fontsize},
3902 max_w => $::WIDTH * 0.44, 4295 max_w => $::WIDTH * 0.44,
4296 align => 0,
3903 fg => [@{ $item->{fg} }], 4297 fg => [@{ $item->{fg} }],
3904 can_events => 1, 4298 can_events => 1,
3905 can_hover => 1 4299 can_hover => 1
3906 }; 4300 };
3907 4301
3908 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4302 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3909 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4303 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3910 $label->update; 4304 $label->update;
3911 $label->set_max_size (undef, $label->{req_h} * $diff) 4305 $label->set_max_size (undef, $label->{req_h} * $diff)
3912 if $diff < 1; 4306 if $diff < 1;
3913 $self->{timer}->interval (1/30); 4307 $self->{timer}->set (1/30, 1/30);
3914 } else { 4308 } else {
3915 $label->{fg}[3] = $item->{fg}[3] || 1; 4309 $label->{fg}[3] = $item->{fg}[3] || 1;
3916 } 4310 }
3917 4311
3918 push @widgets, $label; 4312 push @widgets, $label;
3919 } 4313 }
4314
4315 my $hash = join ",", @widgets;
4316 return if $hash eq $self->{last_widget_hash};
4317 $self->{last_widget_hash} = $hash;
3920 4318
3921 $self->clear; 4319 $self->clear;
3922 $self->SUPER::add (reverse @widgets); 4320 $self->SUPER::add (reverse @widgets);
3923} 4321}
3924 4322
… …
3980 $self->SUPER::destroy; 4378 $self->SUPER::destroy;
3981} 4379}
3982 4380
3983############################################################################# 4381#############################################################################
3984 4382
3985package CFPlus::UI::Root; 4383package DC::UI::Root;
3986 4384
3987our @ISA = CFPlus::UI::Container::; 4385our @ISA = DC::UI::Container::;
3988 4386
3989use List::Util qw(min max); 4387use List::Util qw(min max);
3990 4388
3991use CFPlus::OpenGL; 4389use DC::OpenGL;
3992 4390
3993sub new { 4391sub new {
3994 my $class = shift; 4392 my $class = shift;
3995 4393
3996 my $self = $class->SUPER::new ( 4394 my $self = $class->SUPER::new (
3997 visible => 1, 4395 visible => 1,
3998 @_, 4396 @_,
3999 ); 4397 );
4000 4398
4001 CFPlus::weaken ($self->{root} = $self); 4399 DC::weaken ($self->{root} = $self);
4002 4400
4003 $self 4401 $self
4004} 4402}
4005 4403
4006sub size_request { 4404sub size_request {
… …
4054} 4452}
4055 4453
4056sub update { 4454sub update {
4057 my ($self) = @_; 4455 my ($self) = @_;
4058 4456
4059 $::WANT_REFRESH++; 4457 $::WANT_REFRESH = 1;
4060} 4458}
4061 4459
4062sub add { 4460sub add {
4063 my ($self, @children) = @_; 4461 my ($self, @children) = @_;
4064 4462
… …
4131 4529
4132 delete $queue{$widget+0}; 4530 delete $queue{$widget+0};
4133 4531
4134 my ($w, $h) = $widget->size_request; 4532 my ($w, $h) = $widget->size_request;
4135 4533
4136 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4534 $w += $widget->{padding_x} * 2;
4137 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4535 $h += $widget->{padding_y} * 2;
4536
4537 $w = max $widget->{min_w}, $w;
4538 $h = max $widget->{min_h}, $h;
4138 4539
4139 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4540 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4140 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4541 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4141 4542
4142 $w = $widget->{force_w} if exists $widget->{force_w}; 4543 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4610 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4210 glMatrixMode GL_MODELVIEW; 4611 glMatrixMode GL_MODELVIEW;
4211 glLoadIdentity; 4612 glLoadIdentity;
4212 4613
4213 { 4614 {
4214 package CFPlus::UI::Base; 4615 package DC::UI::Base;
4215 4616
4216 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4617 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4217 (0, 0, $self->{w}, $self->{h}); 4618 (0, 0, $self->{w}, $self->{h});
4218 4619
4219 $self->_draw; 4620 $self->_draw;
4220 } 4621 }
4221} 4622}
4222 4623
4223############################################################################# 4624#############################################################################
4224 4625
4225package CFPlus::UI; 4626package DC::UI;
4226 4627
4227$ROOT = new CFPlus::UI::Root; 4628$ROOT = new DC::UI::Root;
4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4629$TOOLTIP = new DC::UI::Tooltip z => 900;
4229 4630
42301 46311
4231

Diff Legend

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