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.408 by root, Sun Jul 22 15:26:01 2007 UTC vs.
Revision 1.479 by root, Thu Feb 4 20:01:09 2010 UTC

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

Diff Legend

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