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.428 by root, Mon Aug 20 19:24:22 2007 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

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

Diff Legend

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