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.433 by root, Wed Aug 22 21:27:13 2007 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

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

Diff Legend

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