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.486 by root, Wed Nov 21 13:23:10 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
… …
358} 363}
359 364
360sub set_size { 365sub set_size {
361 my ($self, $w, $h) = @_; 366 my ($self, $w, $h) = @_;
362 367
363 $self->{force_w} = $w; 368 $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
364 $self->{force_h} = $h; 369 $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
365 370
366 $self->realloc; 371 $self->realloc;
372}
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)
367} 390}
368 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";
… …
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
… …
1435 my ($self, $ev, $x, $y) = @_; 1474 my ($self, $ev, $x, $y) = @_;
1436 1475
1437 my ($w, $h) = @$self{qw(w h)}; 1476 my ($w, $h) = @$self{qw(w h)};
1438 my $border = $self->border; 1477 my $border = $self->border;
1439 1478
1440 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); 1479 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
1441 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); 1480 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
1442 1481
1443 if ($lr & $td) { 1482 if ($lr & $td) { # corners
1444 my ($wx, $wy) = ($self->{x}, $self->{y}); 1483 my ($wx, $wy) = ($self->{x}, $self->{y});
1445 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1484 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1446 my ($bw, $bh) = ($self->{w}, $self->{h}); 1485 my ($bw, $bh) = ($self->{w}, $self->{h});
1447 1486
1448 my $mx = $x < $border; 1487 my $mx = $x < $border;
… …
1452 my ($ev, $x, $y) = @_; 1491 my ($ev, $x, $y) = @_;
1453 1492
1454 my $dx = $ev->{x} - $ox; 1493 my $dx = $ev->{x} - $ox;
1455 my $dy = $ev->{y} - $oy; 1494 my $dy = $ev->{y} - $oy;
1456 1495
1496 $self->set_size (
1457 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1497 $bw + $dx * ($mx ? -1 : 1),
1458 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1498 $bh + $dy * ($my ? -1 : 1),
1499 );
1459 1500
1460 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); 1501 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1461 $self->realloc; 1502 $self->realloc;
1462 }; 1503 };
1463 1504
1464 } elsif ($lr ^ $td) { 1505 } elsif ($lr ^ $td) { # edges
1465 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1506 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1466 my ($bx, $by) = ($self->{x}, $self->{y}); 1507 my ($bx, $by) = ($self->{x}, $self->{y});
1467 1508
1468 $self->{motion} = sub { 1509 $self->{motion} = sub {
1469 my ($ev, $x, $y) = @_; 1510 my ($ev, $x, $y) = @_;
… …
1514 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1516 1557
1517 my $border = $self->border; 1558 my $border = $self->border;
1518 1559
1560 if ($border) {
1519 glColor @{ $self->{border_bg} }; 1561 glColor @{ $self->{border_bg} };
1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1562 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1563 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1564 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1565 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524 1566
1525 # move 1567 # move
1526 my $w2 = ($w - $border) * .5; 1568 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5; 1569 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1570 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1571 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1572 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531 1573
1532 # resize 1574 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1576 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button}; 1577 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1578 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1579 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1580 }
1538 1581
1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1582 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1540 glColor @{ $self->{bg} }; 1583 glColor @{ $self->{bg} };
1541 1584
1542 # TODO: repeat texture not scale 1585 # TODO: repeat texture not scale
… …
1561 if $self->{close_button}; 1604 if $self->{close_button};
1562} 1605}
1563 1606
1564############################################################################# 1607#############################################################################
1565 1608
1566package CFPlus::UI::Table; 1609package DC::UI::Table;
1567 1610
1568our @ISA = CFPlus::UI::Container::; 1611our @ISA = DC::UI::Container::;
1569 1612
1570use List::Util qw(max sum); 1613use List::Util qw(max sum);
1571 1614
1572use CFPlus::OpenGL; 1615use DC::OpenGL;
1573 1616
1574sub new { 1617sub new {
1575 my $class = shift; 1618 my $class = shift;
1576 1619
1577 $class->SUPER::new ( 1620 $class->SUPER::new (
… …
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)}; 1664 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622 1665
1623 my $sw = sum @w[$c .. $c + $cs - 1]; 1666 my $sw = sum @w[$c .. $c + $cs - 1];
1624 1667
1625 if ($w > $sw) { 1668 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1669 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 } 1670 }
1628 } 1671 }
1629 1672
1630 # second pass, rows 1673 # second pass, rows
1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { 1674 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)}; 1675 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1633 1676
1634 my $sh = sum @h[$r .. $r + $rs - 1]; 1677 my $sh = sum @h[$r .. $r + $rs - 1];
1635 1678
1636 if ($h > $sh) { 1679 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1680 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1638 } 1681 }
1639 } 1682 }
1640 1683
1641 (\@w, \@h) 1684 (\@w, \@h)
1642} 1685}
… …
1665 @col_expand = (1) x @$ws unless @col_expand; 1708 @col_expand = (1) x @$ws unless @col_expand;
1666 my $col_expand = (sum @col_expand) || 1; 1709 my $col_expand = (sum @col_expand) || 1;
1667 1710
1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1711 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1669 1712
1670 CFPlus::UI::harmonize $ws; 1713 DC::UI::harmonize $ws;
1671 1714
1672 my @row_expand = @{$self->{row_expand}}; 1715 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand; 1716 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1; 1717 my $row_expand = (sum @row_expand) || 1;
1675 1718
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1719 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677 1720
1678 CFPlus::UI::harmonize $hs; 1721 DC::UI::harmonize $hs;
1679 1722
1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1723 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1724 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1682 1725
1683 for my $widget ($self->children) { 1726 for my $widget ($self->children) {
… …
1692 1 1735 1
1693} 1736}
1694 1737
1695############################################################################# 1738#############################################################################
1696 1739
1697package CFPlus::UI::Fixed; 1740package DC::UI::Fixed;
1698 1741
1699use List::Util qw(min max); 1742use List::Util qw(min max);
1700 1743
1701our @ISA = CFPlus::UI::Container::; 1744our @ISA = DC::UI::Container::;
1702 1745
1703sub _scale($$$) { 1746sub _scale($$$) {
1704 my ($rel, $val, $max) = @_; 1747 my ($rel, $val, $max) = @_;
1705 1748
1706 $rel ? $val * $max : $val 1749 $rel ? $val * $max : $val
… …
1758 1 1801 1
1759} 1802}
1760 1803
1761############################################################################# 1804#############################################################################
1762 1805
1763package CFPlus::UI::Box; 1806package DC::UI::Box;
1764 1807
1765our @ISA = CFPlus::UI::Container::; 1808our @ISA = DC::UI::Container::;
1766 1809
1767sub size_request { 1810sub size_request {
1768 my ($self) = @_; 1811 my ($self) = @_;
1769 1812
1770 my @children = $self->visible_children; 1813 my @children = $self->visible_children;
… …
1805 $req[$_] += $space * $children[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1806 for 0 .. $#children; 1849 for 0 .. $#children;
1807 } 1850 }
1808 } 1851 }
1809 1852
1810 CFPlus::UI::harmonize \@req; 1853 DC::UI::harmonize \@req;
1811 1854
1812 my $pos = 0; 1855 my $pos = 0;
1813 for (0 .. $#children) { 1856 for (0 .. $#children) {
1814 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1815 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1820 1 1863 1
1821} 1864}
1822 1865
1823############################################################################# 1866#############################################################################
1824 1867
1825package CFPlus::UI::HBox; 1868package DC::UI::HBox;
1826 1869
1827our @ISA = CFPlus::UI::Box::; 1870our @ISA = DC::UI::Box::;
1828 1871
1829sub new { 1872sub new {
1830 my $class = shift; 1873 my $class = shift;
1831 1874
1832 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1835 ) 1878 )
1836} 1879}
1837 1880
1838############################################################################# 1881#############################################################################
1839 1882
1840package CFPlus::UI::VBox; 1883package DC::UI::VBox;
1841 1884
1842our @ISA = CFPlus::UI::Box::; 1885our @ISA = DC::UI::Box::;
1843 1886
1844sub new { 1887sub new {
1845 my $class = shift; 1888 my $class = shift;
1846 1889
1847 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1850 ) 1893 )
1851} 1894}
1852 1895
1853############################################################################# 1896#############################################################################
1854 1897
1855package CFPlus::UI::Label; 1898package DC::UI::Label;
1856 1899
1857our @ISA = CFPlus::UI::DrawBG::; 1900our @ISA = DC::UI::DrawBG::;
1858 1901
1859use CFPlus::OpenGL; 1902use DC::OpenGL;
1860 1903
1861sub new { 1904sub new {
1862 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1863 1906
1864 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1869 #text => initial text 1912 #text => initial text
1870 #markup => initial narkup 1913 #markup => initial narkup
1871 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1872 #style => 0, # render flags 1915 #style => 0, # render flags
1873 ellipsise => 3, # end 1916 ellipsise => 3, # end
1874 layout => (new CFPlus::Layout), 1917 layout => (new DC::Layout),
1875 fontsize => 1, 1918 fontsize => 1,
1876 align => -1, 1919 align => 0.5,
1877 valign => -1, 1920 valign => 0.5,
1878 padding_x => 2, 1921 padding_x => 4,
1879 padding_y => 2, 1922 padding_y => 2,
1880 can_events => 0, 1923 can_events => 0,
1881 %arg 1924 %arg
1882 ); 1925 );
1883 1926
1884 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1885 my $layout = new CFPlus::Layout; 1928 my $layout = new DC::Layout;
1886 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1887 $self->{template} = $layout; 1930 $self->{template} = $layout;
1888 } 1931 }
1889 1932
1890 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1946 1989
1947sub size_request { 1990sub size_request {
1948 my ($self) = @_; 1991 my ($self) = @_;
1949 1992
1950 $self->{size_req} ||= do { 1993 $self->{size_req} ||= do {
1994 my ($max_w, $max_h) = $self->get_max_wh;
1995
1951 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1996 $self->{layout}->set_font ($self->{font}) if $self->{font};
1952 $self->{layout}->set_width ($self->{max_w} || -1); 1997 $self->{layout}->set_width ($max_w);
1953 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1998 $self->{layout}->set_ellipsise ($self->{ellipsise});
1954 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1999 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1955 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2000 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1956 2001
1957 my ($w, $h) = $self->{layout}->size; 2002 my ($w, $h) = $self->{layout}->size;
1958 2003
1959 if (exists $self->{template}) { 2004 if (exists $self->{template}) {
1960 $self->{template}->set_font ($self->{font}) if $self->{font}; 2005 $self->{template}->set_font ($self->{font}) if $self->{font};
1961 $self->{template}->set_width ($self->{max_w} || -1); 2006 $self->{template}->set_width ($max_w);
1962 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1963 2008
1964 my ($w2, $h2) = $self->{template}->size; 2009 my ($w2, $h2) = $self->{template}->size;
1965 2010
1966 $w = List::Util::max $w, $w2; 2011 $w = List::Util::max $w, $w2;
… …
2022 2067
2023 [$self->{layout}->size] 2068 [$self->{layout}->size]
2024 }; 2069 };
2025 2070
2026 unless (exists $self->{ox}) { 2071 unless (exists $self->{ox}) {
2027 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2072 $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} 2073 $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 2074
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2075 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036 }; 2076 };
2037 2077
2038# unless ($self->{list}) { 2078# unless ($self->{list}) {
2039# $self->{list} = CFPlus::OpenGL::glGenList; 2079# $self->{list} = DC::OpenGL::glGenList;
2040# CFPlus::OpenGL::glNewList $self->{list}; 2080# DC::OpenGL::glNewList $self->{list};
2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2081# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList; 2082# DC::OpenGL::glEndList;
2043# } 2083# }
2044# 2084#
2045# CFPlus::OpenGL::glCallList $self->{list}; 2085# DC::OpenGL::glCallList $self->{list};
2046 2086
2047 $self->{layout}->draw; 2087 $self->{layout}->draw;
2048} 2088}
2049 2089
2050#sub destroy { 2090#sub destroy {
2051# my ($self) = @_; 2091# my ($self) = @_;
2052# 2092#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2093# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054# 2094#
2055# $self->SUPER::destroy; 2095# $self->SUPER::destroy;
2056#} 2096#}
2057 2097
2058############################################################################# 2098#############################################################################
2059 2099
2060package CFPlus::UI::EntryBase; 2100package DC::UI::EntryBase;
2061 2101
2062our @ISA = CFPlus::UI::Label::; 2102our @ISA = DC::UI::Label::;
2063 2103
2064use CFPlus::OpenGL; 2104use DC::OpenGL;
2065 2105
2066sub new { 2106sub new {
2067 my $class = shift; 2107 my $class = shift;
2068 2108
2069 $class->SUPER::new ( 2109 $class->SUPER::new (
2070 fg => [1, 1, 1], 2110 fg => [1, 1, 1],
2071 bg => [0, 0, 0, 0.2], 2111 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1], 2112 outline => undef,
2073 active_bg => [0, 0, 1, .2], 2113 active_bg => [0, 0, 1, .2],
2074 active_fg => [1, 1, 1], 2114 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0], 2115 active_outline => [1, 1, 0],
2076 can_hover => 1, 2116 can_hover => 1,
2077 can_focus => 1, 2117 can_focus => 1,
2118 align => 0,
2078 valign => 0, 2119 valign => 0.5,
2079 can_events => 1, 2120 can_events => 1,
2080 ellipsise => 0, 2121 ellipsise => 0,
2122 padding_x => 4,
2123 padding_y => 2,
2081 #text => ... 2124 #text => ...
2082 #hidden => "*", 2125 #hidden => "*",
2083 @_ 2126 @_
2084 ) 2127 )
2085} 2128}
… …
2132 2175
2133 my $text = $self->get_text; 2176 my $text = $self->get_text;
2134 2177
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2178 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2136 2179
2137 if ($uni == 8) { 2180 if ($sym == DC::SDLK_BACKSPACE) {
2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2181 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2139 } elsif ($uni == 127) { 2182 } elsif ($sym == DC::SDLK_DELETE) {
2140 substr $text, $self->{cursor}, 1, ""; 2183 substr $text, $self->{cursor}, 1, "";
2141 } elsif ($sym == CFPlus::SDLK_LEFT) { 2184 } elsif ($sym == DC::SDLK_LEFT) {
2142 --$self->{cursor} if $self->{cursor}; 2185 --$self->{cursor} if $self->{cursor};
2143 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2186 } elsif ($sym == DC::SDLK_RIGHT) {
2144 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2187 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2145 } elsif ($sym == CFPlus::SDLK_HOME) { 2188 } elsif ($sym == DC::SDLK_HOME) {
2146 # what a hack 2189 # what a hack
2147 $self->{cursor} = 2190 $self->{cursor} =
2148 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2191 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2149 ? length $1 2192 ? length $1
2150 : 0; 2193 : 0;
2151 } elsif ($sym == CFPlus::SDLK_END) { 2194 } elsif ($sym == DC::SDLK_END) {
2152 # uh, again 2195 # uh, again
2153 $self->{cursor} = 2196 $self->{cursor} =
2154 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2197 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2155 ? $self->{cursor} + length $1 2198 ? $self->{cursor} + length $1
2156 : length $self->{text}; 2199 : length $self->{text};
… …
2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2280 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2238 } 2281 }
2239 2282
2240 glColor_premultiply @{$self->{active_fg}}; 2283 glColor_premultiply @{$self->{active_fg}};
2241 glBegin GL_LINES; 2284 glBegin GL_LINES;
2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2285 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}; 2286 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd; 2287 glEnd;
2245 2288
2246 glLineWidth 3; 2289 glLineWidth 3;
2247 glColor @{$self->{active_outline}}; 2290 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1; 2291 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2249 glLineWidth 1; 2292 glLineWidth 1;
2250 2293
2251 } else { 2294 } else {
2252 glColor @{$self->{outline}}; 2295 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP; 2296 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5; 2297 glVertex .5, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3; 2298 glVertex .5, $self->{h} - 2.5;
2257 glVertex $self->{w} - 1, $self->{h} - 3; 2299 glVertex $self->{w} - .5, $self->{h} - 2.5;
2258 glVertex $self->{w} - 1, $self->{h} * .5; 2300 glVertex $self->{w} - .5, $self->{h} * .5;
2259 glEnd; 2301 glEnd;
2260 } 2302 }
2261} 2303}
2262 2304
2263############################################################################# 2305#############################################################################
2264 2306
2265package CFPlus::UI::Entry; 2307package DC::UI::Entry;
2266 2308
2267our @ISA = CFPlus::UI::EntryBase::; 2309our @ISA = DC::UI::EntryBase::;
2268 2310
2269use CFPlus::OpenGL; 2311use DC::OpenGL;
2312
2313sub new {
2314 my $class = shift;
2315
2316 $class->SUPER::new (
2317 history_pointer => -1,
2318 @_
2319 )
2320}
2321
2270 2322
2271sub invoke_key_down { 2323sub invoke_key_down {
2272 my ($self, $ev) = @_; 2324 my ($self, $ev) = @_;
2273 2325
2274 my $sym = $ev->{sym}; 2326 my $sym = $ev->{sym};
… …
2280 $self->{history_pointer} = -1; 2332 $self->{history_pointer} = -1;
2281 $self->{history_saveback} = ''; 2333 $self->{history_saveback} = '';
2282 $self->emit (activate => $txt); 2334 $self->emit (activate => $txt);
2283 $self->update; 2335 $self->update;
2284 2336
2285 } elsif ($sym == CFPlus::SDLK_UP) { 2337 } elsif ($sym == DC::SDLK_UP) {
2286 if ($self->{history_pointer} < 0) { 2338 if ($self->{history_pointer} < 0) {
2287 $self->{history_saveback} = $self->get_text; 2339 $self->{history_saveback} = $self->get_text;
2288 } 2340 }
2289 if (@{$self->{history} || []} > 0) { 2341 if (@{$self->{history} || []} > 0) {
2290 $self->{history_pointer}++; 2342 $self->{history_pointer}++;
… …
2292 $self->{history_pointer} = @{$self->{history} || []} - 1; 2344 $self->{history_pointer} = @{$self->{history} || []} - 1;
2293 } 2345 }
2294 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2346 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2295 } 2347 }
2296 2348
2297 } elsif ($sym == CFPlus::SDLK_DOWN) { 2349 } elsif ($sym == DC::SDLK_DOWN) {
2298 $self->{history_pointer}--; 2350 $self->{history_pointer}--;
2299 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2351 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2300 2352
2301 if ($self->{history_pointer} >= 0) { 2353 if ($self->{history_pointer} >= 0) {
2302 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2354 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2303 } else { 2355 } else {
2356 if (defined $self->{history_saveback}) {
2304 $self->set_text ($self->{history_saveback}); 2357 $self->set_text ($self->{history_saveback});
2358 $self->{history_saveback} = undef;
2359 }
2305 } 2360 }
2306 2361
2307 } else { 2362 } else {
2308 return $self->SUPER::invoke_key_down ($ev) 2363 return $self->SUPER::invoke_key_down ($ev)
2309 } 2364 }
… …
2311 1 2366 1
2312} 2367}
2313 2368
2314############################################################################# 2369#############################################################################
2315 2370
2316package CFPlus::UI::TextEdit; 2371package DC::UI::TextEdit;
2317 2372
2318our @ISA = CFPlus::UI::EntryBase::; 2373our @ISA = DC::UI::EntryBase::;
2319 2374
2320use CFPlus::OpenGL; 2375use DC::OpenGL;
2376
2377sub new {
2378 my $class = shift;
2379
2380 $class->SUPER::new (
2381 padding_y => 4,
2382
2383 @_
2384 )
2385}
2321 2386
2322sub move_cursor_ver { 2387sub move_cursor_ver {
2323 my ($self, $dy) = @_; 2388 my ($self, $dy) = @_;
2324 2389
2325 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2390 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2326 2391
2327 $y += $dy; 2392 $line += $dy;
2328 2393
2329 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2394 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2330 $self->{cursor} = $index; 2395 $self->{cursor} = $index;
2331 delete $self->{cur_h}; 2396 delete $self->{cur_h};
2332 $self->update; 2397 $self->update;
2333 return; 2398 return;
2334 } 2399 }
… …
2337sub invoke_key_down { 2402sub invoke_key_down {
2338 my ($self, $ev) = @_; 2403 my ($self, $ev) = @_;
2339 2404
2340 my $sym = $ev->{sym}; 2405 my $sym = $ev->{sym};
2341 2406
2342 if ($sym == CFPlus::SDLK_UP) { 2407 if ($sym == DC::SDLK_UP) {
2343 $self->move_cursor_ver (-1); 2408 $self->move_cursor_ver (-1);
2344 } elsif ($sym == CFPlus::SDLK_DOWN) { 2409 } elsif ($sym == DC::SDLK_DOWN) {
2345 $self->move_cursor_ver (+1); 2410 $self->move_cursor_ver (+1);
2346 } else { 2411 } else {
2347 return $self->SUPER::invoke_key_down ($ev) 2412 return $self->SUPER::invoke_key_down ($ev)
2348 } 2413 }
2349 2414
2350 1 2415 1
2351} 2416}
2352 2417
2353############################################################################# 2418#############################################################################
2354 2419
2355package CFPlus::UI::ButtonBin; 2420package DC::UI::ButtonBin;
2356 2421
2357our @ISA = CFPlus::UI::Bin::; 2422our @ISA = DC::UI::Bin::;
2358 2423
2359use CFPlus::OpenGL; 2424use DC::OpenGL;
2360 2425
2361my @tex = 2426my @tex =
2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2427 map { new_from_resource DC::Texture $_, mipmap => 1 }
2363 qw(b1_button_inactive.png b1_button_active.png); 2428 qw(b1_button_inactive.png b1_button_active.png);
2364 2429
2365sub new { 2430sub new {
2366 my $class = shift; 2431 my $class = shift;
2367 2432
2368 $class->SUPER::new ( 2433 $class->SUPER::new (
2369 can_hover => 1, 2434 can_hover => 1,
2370 align => 0, 2435 align => 0.5,
2371 valign => 0, 2436 valign => 0.5,
2372 can_events => 1, 2437 can_events => 1,
2373 @_ 2438 @_
2374 ) 2439 )
2375} 2440}
2376 2441
… …
2399 $self->SUPER::_draw; 2464 $self->SUPER::_draw;
2400} 2465}
2401 2466
2402############################################################################# 2467#############################################################################
2403 2468
2404package CFPlus::UI::Button; 2469package DC::UI::Button;
2405 2470
2406our @ISA = CFPlus::UI::Label::; 2471our @ISA = DC::UI::Label::;
2407 2472
2408use CFPlus::OpenGL; 2473use DC::OpenGL;
2409 2474
2410my @tex = 2475my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2476 map { new_from_resource DC::Texture $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png); 2477 qw(b1_button_inactive.png b1_button_active.png);
2413 2478
2414sub new { 2479sub new {
2415 my $class = shift; 2480 my $class = shift;
2416 2481
2417 $class->SUPER::new ( 2482 $class->SUPER::new (
2418 padding_x => 4, 2483 padding_x => 8,
2419 padding_y => 4, 2484 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0], 2485 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8], 2486 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1, 2487 can_hover => 1,
2423 align => 0, 2488 align => 0.5,
2424 valign => 0, 2489 valign => 0.5,
2425 can_events => 1, 2490 can_events => 1,
2426 @_ 2491 @_
2427 ) 2492 )
2428} 2493}
2429 2494
… …
2454 $self->SUPER::_draw; 2519 $self->SUPER::_draw;
2455} 2520}
2456 2521
2457############################################################################# 2522#############################################################################
2458 2523
2459package CFPlus::UI::CheckBox; 2524package DC::UI::CheckBox;
2460 2525
2461our @ISA = CFPlus::UI::DrawBG::; 2526our @ISA = DC::UI::DrawBG::;
2462 2527
2463my @tex = 2528my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2529 map { new_from_resource DC::Texture $_, mipmap => 1 }
2465 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2530 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2466 2531
2467use CFPlus::OpenGL; 2532use DC::OpenGL;
2468 2533
2469sub new { 2534sub new {
2470 my $class = shift; 2535 my $class = shift;
2471 2536
2472 $class->SUPER::new ( 2537 $class->SUPER::new (
2538 fontsize => 1,
2473 padding_x => 2, 2539 padding_x => 2,
2474 padding_y => 2, 2540 padding_y => 2,
2475 fg => [1, 1, 1], 2541 fg => [1, 1, 1],
2476 active_fg => [1, 1, 0], 2542 active_fg => [1, 1, 0],
2477 bg => [0, 0, 0, 0.2], 2543 bg => [0, 0, 0, 0.2],
… …
2483} 2549}
2484 2550
2485sub size_request { 2551sub size_request {
2486 my ($self) = @_; 2552 my ($self) = @_;
2487 2553
2488 (6) x 2 2554 ($self->{fontsize} * $::FONTSIZE) x 2
2489} 2555}
2490 2556
2491sub toggle { 2557sub toggle {
2492 my ($self) = @_; 2558 my ($self) = @_;
2493 2559
… …
2512sub _draw { 2578sub _draw {
2513 my ($self) = @_; 2579 my ($self) = @_;
2514 2580
2515 $self->SUPER::_draw; 2581 $self->SUPER::_draw;
2516 2582
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2583 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2518 2584
2519 my ($w, $h) = @$self{qw(w h)}; 2585 my ($w, $h) = @$self{qw(w h)};
2520 2586
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2587 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522 2588
… …
2529 glDisable GL_TEXTURE_2D; 2595 glDisable GL_TEXTURE_2D;
2530} 2596}
2531 2597
2532############################################################################# 2598#############################################################################
2533 2599
2534package CFPlus::UI::Image; 2600package DC::UI::Image;
2535 2601
2536our @ISA = CFPlus::UI::Base::; 2602our @ISA = DC::UI::DrawBG::;
2537 2603
2538use CFPlus::OpenGL; 2604use DC::OpenGL;
2539 2605
2540our %texture_cache; 2606our %texture_cache;
2541 2607
2542sub new { 2608sub new {
2543 my $class = shift; 2609 my $class = shift;
… …
2550 2616
2551 $self->{path} || $self->{tex} 2617 $self->{path} || $self->{tex}
2552 or Carp::croak "'path' or 'tex' attributes required"; 2618 or Carp::croak "'path' or 'tex' attributes required";
2553 2619
2554 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2620 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2555 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2621 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2556 2622
2557 CFPlus::weaken $texture_cache{$self->{path}}; 2623 DC::weaken $texture_cache{$self->{path}};
2558 2624
2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2625 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2560 2626
2561 $self 2627 $self
2562} 2628}
2563 2629
2564sub STORABLE_freeze { 2630sub STORABLE_freeze {
2565 my ($self, $cloning) = @_; 2631 my ($self, $cloning) = @_;
2566 2632
2567 $self->{path} 2633 $self->{path}
2568 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2634 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2569 2635
2570 $self->{path} 2636 $self->{path}
2571} 2637}
2572 2638
2573sub STORABLE_attach { 2639sub STORABLE_attach {
2574 my ($self, $cloning, $path) = @_; 2640 my ($self, $cloning, $path) = @_;
2575 2641
2576 $self->new (path => $path) 2642 $self->new (path => $path)
2577} 2643}
2578 2644
2645sub set_texture {
2646 my ($self, $tex) = @_;
2647
2648 $self->{tex} = $tex;
2649 $self->update;
2650}
2651
2579sub size_request { 2652sub size_request {
2580 my ($self) = @_; 2653 my ($self) = @_;
2581 2654
2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale}) 2655 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2583} 2656}
2584 2657
2585sub _draw { 2658sub _draw {
2586 my ($self) = @_; 2659 my ($self) = @_;
2660
2661 $self->SUPER::_draw;
2587 2662
2588 my $tex = $self->{tex}; 2663 my $tex = $self->{tex};
2589 2664
2590 my ($w, $h) = ($self->{w}, $self->{h}); 2665 my ($w, $h) = ($self->{w}, $self->{h});
2591 2666
… …
2604 glDisable GL_TEXTURE_2D; 2679 glDisable GL_TEXTURE_2D;
2605} 2680}
2606 2681
2607############################################################################# 2682#############################################################################
2608 2683
2609package CFPlus::UI::ImageButton; 2684package DC::UI::ImageButton;
2610 2685
2611our @ISA = CFPlus::UI::Image::; 2686our @ISA = DC::UI::Image::;
2612 2687
2613use CFPlus::OpenGL; 2688use DC::OpenGL;
2614
2615my %textures;
2616 2689
2617sub new { 2690sub new {
2618 my $class = shift; 2691 my $class = shift;
2619 2692
2620 my $self = $class->SUPER::new ( 2693 my $self = $class->SUPER::new (
2621 padding_x => 4, 2694 padding_x => 4,
2622 padding_y => 4, 2695 padding_y => 4,
2623 fg => [1, 1, 1], 2696 fg => [1, 1, 1],
2624 active_fg => [0, 0, 1], 2697 active_fg => [0, 0, 1],
2625 can_hover => 1, 2698 can_hover => 1,
2626 align => 0, 2699 align => 0.5,
2627 valign => 0, 2700 valign => 0.5,
2628 can_events => 1, 2701 can_events => 1,
2629 @_ 2702 @_
2630 ); 2703 );
2631} 2704}
2632 2705
… …
2646 1 2719 1
2647} 2720}
2648 2721
2649############################################################################# 2722#############################################################################
2650 2723
2651package CFPlus::UI::VGauge; 2724package DC::UI::VGauge;
2652 2725
2653our @ISA = CFPlus::UI::Base::; 2726our @ISA = DC::UI::Base::;
2654 2727
2655use List::Util qw(min max); 2728use List::Util qw(min max);
2656 2729
2657use CFPlus::OpenGL; 2730use DC::OpenGL;
2658 2731
2659my %tex = ( 2732my %tex = (
2660 food => [ 2733 food => [
2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2734 map { new_from_resource DC::Texture $_, mipmap => 1 }
2662 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2735 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2663 ], 2736 ],
2664 grace => [ 2737 grace => [
2665 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2738 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/ 2739 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2667 ], 2740 ],
2668 hp => [ 2741 hp => [
2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2742 map { new_from_resource DC::Texture $_, mipmap => 1 }
2670 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2743 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2671 ], 2744 ],
2672 mana => [ 2745 mana => [
2673 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2746 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/ 2747 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2675 ], 2748 ],
2676); 2749);
2677 2750
2678# eg. VGauge->new (gauge => 'food'), default gauge: food 2751# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2781 glDisable GL_TEXTURE_2D; 2854 glDisable GL_TEXTURE_2D;
2782} 2855}
2783 2856
2784############################################################################# 2857#############################################################################
2785 2858
2786package CFPlus::UI::Progress; 2859package DC::UI::Progress;
2787 2860
2788our @ISA = CFPlus::UI::Label::; 2861our @ISA = DC::UI::Label::;
2789 2862
2790use CFPlus::OpenGL; 2863use DC::OpenGL;
2791 2864
2792sub new { 2865sub new {
2793 my ($class, %arg) = @_; 2866 my ($class, %arg) = @_;
2794 2867
2795 my $self = $class->SUPER::new ( 2868 my $self = $class->SUPER::new (
2869 padding_x => 2,
2870 padding_y => 2,
2796 fg => [1, 1, 1], 2871 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2], 2872 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8], 2873 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0], 2874 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9, 2875 fontsize => 0.9,
2801 valign => 0, 2876 valign => 0.5,
2802 align => 0, 2877 align => 0.5,
2803 can_events => 1, 2878 can_events => 1,
2804 ellipsise => 1, 2879 ellipsise => 1,
2805 label => "%d%%", 2880 label => "%d%%",
2806 %arg, 2881 %arg,
2807 ); 2882 );
… …
2815 my ($self, $label) = @_; 2890 my ($self, $label) = @_;
2816 2891
2817 return if $self->{label} eq $label; 2892 return if $self->{label} eq $label;
2818 $self->{label} = $label; 2893 $self->{label} = $label;
2819 2894
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value}); 2895 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2821} 2896}
2822 2897
2823sub set_value { 2898sub set_value {
2824 my ($self, $value) = @_; 2899 my ($self, $value) = @_;
2825 2900
… …
2840 my ($self) = @_; 2915 my ($self) = @_;
2841 2916
2842 glEnable GL_BLEND; 2917 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2918 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844 2919
2920 my $px = $self->{padding_x};
2921 my $py = $self->{padding_y};
2922
2845 if ($self->{value} >= 0) { 2923 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value}; 2924 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2847 2925
2848 glColor_premultiply @{$self->{bar}}; 2926 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2; 2927 glRect $px, $py, $s, $self->{h} - $py;
2850 glColor_premultiply @{$self->{bg}}; 2928 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2; 2929 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2852 } 2930 }
2853 2931
2854 glColor_premultiply @{$self->{outline}}; 2932 glColor_premultiply @{$self->{outline}};
2933
2934 $px -= .5;
2935 $py -= .5;
2936
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2; 2937 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2856 2938
2857 glDisable GL_BLEND; 2939 glDisable GL_BLEND;
2858 2940
2859 { 2941 {
2860 local $self->{bg}; # do not draw background 2942 local $self->{bg}; # do not draw background
… …
2862 } 2944 }
2863} 2945}
2864 2946
2865############################################################################# 2947#############################################################################
2866 2948
2867package CFPlus::UI::ExperienceProgress; 2949package DC::UI::ExperienceProgress;
2868 2950
2869our @ISA = CFPlus::UI::Progress::; 2951our @ISA = DC::UI::Progress::;
2870 2952
2871sub new { 2953sub new {
2872 my ($class, %arg) = @_; 2954 my ($class, %arg) = @_;
2873 2955
2956 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2957
2874 my $self = $class->SUPER::new ( 2958 my $self = $class->SUPER::new (
2875 %arg 2959 %arg,
2960 tooltip => sub {
2961 my ($self) = @_;
2962
2963 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2964 $tt,
2965 $self->{lvl},
2966 ::formsep ($self->{exp}),
2967 ::formsep ($self->{nxt}),
2968 ::formsep ($self->{nxt} - $self->{exp}),
2969 $self->_percent * 100,
2970 },
2876 ); 2971 );
2877 2972
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2973 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN; 2974 if $::CONN;
2880 2975
… …
2888 if $::CONN; 2983 if $::CONN;
2889 2984
2890 $self->SUPER::DESTROY; 2985 $self->SUPER::DESTROY;
2891} 2986}
2892 2987
2988sub _percent {
2989 my ($self) = @_;
2990
2991 my $table = $::CONN && $::CONN->{exp_table}
2992 or return -1;
2993
2994 my $l0 = $table->[$self->{lvl} - 1];
2995 my $l1 = $table->[$self->{lvl}];
2996
2997 $self->{nxt} = $l1;
2998
2999 ($self->{exp} - $l0) / ($l1 - $l0)
3000}
3001
2893sub set_value { 3002sub set_value {
2894 my ($self, $lvl, $exp) = @_; 3003 my ($self, $lvl, $exp) = @_;
2895 3004
2896 my $v = -1; 3005 $self->{lvl} = $lvl;
3006 $self->{exp} = $exp;
2897 3007
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); 3008 $self->SUPER::set_value ($self->_percent);
2906} 3009}
2907 3010
2908############################################################################# 3011#############################################################################
2909 3012
2910package CFPlus::UI::Gauge; 3013package DC::UI::Gauge;
2911 3014
2912our @ISA = CFPlus::UI::VBox::; 3015our @ISA = DC::UI::VBox::;
2913 3016
2914sub new { 3017sub new {
2915 my ($class, %arg) = @_; 3018 my ($class, %arg) = @_;
2916 3019
2917 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
… …
2919 can_hover => 1, 3022 can_hover => 1,
2920 can_events => 1, 3023 can_events => 1,
2921 %arg, 3024 %arg,
2922 ); 3025 );
2923 3026
2924 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3027 $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); 3028 $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"); 3029 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2927 3030
2928 $self 3031 $self
2929} 3032}
2930 3033
2931sub set_fontsize { 3034sub set_fontsize {
… …
2952 $self->{value}->set_text ($val); 3055 $self->{value}->set_text ($val);
2953} 3056}
2954 3057
2955############################################################################# 3058#############################################################################
2956 3059
2957package CFPlus::UI::Slider; 3060package DC::UI::Slider;
2958 3061
2959use strict; 3062use common::sense;
2960 3063
2961use CFPlus::OpenGL; 3064use DC::OpenGL;
2962 3065
2963our @ISA = CFPlus::UI::DrawBG::; 3066our @ISA = DC::UI::DrawBG::;
2964 3067
2965my @tex = 3068my @tex =
2966 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3069 map { new_from_resource DC::Texture $_ }
2967 qw(s1_slider.png s1_slider_bg.png); 3070 qw(s1_slider.png s1_slider_bg.png);
2968 3071
2969sub new { 3072sub new {
2970 my $class = shift; 3073 my $class = shift;
2971 3074
… …
3008sub set_value { 3111sub set_value {
3009 my ($self, $value) = @_; 3112 my ($self, $value) = @_;
3010 3113
3011 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3114 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
3012 3115
3013 $hi = $lo + 1 if $hi <= $lo; 3116 $hi = $lo if $hi < $lo;
3014 3117
3015 $page = $hi - $lo if $page > $hi - $lo; 3118 $value = $hi - $page if $value > $hi - $page;
3016
3017 $value = $lo if $value < $lo; 3119 $value = $lo if $value < $lo;
3018 $value = $hi - $page if $value > $hi - $page;
3019 3120
3020 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3121 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
3021 if $unit; 3122 if $unit;
3022 3123
3023 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3124 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
3052 if ($GRAB == $self) { 3153 if ($GRAB == $self) {
3053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3154 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
3054 3155
3055 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3156 my (undef, $lo, $hi, $page) = @{$self->{range}};
3056 3157
3057 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3158 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
3058 3159
3059 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3160 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
3060 } else { 3161 } else {
3061 return 0; 3162 return 0;
3062 } 3163 }
… …
3067sub invoke_mouse_wheel { 3168sub invoke_mouse_wheel {
3068 my ($self, $ev) = @_; 3169 my ($self, $ev) = @_;
3069 3170
3070 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3171 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3071 3172
3072 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3173 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3073 3174
3074 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3175 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3075 3176
3076 1 3177 1
3077} 3178}
… …
3087 my ($self) = @_; 3188 my ($self) = @_;
3088 3189
3089 unless ($self->{knob_w}) { 3190 unless ($self->{knob_w}) {
3090 $self->set_value ($self->{range}[0]); 3191 $self->set_value ($self->{range}[0]);
3091 3192
3092 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3193 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
3093 my $range = ($hi - $page - $lo) || 1e-100; 3194 my $range = ($hi - $page - $lo) || 1e-10;
3094 3195
3095 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3196 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
3096 3197
3097 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3198 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
3098 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3199 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
3099 3200
3100 $value = ($value - $lo) / $range; 3201 $value = ($value - $lo) / $range;
… …
3130 glDisable GL_TEXTURE_2D; 3231 glDisable GL_TEXTURE_2D;
3131} 3232}
3132 3233
3133############################################################################# 3234#############################################################################
3134 3235
3135package CFPlus::UI::ValSlider; 3236package DC::UI::ValSlider;
3136 3237
3137our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
3138 3239
3139sub new { 3240sub new {
3140 my ($class, %arg) = @_; 3241 my ($class, %arg) = @_;
3141 3242
3142 my $range = delete $arg{range}; 3243 my $range = delete $arg{range};
3143 3244
3144 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
3145 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3246 slider => (new DC::UI::Slider expand => 1, range => $range),
3146 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3247 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3147 to_value => sub { shift }, 3248 to_value => sub { shift },
3148 from_value => sub { shift }, 3249 from_value => sub { shift },
3149 %arg, 3250 %arg,
3150 ); 3251 );
3151 3252
… …
3171sub set_range { shift->{slider}->set_range (@_) } 3272sub set_range { shift->{slider}->set_range (@_) }
3172sub set_value { shift->{slider}->set_value (@_) } 3273sub set_value { shift->{slider}->set_value (@_) }
3173 3274
3174############################################################################# 3275#############################################################################
3175 3276
3176package CFPlus::UI::TextScroller; 3277package DC::UI::TextScroller;
3177 3278
3178our @ISA = CFPlus::UI::HBox::; 3279our @ISA = DC::UI::HBox::;
3179 3280
3180use CFPlus::OpenGL; 3281use DC::OpenGL;
3181 3282
3182sub new { 3283sub new {
3183 my $class = shift; 3284 my $class = shift;
3184 3285
3185 my $self = $class->SUPER::new ( 3286 my $self = $class->SUPER::new (
… …
3187 can_events => 1, 3288 can_events => 1,
3188 indent => 0, 3289 indent => 0,
3189 #font => default_font 3290 #font => default_font
3190 @_, 3291 @_,
3191 3292
3192 layout => (new CFPlus::Layout), 3293 layout => (new DC::Layout),
3193 par => [],
3194 max_par => 0, 3294 max_par => 0,
3195 height => 0, 3295 height => 0,
3196 children => [ 3296 children => [
3197 (new CFPlus::UI::Empty expand => 1), 3297 (new DC::UI::Empty expand => 1),
3198 (new CFPlus::UI::Slider vertical => 1), 3298 (new DC::UI::Slider vertical => 1),
3199 ], 3299 ],
3200 ); 3300 );
3201 3301
3202 $self->{children}[1]->connect (changed => sub { $self->update }); 3302 $self->{children}[1]->connect (changed => sub { $self->update });
3303
3304 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3203 3305
3204 $self 3306 $self
3205} 3307}
3206 3308
3207sub set_fontsize { 3309sub set_fontsize {
… …
3259 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3361 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3260 $layout->set_markup ($para->{markup}); 3362 $layout->set_markup ($para->{markup});
3261 3363
3262 $layout->set_shapes ( 3364 $layout->set_shapes (
3263 map 3365 map
3264 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3366 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3265 @{$para->{widget}} 3367 @{$para->{widget}}
3266 ); 3368 );
3267 3369
3268 $layout 3370 $layout
3269} 3371}
… …
3386 $ROOT->on_post_alloc ($self => sub { 3488 $ROOT->on_post_alloc ($self => sub {
3387 $self->force_uptodate; 3489 $self->force_uptodate;
3388 3490
3389 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3491 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3390 3492
3391 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3493 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3392 glClearColor 0, 0, 0, 0; 3494 glClearColor 0, 0, 0, 0;
3393 glClear GL_COLOR_BUFFER_BIT; 3495 glClear GL_COLOR_BUFFER_BIT;
3394 3496
3395 package CFPlus::UI::Base; 3497 package DC::UI::Base;
3396 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3498 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3397 (0, 0, $self->{w}, $self->{h}); 3499 (0, 0, $self->{w}, $self->{h});
3398 3500
3399 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
3400 3502
… …
3459 $self->{children}[1]->draw; 3561 $self->{children}[1]->draw;
3460} 3562}
3461 3563
3462############################################################################# 3564#############################################################################
3463 3565
3464package CFPlus::UI::Animator; 3566package DC::UI::Animator;
3465 3567
3466use CFPlus::OpenGL; 3568use DC::OpenGL;
3467 3569
3468our @ISA = CFPlus::UI::Bin::; 3570our @ISA = DC::UI::Bin::;
3469 3571
3470sub moveto { 3572sub moveto {
3471 my ($self, $x, $y) = @_; 3573 my ($self, $x, $y) = @_;
3472 3574
3473 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3575 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3501 glPopMatrix; 3603 glPopMatrix;
3502} 3604}
3503 3605
3504############################################################################# 3606#############################################################################
3505 3607
3506package CFPlus::UI::Flopper; 3608package DC::UI::Flopper;
3507 3609
3508our @ISA = CFPlus::UI::Button::; 3610our @ISA = DC::UI::Button::;
3509 3611
3510sub new { 3612sub new {
3511 my $class = shift; 3613 my $class = shift;
3512 3614
3513 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
… …
3525 $self->{other}->toggle_visibility; 3627 $self->{other}->toggle_visibility;
3526} 3628}
3527 3629
3528############################################################################# 3630#############################################################################
3529 3631
3530package CFPlus::UI::Tooltip; 3632package DC::UI::Tooltip;
3531 3633
3532our @ISA = CFPlus::UI::Bin::; 3634our @ISA = DC::UI::Bin::;
3533 3635
3534use CFPlus::OpenGL; 3636use DC::OpenGL;
3535 3637
3536sub new { 3638sub new {
3537 my $class = shift; 3639 my $class = shift;
3538 3640
3539 $class->SUPER::new ( 3641 $class->SUPER::new (
3540 @_, 3642 @_,
3541 can_events => 0, 3643 can_events => 0,
3542 ) 3644 )
3543} 3645}
3544 3646
3647# expand, as good as possible
3648sub _expand_doclets {
3649 my ($tip) = @_;
3650
3651 $tip =~ s{#\(([^)]+)\)}{
3652 if ($::CONN) {
3653 exists $::CONN->{doclet}{$1}
3654 ? $::CONN->{doclet}{$1}
3655 : "(waiting for server to show full text)"
3656 } else {
3657 "(unable to show full text without server connection)"
3658 }
3659 }ge;
3660
3661 $tip =~ s/^\n+//;
3662 $tip =~ s/\n+$//;
3663
3664 $tip
3665}
3666
3667# expands a tooltip, potentially multiple times remotely
3668# and returns a guard. clals the clalback each time the text changes.
3669sub expand_tooltip {
3670 my ($tip, $cb) = @_;
3671
3672 # first expand #name tooltips from local pod
3673 $tip = DC::Pod::section_label tooltip => $1
3674 if $tip =~ /^#([^(].*)$/;
3675
3676 my $active; # true if any remote requests outstanding
3677
3678 if ($::CONN && $::CONN->{addme_success}) {
3679 # now find all doclet references
3680 for my $doclet ($tip =~ /#\(([^)]+)\)/g) {
3681 unless (exists $::CONN->{doclet}{$doclet}) {
3682 # need to ask the server
3683 # we don't try to avoid duplicate requests
3684
3685 $active = 1;
3686 $::CONN->send_exti_req (doclet => (split /\//, $doclet, 2), sub {
3687 $::CONN->{doclet}{$doclet} = DC::sanitise_cfxml $_[0];
3688 $cb->(_expand_doclets $tip) if $active;
3689 });
3690 }
3691 }
3692 }
3693
3694 $cb->(_expand_doclets $tip);
3695
3696 $active and Guard::guard { undef $active }
3697}
3698
3545sub set_tooltip_from { 3699sub set_tooltip_from {
3546 my ($self, $widget) = @_; 3700 my ($self, $widget) = @_;
3547 3701
3548 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3549 if $widget->{tooltip} =~ /^#(.*)$/;
3550
3551 my $tooltip = $widget->{tooltip}; 3702 my $tip = $widget->{tooltip};
3703 $tip = $tip->($widget) if "CODE" eq ref $tip;
3552 3704
3553 if ($ENV{CFPLUS_DEBUG} & 2) {
3554 $tooltip .= "\n\n" . (ref $widget) . "\n"
3555 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3556 . "req $widget->{req_w} $widget->{req_h}\n"
3557 . "visible $widget->{visible}";
3558 }
3559
3560 $tooltip =~ s/^\n+//;
3561 $tooltip =~ s/\n+$//;
3562
3563 $self->add (new CFPlus::UI::Label 3705 $self->add (new DC::UI::Label
3564 markup => $tooltip, 3706 fg => $DC::THEME{tooltip_fg},
3565 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3707 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3708 align => 0,
3566 fontsize => 0.8, 3709 fontsize => 0.8,
3567 style => 1, # FLAG_INVERSE 3710 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3568 ellipsise => 0, 3711 ellipsise => 0,
3569 font => ($widget->{tooltip_font} || $::FONT_PROP), 3712 font => ($widget->{tooltip_font} || $::FONT_PROP),
3570 ); 3713 );
3714
3715 $self->{tooltip_expand} = expand_tooltip $tip, sub {
3716 my ($tip) = @_;
3717
3718 if ($ENV{CFPLUS_DEBUG} & 2) {
3719 $tip .= "\n\n" . (ref $widget) . "\n"
3720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3721 . "req $widget->{req_w} $widget->{req_h}\n"
3722 . "visible $widget->{visible}";
3723 }
3724
3725 $self->{children}[0]->set_markup ($tip);
3726 };
3571} 3727}
3572 3728
3573sub size_request { 3729sub size_request {
3574 my ($self) = @_; 3730 my ($self) = @_;
3575 3731
… …
3607} 3763}
3608 3764
3609sub _draw { 3765sub _draw {
3610 my ($self) = @_; 3766 my ($self) = @_;
3611 3767
3612 glTranslate 0.375, 0.375;
3613
3614 my ($w, $h) = @$self{qw(w h)}; 3768 my ($w, $h) = @$self{qw(w h)};
3615 3769
3616 glColor 1, 0.8, 0.4; 3770 glColor @{ $DC::THEME{tooltip_bg} };
3617 glRect 0, 0, $w, $h; 3771 glRect 0, 0, $w, $h;
3618 3772
3619 glColor 0, 0, 0; 3773 glColor @{ $DC::THEME{tooltip_border} };
3620 glRect_lineloop 0, 0, $w, $h; 3774 glRect_lineloop .5, .5, $w + .5, $h + .5;
3621 3775
3622 glTranslate 2 - 0.375, 2 - 0.375; 3776 glTranslate 2, 2;
3623 3777
3624 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3625} 3779}
3626 3780
3627############################################################################# 3781#############################################################################
3628 3782
3629package CFPlus::UI::Face; 3783package DC::UI::Face;
3630 3784
3631our @ISA = CFPlus::UI::DrawBG::; 3785our @ISA = DC::UI::DrawBG::;
3632 3786
3633use CFPlus::OpenGL; 3787use DC::OpenGL;
3634 3788
3635sub new { 3789sub new {
3636 my $class = shift; 3790 my $class = shift;
3637 3791
3638 my $self = $class->SUPER::new ( 3792 my $self = $class->SUPER::new (
… …
3641 aspect => 1, 3795 aspect => 1,
3642 can_events => 0, 3796 can_events => 0,
3643 @_, 3797 @_,
3644 ); 3798 );
3645 3799
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; 3800 $self->update_anim;
3670 }
3671 3801
3672 $self 3802 $self
3673} 3803}
3674 3804
3675sub update_timer { 3805sub update_timer {
3676 my ($self) = @_; 3806 my ($self) = @_;
3677 3807
3678 return unless $self->{timer}; 3808 return unless $self->{timer};
3679 3809
3680 if ($self->{visible}) { 3810 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; 3811 $self->{timer}->start;
3687 } else { 3812 } else {
3688 $self->{timer}->stop; 3813 $self->{timer}->stop;
3689 } 3814 }
3690} 3815}
… …
3703 $tex->upload (sub { $self->reconfigure }); 3828 $tex->upload (sub { $self->reconfigure });
3704 } 3829 }
3705 } 3830 }
3706 } 3831 }
3707 } 3832 }
3833 }
3834}
3835
3836sub update_anim {
3837 my ($self) = @_;
3838
3839 if ($self->{anim} && $self->{animspeed}) {
3840 DC::weaken (my $widget = $self);
3841
3842 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3843 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3844 return unless $::CONN;
3845
3846 my $w = $widget
3847 or return;
3848
3849 ++$w->{frame};
3850 $w->update_face;
3851
3852 # somehow, $widget can go away
3853 $w->update;
3854 $w->update_timer;
3855 };
3856
3857 $self->update_face;
3858 $self->update_timer;
3859 } else {
3860 delete $self->{timer};
3708 } 3861 }
3709} 3862}
3710 3863
3711sub size_request { 3864sub size_request {
3712 my ($self) = @_; 3865 my ($self) = @_;
… …
3734 return unless $self->{visible}; 3887 return unless $self->{visible};
3735 3888
3736 $self->SUPER::update; 3889 $self->SUPER::update;
3737} 3890}
3738 3891
3892sub set_face {
3893 my ($self, $face) = @_;
3894
3895 $self->{face} = $face;
3896 $self->reconfigure;
3897}
3898
3899sub set_anim {
3900 my ($self, $anim) = @_;
3901
3902 $self->{anim} = $anim;
3903 $self->update_anim;
3904}
3905
3906sub set_animspeed {
3907 my ($self, $animspeed) = @_;
3908
3909 $self->{animspeed} = $animspeed;
3910 $self->update_anim;
3911}
3912
3739sub invoke_visibility_change { 3913sub invoke_visibility_change {
3740 my ($self) = @_; 3914 my ($self) = @_;
3741 3915
3742 $self->update_timer; 3916 $self->update_timer;
3743 3917
… …
3767 $self->SUPER::destroy; 3941 $self->SUPER::destroy;
3768} 3942}
3769 3943
3770############################################################################# 3944#############################################################################
3771 3945
3772package CFPlus::UI::Buttonbar; 3946package DC::UI::Buttonbar;
3773 3947
3774our @ISA = CFPlus::UI::HBox::; 3948our @ISA = DC::UI::HBox::;
3775 3949
3776# TODO: should actually wrap buttons and other goodies. 3950# TODO: should actually wrap buttons and other goodies.
3777 3951
3778############################################################################# 3952#############################################################################
3779 3953
3780package CFPlus::UI::Menu; 3954package DC::UI::Menu;
3781 3955
3782our @ISA = CFPlus::UI::Toplevel::; 3956our @ISA = DC::UI::Toplevel::;
3783 3957
3784use CFPlus::OpenGL; 3958use DC::OpenGL;
3785 3959
3786sub new { 3960sub new {
3787 my $class = shift; 3961 my $class = shift;
3788 3962
3789 my $self = $class->SUPER::new ( 3963 my $self = $class->SUPER::new (
3790 items => [], 3964 items => [],
3791 z => 100, 3965 z => 100,
3792 @_, 3966 @_,
3793 ); 3967 );
3794 3968
3795 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3969 $self->add ($self->{vbox} = new DC::UI::VBox);
3796 3970
3797 for my $item (@{ $self->{items} }) { 3971 for my $item (@{ $self->{items} }) {
3798 my ($widget, $cb, $tooltip) = @$item; 3972 my ($widget, $cb, $tooltip) = @$item;
3799 3973
3800 # handle various types of items, only text for now 3974 # handle various types of items, only text for now
3801 if (!ref $widget) { 3975 if (!ref $widget) {
3802 if ($widget =~ /\t/) { 3976 if ($widget =~ /\t/) {
3803 my ($left, $right) = split /\t/, $widget, 2; 3977 my ($left, $right) = split /\t/, $widget, 2;
3804 3978
3805 $widget = new CFPlus::UI::HBox 3979 $widget = new DC::UI::HBox
3806 can_hover => 1, 3980 can_hover => 1,
3807 can_events => 1, 3981 can_events => 1,
3808 tooltip => $tooltip, 3982 tooltip => $tooltip,
3809 children => [ 3983 children => [
3810 (new CFPlus::UI::Label markup => $left, expand => 1), 3984 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3811 (new CFPlus::UI::Label markup => $right, align => +1), 3985 (new DC::UI::Label markup => $right, align => 1),
3812 ], 3986 ],
3813 ; 3987 ;
3814 3988
3815 } else { 3989 } else {
3816 $widget = new CFPlus::UI::Label 3990 $widget = new DC::UI::Label
3817 can_hover => 1, 3991 can_hover => 1,
3818 can_events => 1, 3992 can_events => 1,
3993 align => 0,
3819 markup => $widget, 3994 markup => $widget,
3820 tooltip => $tooltip; 3995 tooltip => $tooltip;
3821 } 3996 }
3822 } 3997 }
3823 3998
… …
3838 # maybe save $GRAB? must be careful about events... 4013 # maybe save $GRAB? must be careful about events...
3839 $GRAB = $self; 4014 $GRAB = $self;
3840 $self->{button} = $ev->{button}; 4015 $self->{button} = $ev->{button};
3841 4016
3842 $self->show; 4017 $self->show;
3843 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 4018
4019 my $x = $ev->{x};
4020 my $y = $ev->{y};
4021
4022 $self->{root}->on_post_alloc ($self => sub {
4023 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
4024 });
4025
4026 1 # so it can be used inside event handlers
3844} 4027}
3845 4028
3846sub invoke_mouse_motion { 4029sub invoke_mouse_motion {
3847 my ($self, $ev, $x, $y) = @_; 4030 my ($self, $ev, $x, $y) = @_;
3848 4031
… …
3869 1 4052 1
3870} 4053}
3871 4054
3872############################################################################# 4055#############################################################################
3873 4056
3874package CFPlus::UI::Multiplexer; 4057package DC::UI::Multiplexer;
3875 4058
3876our @ISA = CFPlus::UI::Container::; 4059our @ISA = DC::UI::Container::;
3877 4060
3878sub new { 4061sub new {
3879 my $class = shift; 4062 my $class = shift;
3880 4063
3881 my $self = $class->SUPER::new ( 4064 my $self = $class->SUPER::new (
3882 @_, 4065 @_,
3883 ); 4066 );
3884 4067
3885 $self->{current} = $self->{children}[0] 4068 $self->set_current_page (0);
3886 if @{ $self->{children} };
3887 4069
3888 $self 4070 $self
3889} 4071}
3890 4072
3891sub add { 4073sub add {
3892 my ($self, @widgets) = @_; 4074 my ($self, @widgets) = @_;
3893 4075
3894 $self->SUPER::add (@widgets); 4076 $self->SUPER::add (@widgets);
3895 4077
3896 $self->{current} = $self->{children}[0] 4078 $self->set_current_page (0)
3897 if @{ $self->{children} }; 4079 if @widgets == @{ $self->{children} };
3898} 4080}
3899 4081
3900sub get_current_page { 4082sub get_current_page {
3901 my ($self) = @_; 4083 my ($self) = @_;
3902 4084
… …
3908 4090
3909 my $widget = ref $page_or_widget 4091 my $widget = ref $page_or_widget
3910 ? $page_or_widget 4092 ? $page_or_widget
3911 : $self->{children}[$page_or_widget]; 4093 : $self->{children}[$page_or_widget];
3912 4094
4095 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4096
3913 $self->{current} = $widget; 4097 if (($self->{current} = $widget)) {
4098 $self->{current}->set_visible if $self->{current} && $self->{visible};
3914 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4099 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3915 4100
3916 $self->emit (page_changed => $self->{current}); 4101 $self->emit (page_changed => $self->{current});
4102 }
3917 4103
3918 $self->realloc; 4104 $self->realloc;
3919} 4105}
3920 4106
3921sub visible_children { 4107sub visible_children {
3922 $_[0]{current} 4108 $_[0]{current} || ()
3923} 4109}
3924 4110
3925sub size_request { 4111sub size_request {
3926 my ($self) = @_; 4112 my ($self) = @_;
3927 4113
4114 $self->{current}
3928 $self->{current}->size_request 4115 ? $self->{current}->size_request
4116 : (0, 0)
3929} 4117}
3930 4118
3931sub invoke_size_allocate { 4119sub invoke_size_allocate {
3932 my ($self, $w, $h) = @_; 4120 my ($self, $w, $h) = @_;
3933 4121
3934 $self->{current}->configure (0, 0, $w, $h); 4122 $self->{current}->configure (0, 0, $w, $h)
4123 if $self->{current};
3935 4124
3936 1 4125 1
3937} 4126}
3938 4127
3939sub _draw { 4128sub _draw {
3940 my ($self) = @_; 4129 my ($self) = @_;
3941 4130
3942 $self->{current}->draw; 4131 $self->{current}->draw
4132 if $self->{current};
3943} 4133}
3944 4134
3945############################################################################# 4135#############################################################################
3946 4136
3947package CFPlus::UI::Notebook; 4137package DC::UI::Notebook;
3948 4138
3949use CFPlus::OpenGL; 4139use DC::OpenGL;
3950 4140
3951our @ISA = CFPlus::UI::VBox::; 4141our @ISA = DC::UI::VBox::;
3952 4142
3953sub new { 4143sub new {
3954 my $class = shift; 4144 my $class = shift;
3955 4145
3956 my $self = $class->SUPER::new ( 4146 my $self = $class->SUPER::new (
3957 buttonbar => (new CFPlus::UI::Buttonbar), 4147 buttonbar => (new DC::UI::Buttonbar),
3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4148 multiplexer => (new DC::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0], 4149 active_outline => [.7, .7, 0.2],
3960 # filter => # will be put between multiplexer and $self 4150 # filter => # will be put between multiplexer and $self
3961 @_, 4151 @_,
3962 ); 4152 );
3963 4153
3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4154 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3972 4162
3973 for my $child (@$widgets) { 4163 for my $child (@$widgets) {
3974 Scalar::Util::weaken $child; 4164 Scalar::Util::weaken $child;
3975 $child->{c_tab_} ||= do { 4165 $child->{c_tab_} ||= do {
3976 my $tab = 4166 my $tab =
3977 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4167 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
3978 ? $child->{c_tab} 4168 ? $child->{c_tab}
3979 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4169 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3980 4170
3981 $tab->connect (activate => sub { 4171 $tab->connect (activate => sub {
3982 $wself->set_current_page ($child); 4172 $wself->set_current_page ($child);
3983 }); 4173 });
3984 4174
… …
4016sub pages { 4206sub pages {
4017 my ($self) = @_; 4207 my ($self) = @_;
4018 $self->{multiplexer}->children 4208 $self->{multiplexer}->children
4019} 4209}
4020 4210
4211sub page_index {
4212 my ($self, $widget) = @_;
4213
4214 my $i = 0;
4215 for ($self->pages) {
4216 if ($_ eq $widget) { return $i };
4217 $i++;
4218 }
4219
4220 undef
4221}
4222
4021sub add_tab { 4223sub add_tab {
4022 my ($self, $title, $widget, $tooltip) = @_; 4224 my ($self, $title, $widget, $tooltip) = @_;
4023 4225
4024 $title = [$title, $tooltip] unless ref $title; 4226 $title = [$title, $tooltip] unless ref $title;
4025 $widget->{c_tab} = $title; 4227 $widget->{c_tab} = $title;
… …
4045 4247
4046 $self->SUPER::_draw (); 4248 $self->SUPER::_draw ();
4047 4249
4048 if (my $cur = $self->{multiplexer}{current}) { 4250 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) { 4251 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y}; 4252 glTranslate $self->{buttonbar}{x} + $cur->{x},
4253 $self->{buttonbar}{y} + $cur->{y};
4051 glLineWidth 3; 4254 glLineWidth 3;
4255 #glEnable GL_BLEND;
4256 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4052 glColor @{$self->{active_outline}}; 4257 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2; 4258 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4054 glLineWidth 1; 4259 glLineWidth 1;
4260 #glDisable GL_BLEND;
4055 } 4261 }
4056 } 4262 }
4057} 4263}
4058 4264
4059############################################################################# 4265#############################################################################
4060 4266
4061package CFPlus::UI::Selector; 4267package DC::UI::Selector;
4062 4268
4063use utf8; 4269use utf8;
4064 4270
4065our @ISA = CFPlus::UI::Button::; 4271our @ISA = DC::UI::Button::;
4066 4272
4067sub new { 4273sub new {
4068 my $class = shift; 4274 my $class = shift;
4069 4275
4070 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
… …
4087 my ($value, $title, $tooltip) = @$_; 4293 my ($value, $title, $tooltip) = @$_;
4088 4294
4089 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4295 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4090 } 4296 }
4091 4297
4092 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4298 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4093} 4299}
4094 4300
4095sub _set_value { 4301sub _set_value {
4096 my ($self, $value) = @_; 4302 my ($self, $value) = @_;
4097 4303
4098 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4304 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4305 $item ||= $self->{options}[0]
4099 or return; 4306 or return;
4100 4307
4101 $self->{value} = $item->[0]; 4308 $self->{value} = $item->[0];
4102 $self->set_markup ("$item->[1] ⇓"); 4309 $self->set_markup ("$item->[1] ⇓");
4103 $self->set_tooltip ($item->[2]); 4310# $self->set_tooltip ($item->[2]);
4104} 4311}
4105 4312
4106sub set_value { 4313sub set_value {
4107 my ($self, $value) = @_; 4314 my ($self, $value) = @_;
4108 4315
… …
4110 4317
4111 $self->_set_value ($value); 4318 $self->_set_value ($value);
4112 $self->emit (changed => $value); 4319 $self->emit (changed => $value);
4113} 4320}
4114 4321
4322sub set_options {
4323 my ($self, $options) = @_;
4324
4325 $self->{options} = $options;
4326 $self->_set_value ($self->{value});
4327}
4328
4115############################################################################# 4329#############################################################################
4116 4330
4117package CFPlus::UI::Statusbox; 4331package DC::UI::Statusbox;
4118 4332
4119our @ISA = CFPlus::UI::VBox::; 4333our @ISA = DC::UI::VBox::;
4120 4334
4121sub new { 4335sub new {
4122 my $class = shift; 4336 my $class = shift;
4123 4337
4124 my $self = $class->SUPER::new ( 4338 my $self = $class->SUPER::new (
4125 fontsize => 0.8, 4339 fontsize => 0.8,
4126 @_, 4340 @_,
4127 ); 4341 );
4128 4342
4129 CFPlus::weaken (my $this = $self); 4343 DC::weaken (my $this = $self);
4130 4344
4131 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4345 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4132 4346
4133 $self 4347 $self
4134} 4348}
4135 4349
4136sub reorder { 4350sub reorder {
4137 my ($self) = @_; 4351 my ($self) = @_;
4138 my $NOW = Time::HiRes::time; 4352 my $NOW = AE::time;
4139 4353
4140 # freeze display when hovering over any label 4354 # freeze display when hovering over any label
4141 return if $CFPlus::UI::TOOLTIP->{owner} 4355 return if $DC::UI::TOOLTIP->{owner}
4142 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4356 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4143 values %{ $self->{item} }; 4357 values %{ $self->{item} };
4144 4358
4145 while (my ($k, $v) = each %{ $self->{item} }) { 4359 while (my ($k, $v) = each %{ $self->{item} }) {
4146 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4360 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4147 } 4361 }
4362
4363 $self->{timer}->set (1, 1);
4148 4364
4149 my @widgets; 4365 my @widgets;
4150 4366
4151 my @items = sort { 4367 my @items = sort {
4152 $a->{pri} <=> $b->{pri} 4368 $a->{pri} <=> $b->{pri}
4153 or $b->{id} <=> $a->{id} 4369 or $b->{id} <=> $a->{id}
4154 } values %{ $self->{item} }; 4370 } values %{ $self->{item} };
4155
4156 $self->{timer}->interval (1);
4157 4371
4158 my $count = 10 + 1; 4372 my $count = 10 + 1;
4159 for my $item (@items) { 4373 for my $item (@items) {
4160 last unless --$count; 4374 last unless --$count;
4161 4375
… …
4168 for ($short) { 4382 for ($short) {
4169 s/^\s+//; 4383 s/^\s+//;
4170 s/\s+/ /g; 4384 s/\s+/ /g;
4171 } 4385 }
4172 4386
4173 new CFPlus::UI::Label 4387 new DC::UI::Label
4174 markup => $short, 4388 markup => $short,
4175 tooltip => $item->{tooltip}, 4389 tooltip => $item->{tooltip},
4176 tooltip_font => $::FONT_PROP, 4390 tooltip_font => $::FONT_PROP,
4177 tooltip_width => 0.67, 4391 tooltip_width => 0.67,
4178 fontsize => $item->{fontsize} || $self->{fontsize}, 4392 fontsize => $item->{fontsize} || $self->{fontsize},
4179 max_w => $::WIDTH * 0.44, 4393 max_w => $::WIDTH * 0.44,
4394 align => 0,
4180 fg => [@{ $item->{fg} }], 4395 fg => [@{ $item->{fg} }],
4181 can_events => 1, 4396 can_events => 1,
4182 can_hover => 1 4397 can_hover => 1
4183 }; 4398 };
4184 4399
4185 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4186 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4187 $label->update; 4402 $label->update;
4188 $label->set_max_size (undef, $label->{req_h} * $diff) 4403 $label->set_max_size (undef, $label->{req_h} * $diff)
4189 if $diff < 1; 4404 if $diff < 1;
4190 $self->{timer}->interval (1/30); 4405 $self->{timer}->set (1/30, 1/30);
4191 } else { 4406 } else {
4192 $label->{fg}[3] = $item->{fg}[3] || 1; 4407 $label->{fg}[3] = $item->{fg}[3] || 1;
4193 } 4408 }
4194 4409
4195 push @widgets, $label; 4410 push @widgets, $label;
4196 } 4411 }
4412
4413 my $hash = join ",", @widgets;
4414 return if $hash eq $self->{last_widget_hash};
4415 $self->{last_widget_hash} = $hash;
4197 4416
4198 $self->clear; 4417 $self->clear;
4199 $self->SUPER::add (reverse @widgets); 4418 $self->SUPER::add (reverse @widgets);
4200} 4419}
4201 4420
… …
4237 $ROOT->on_refresh (reorder => sub { 4456 $ROOT->on_refresh (reorder => sub {
4238 $self->reorder; 4457 $self->reorder;
4239 }); 4458 });
4240} 4459}
4241 4460
4461sub clr_group {
4462 my ($self, $group) = @_;
4463
4464 if (delete $self->{item}{$group}) {
4465 $ROOT->on_refresh (reorder => sub {
4466 $self->reorder;
4467 });
4468 }
4469}
4470
4242sub reconfigure { 4471sub reconfigure {
4243 my ($self) = @_; 4472 my ($self) = @_;
4244 4473
4245 delete $_->{label} 4474 delete $_->{label}
4246 for values %{ $self->{item} || {} }; 4475 for values %{ $self->{item} || {} };
… …
4257 $self->SUPER::destroy; 4486 $self->SUPER::destroy;
4258} 4487}
4259 4488
4260############################################################################# 4489#############################################################################
4261 4490
4262package CFPlus::UI::Root; 4491package DC::UI::Root;
4263 4492
4264our @ISA = CFPlus::UI::Container::; 4493our @ISA = DC::UI::Container::;
4265 4494
4266use List::Util qw(min max); 4495use List::Util qw(min max);
4267 4496
4268use CFPlus::OpenGL; 4497use DC::OpenGL;
4269 4498
4270sub new { 4499sub new {
4271 my $class = shift; 4500 my $class = shift;
4272 4501
4273 my $self = $class->SUPER::new ( 4502 my $self = $class->SUPER::new (
4274 visible => 1, 4503 visible => 1,
4275 @_, 4504 @_,
4276 ); 4505 );
4277 4506
4278 CFPlus::weaken ($self->{root} = $self); 4507 DC::weaken ($self->{root} = $self);
4279 4508
4280 $self 4509 $self
4281} 4510}
4282 4511
4283sub size_request { 4512sub size_request {
… …
4331} 4560}
4332 4561
4333sub update { 4562sub update {
4334 my ($self) = @_; 4563 my ($self) = @_;
4335 4564
4336 $::WANT_REFRESH->start; 4565 $::WANT_REFRESH = 1;
4337} 4566}
4338 4567
4339sub add { 4568sub add {
4340 my ($self, @children) = @_; 4569 my ($self, @children) = @_;
4341 4570
… …
4408 4637
4409 delete $queue{$widget+0}; 4638 delete $queue{$widget+0};
4410 4639
4411 my ($w, $h) = $widget->size_request; 4640 my ($w, $h) = $widget->size_request;
4412 4641
4413 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4642 $w += $widget->{padding_x} * 2;
4414 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4643 $h += $widget->{padding_y} * 2;
4644
4645 $w = max $widget->{min_w}, $w;
4646 $h = max $widget->{min_h}, $h;
4415 4647
4416 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4648 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4417 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4649 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4418 4650
4419 $w = $widget->{force_w} if exists $widget->{force_w}; 4651 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4486 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4718 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4487 glMatrixMode GL_MODELVIEW; 4719 glMatrixMode GL_MODELVIEW;
4488 glLoadIdentity; 4720 glLoadIdentity;
4489 4721
4490 { 4722 {
4491 package CFPlus::UI::Base; 4723 package DC::UI::Base;
4492 4724
4493 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4725 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4494 (0, 0, $self->{w}, $self->{h}); 4726 (0, 0, $self->{w}, $self->{h});
4495 4727
4496 $self->_draw; 4728 $self->_draw;
4497 } 4729 }
4498} 4730}
4499 4731
4500############################################################################# 4732#############################################################################
4501 4733
4502package CFPlus::UI; 4734package DC::UI;
4503 4735
4504$ROOT = new CFPlus::UI::Root; 4736$ROOT = new DC::UI::Root;
4505$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4737$TOOLTIP = new DC::UI::Tooltip z => 900;
4506 4738
45071 47391
4508

Diff Legend

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