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.418 by elmex, Tue Jul 24 18:39:39 2007 UTC vs.
Revision 1.478 by root, Tue Dec 22 00:35:44 2009 UTC

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

Diff Legend

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