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.422 by root, Thu Aug 2 14:35:21 2007 UTC vs.
Revision 1.482 by root, Sat Aug 13 23:18:19 2011 UTC

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

Diff Legend

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