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.376 by root, Mon Jul 16 20:20:23 2007 UTC vs.
Revision 1.465 by root, Thu Aug 28 00:53:53 2008 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use DC;
10use CFPlus::Pod; 9use DC::Pod;
11use CFPlus::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
… …
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
… …
210 reconfigure_widgets; 211 reconfigure_widgets;
211} 212}
212 213
213############################################################################# 214#############################################################################
214 215
215package CFPlus::UI::Event; 216package DC::UI::Event;
216 217
217sub xy { 218sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 220}
220 221
221############################################################################# 222#############################################################################
222 223
223package CFPlus::UI::Base; 224package DC::UI::Base;
224 225
225use strict; 226use strict;
226 227
227use CFPlus::OpenGL; 228use DC::OpenGL;
228 229
229sub new { 230sub new {
230 my $class = shift; 231 my $class = shift;
231 232
232 my $self = bless { 233 my $self = bless {
… …
237 h => undef, 238 h => undef,
238 can_events => 1, 239 can_events => 1,
239 @_ 240 @_
240 }, $class; 241 }, $class;
241 242
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 244
244 for (keys %$self) { 245 for (keys %$self) {
245 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
247 } 248 }
248 } 249 }
249 250
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 256
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 259
259 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
280 return if $self->{parent}; 281 return if $self->{parent};
281 282
282 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
283} 284}
284 285
285sub set_visible { 286sub set_visible {
286 my ($self) = @_; 287 my ($self) = @_;
287 288
… …
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
… …
337sub hide { 338sub hide {
338 my ($self) = @_; 339 my ($self) = @_;
339 340
340 $self->set_invisible; 341 $self->set_invisible;
341 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 346 $parent->remove ($self);
343 if $self->{parent}; 347 }
344} 348}
345 349
346sub move_abs { 350sub move_abs {
347 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
348 352
… …
360 $self->{force_h} = $h; 364 $self->{force_h} = $h;
361 365
362 $self->realloc; 366 $self->realloc;
363} 367}
364 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
365sub size_request { 387sub size_request {
366 require Carp; 388 require Carp;
367 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
368} 390}
369 391
… …
375 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
376 398
377 if ($self->{aspect}) { 399 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
379 401
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 404
383 # use alignment to adjust x, y 405 # use alignment to adjust x, y
384 406
385 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
… …
427 449
428 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
429 451
430 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
431 453
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 457 }
436} 458}
437 459
438# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
439sub coord2local { 461sub coord2local {
440 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
441 463
442 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
443 465
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 467}
446 468
447# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
448sub coord2global { 470sub coord2global {
449 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
450 472
451 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
452 474
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 476}
455 477
456sub invoke_focus_in { 478sub invoke_focus_in {
… …
505sub connect { 527sub connect {
506 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
507 529
508 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
509 531
510 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
513 } 535 }
514} 536}
515 537
… …
547 569
548 # parent 570 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 572}
551 573
552sub find_widget { 574#sub find_widget {
553 my ($self, $x, $y) = @_; 575# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 576
564sub set_parent { 577sub set_parent {
565 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
566 579
567 CFPlus::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
569} 582}
570 583
571sub realloc { 584sub realloc {
572 my ($self) = @_; 585 my ($self) = @_;
… …
598 611
599# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 613# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 615
603sub draw { 616#sub draw {
604 my ($self) = @_; 617#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 618
650sub _draw { 619sub _draw {
651 my ($self) = @_; 620 my ($self) = @_;
652 621
653 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
654} 623}
655 624
656my $cntx;#d#
657sub DESTROY { 625sub DESTROY {
658 my ($self) = @_; 626 my ($self) = @_;
659 627
660 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
661 629
630 local $@;
662 eval { $self->destroy }; 631 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 633
665 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
666} 635}
667 636
668############################################################################# 637#############################################################################
669 638
670package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
671 640
672our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
673 642
674use strict; 643use strict;
675use CFPlus::OpenGL; 644use DC::OpenGL;
676 645
677sub new { 646sub new {
678 my $class = shift; 647 my $class = shift;
679
680 # range [value, low, high, page]
681 648
682 $class->SUPER::new ( 649 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
685 @_ 652 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
698 665
699 glEnable GL_BLEND; 666 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 668 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 670 glDisable GL_BLEND;
711 } 671 }
712} 672}
713 673
714############################################################################# 674#############################################################################
715 675
716package CFPlus::UI::Empty; 676package DC::UI::Empty;
717 677
718our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
719 679
720sub new { 680sub new {
721 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
723} 683}
… …
730 690
731sub draw { } 691sub draw { }
732 692
733############################################################################# 693#############################################################################
734 694
735package CFPlus::UI::Container; 695package DC::UI::Container;
736 696
737our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
738 698
739sub new { 699sub new {
740 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
741 701
742 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
746 can_events => 0, 706 can_events => 0,
747 %arg, 707 %arg,
748 ); 708 );
749 709
750 $self->add (@$children) 710 $self->add (@$children)
751 if $children; 711 if $children && @$children;
752 712
753 $self 713 $self
754} 714}
755 715
756sub realloc { 716sub realloc {
… …
765 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
766 726
767 $_->set_parent ($self) 727 $_->set_parent ($self)
768 for @widgets; 728 for @widgets;
769 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 731 use sort 'stable';
771 732
772 $self->{children} = [ 733 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
775 ]; 736 ];
776 737
777 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
778} 743}
779 744
780sub children { 745sub children {
781 @{ $_[0]{children} } 746 @{ $_[0]{children} }
782} 747}
783 748
784sub remove { 749sub remove {
785 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
786 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
787 delete $child->{parent}; 755 delete $child->{parent};
788 $child->hide; 756 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
791 759
792 $self->realloc; 760 $self->realloc;
793} 761}
794 762
795sub clear { 763sub clear {
796 my ($self) = @_; 764 my ($self) = @_;
797 765
798 my $children = delete $self->{children}; 766 my $children = $self->{children};
799 $self->{children} = []; 767 $self->{children} = [];
800 768
801 for (@$children) { 769 for (@$children) {
802 delete $_->{parent}; 770 delete $_->{parent};
803 $_->hide; 771 $_->hide;
… …
823} 791}
824 792
825sub _draw { 793sub _draw {
826 my ($self) = @_; 794 my ($self) = @_;
827 795
828 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
829} 797}
830 798
831############################################################################# 799#############################################################################
832 800
833package CFPlus::UI::Bin; 801package DC::UI::Bin;
834 802
835our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
836 804
837sub new { 805sub new {
838 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
839 807
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 809
842 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
843} 811}
844 812
845sub add { 813sub add {
846 my ($self, $child) = @_; 814 my ($self, $child) = @_;
847 815
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
849 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
850} 818}
851 819
852sub remove { 820sub remove {
853 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
854 822
855 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
856 824
857 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 826 unless @{$self->{children}};
859} 827}
860 828
861sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
862 830
… …
871 839
872 1 840 1
873} 841}
874 842
875############################################################################# 843#############################################################################
876
877# back-buffered drawing area 844# back-buffered drawing area
878 845
879package CFPlus::UI::Window; 846package DC::UI::Window;
880 847
881our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
882 849
883use CFPlus::OpenGL; 850use DC::OpenGL;
884 851
885sub new { 852sub new {
886 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
887 854
888 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
910} 877}
911 878
912sub render_child { 879sub render_child {
913 my ($self) = @_; 880 my ($self) = @_;
914 881
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
918 885
919 { 886 {
920 package CFPlus::UI::Base; 887 package DC::UI::Base;
921 888
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
924 891
925 $self->_render; 892 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
943} 910}
944 911
945############################################################################# 912#############################################################################
946 913
947package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
948 915
949use List::Util qw(min max); 916use List::Util qw(min max);
950 917
951our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
952 919
953sub new { 920sub new {
954 my $class = shift; 921 my $class = shift;
955 922
956 $class->SUPER::new ( 923 $class->SUPER::new (
… …
963sub size_request { 930sub size_request {
964 my ($self) = @_; 931 my ($self) = @_;
965 932
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 934
968 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
970 937
971 ($w, $h) 938 ($w, $h)
972} 939}
973 940
974sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
986} 953}
987 954
988sub set_offset { 955sub set_offset {
989 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
990 957
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 958 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 959 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 960
994 $self->emit (changed => $self->{view_x}, $self->{view_y}); 961 if ($x != $self->{view_x} or $y != $self->{view_y}) {
962 $self->{view_x} = $x;
963 $self->{view_y} = $y;
964
965 $self->emit (changed => $x, $y);
995 $self->update; 966 $self->update;
967 }
968}
969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
996} 986}
997 987
998# hmm, this does not work for topleft of $self... but we should not ask for that 988# hmm, this does not work for topleft of $self... but we should not ask for that
999sub coord2local { 989sub coord2local {
1000 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
1015 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1016 1006
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 1009 ) {
1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1021 } else { 1011 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1023 } 1013 }
1024} 1014}
1025 1015
1026sub _render { 1016sub _render {
1027 my ($self) = @_; 1017 my ($self) = @_;
1028 1018
1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1019 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1031 1021
1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1033 1023
1034 $self->SUPER::_render; 1024 $self->SUPER::_render;
1035} 1025}
1036 1026
1037############################################################################# 1027#############################################################################
1038 1028
1039package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1040 1030
1041our @ISA = CFPlus::UI::Table::; 1031our @ISA = DC::UI::Table::;
1042 1032
1043sub new { 1033sub new {
1044 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1045 1035
1046 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1047 1037
1048 my $self; 1038 my $self;
1049 1039
1050 my $hslider = new CFPlus::UI::Slider 1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1051 vertical => 0, 1043 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1045 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1046 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1048 },
1057 ; 1049 ;
1058 1050
1059 my $vslider = new CFPlus::UI::Slider 1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
1060 vertical => 1, 1054 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1056 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1057 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1074 col_expand => [1, 0], 1068 col_expand => [1, 0],
1075 row_expand => [1, 0], 1069 row_expand => [1, 0],
1076 %arg, 1070 %arg,
1077 ); 1071 );
1078 1072
1079 $self->{vp} = new CFPlus::UI::ViewPort 1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1080 expand => 1, 1076 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1077 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1078 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1079 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1080 my ($vp, $x, $y) = @_;
1081
1085 $vp->{parent}{hslider}->set_value ($x); 1082 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y); 1083 $vp->{parent}{vslider}->set_value ($y);
1087 1084
1085 0
1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1088 0 1090 0
1089 }, 1091 },
1090 ; 1092 ;
1091 1093
1092 $self->SUPER::add (0, 0, $self->{vp}); 1094 $self->SUPER::add ($self->{vp});
1093 1095
1094 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1095 1097
1096 $self 1098 $self
1097} 1099}
1098
1099#TODO# update range on size_allocate depending on child
1100 1100
1101sub add { 1101sub add {
1102 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1103 1103
1104 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1105} 1105}
1106 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1107sub update_slider { 1111sub update_slider {
1108 my ($self) = @_; 1112 my ($self) = @_;
1109 1113
1110 my $child = ($self->{vp} or return)->child; 1114 my $child = ($self->{vp} or return)->child;
1111 1115
1116 if ($self->{scroll_x}) {
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114 1119
1115 my $visible = $w1 > $w2; 1120 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) { 1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1123 $visible ? $self->SUPER::add ($self->{hslider})
1118 : $self->{hslider}->hide; 1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1119 } 1126 }
1120 1127
1128 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123 1131
1124 my $visible = $h1 > $h2; 1132 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) { 1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1135 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->{vslider}->hide; 1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1128 } 1156 };
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136} 1157}
1137 1158
1138sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1140 1161
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev); 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1144 1164
1145 1 1165 1
1146} 1166}
1147 1167
1148sub invoke_button_down { 1168sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1150 1170
1151 if ($ev->{button} == 2) { 1171 if ($ev->{button} == 2) {
1152 $self->grab_focus; 1172 $self->start_dragging ($ev);
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1; 1173 return 1;
1165 } 1174 }
1166 1175
1167 0 1176 0
1168} 1177}
… …
1195 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1196} 1205}
1197 1206
1198############################################################################# 1207#############################################################################
1199 1208
1200package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1201 1210
1202our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1203 1212
1204use CFPlus::OpenGL; 1213use DC::OpenGL;
1205 1214
1206sub new { 1215sub new {
1207 my $class = shift; 1216 my $class = shift;
1208 1217
1209 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1220 1229
1221 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1233 } 1235 }
1234 1236
1235 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1236} 1238}
1237 1239
1238############################################################################# 1240#############################################################################
1239 1241
1240package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1241 1243
1242our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1243 1245
1244use CFPlus::OpenGL; 1246use DC::OpenGL;
1245 1247
1246sub new { 1248sub new {
1247 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1248 1250
1249 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1251 align => 1, 1253 align => 1,
1252 valign => 0, 1254 valign => 0.5,
1253 text => $arg{label}, 1255 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1255 } 1257 }
1256 1258
1257 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
… …
1267 1269
1268sub add { 1270sub add {
1269 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1270 1272
1271 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273} 1275}
1274 1276
1275sub border { 1277sub border {
1276 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1277} 1279}
… …
1335 } 1337 }
1336} 1338}
1337 1339
1338############################################################################# 1340#############################################################################
1339 1341
1340package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1341 1343
1342our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1343 1345
1344use CFPlus::OpenGL; 1346use DC::OpenGL;
1345 1347
1346my $bg = 1348my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1348 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1349 1351
1350my @border = 1352my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355
1356my @icon =
1357 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1353 1359
1354sub new { 1360sub new {
1355 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1356 1362
1357 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
… …
1362 min_w => 64, 1368 min_w => 64,
1363 min_h => 32, 1369 min_h => 32,
1364 %arg, 1370 %arg,
1365 ); 1371 );
1366 1372
1367 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1368 align => 0, 1374 align => 0.5,
1369 valign => 1, 1375 valign => 1,
1370 text => $self->{title}, 1376 text => $self->{title},
1371 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1372 if exists $self->{title}; 1378 if exists $self->{title};
1373 1379
1374 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1375 $self->{close_button} = 1381 $self->{close_button} =
1376 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1377 path => 'x1_close.png', 1383 path => 'x1_close.png',
1378 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1379 1385
1380 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1381 } 1387 }
1382 1388
1383 $self 1389 $self
1384} 1390}
1385 1391
1386sub add { 1392sub add {
1387 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1388 1394
1389 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1390 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1392} 1398}
1393 1399
1394sub border { 1400sub border {
1395 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1396} 1411}
1397 1412
1398sub size_request { 1413sub size_request {
1399 my ($self) = @_; 1414 my ($self) = @_;
1400 1415
… …
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1527 1542
1528 my $border = $self->border; 1543 my $border = $self->border;
1529 1544
1530 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1531 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1534 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550
1551 # move
1552 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557
1558 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1535 1564
1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1537 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1538 1567
1539 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1558 if $self->{close_button}; 1587 if $self->{close_button};
1559} 1588}
1560 1589
1561############################################################################# 1590#############################################################################
1562 1591
1563package CFPlus::UI::Table; 1592package DC::UI::Table;
1564 1593
1565our @ISA = CFPlus::UI::Base::; 1594our @ISA = DC::UI::Container::;
1566 1595
1567use List::Util qw(max sum); 1596use List::Util qw(max sum);
1568 1597
1569use CFPlus::OpenGL; 1598use DC::OpenGL;
1570 1599
1571sub new { 1600sub new {
1572 my $class = shift; 1601 my $class = shift;
1573 1602
1574 $class->SUPER::new ( 1603 $class->SUPER::new (
1575 children => [],
1576 col_expand => [], 1604 col_expand => [],
1577 row_expand => [], 1605 row_expand => [],
1578 @_, 1606 @_,
1579 ) 1607 )
1580} 1608}
1581 1609
1582sub children {
1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1584}
1585
1586# TODO: store row/col info in child widget and use standard add/del
1587sub add { 1610sub add {
1611 my ($self, @widgets) = @_;
1612
1613 for my $child (@widgets) {
1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1617
1618 $self->SUPER::add (@widgets);
1619}
1620
1621sub add_at {
1588 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1589 1625
1590 while (@_) { 1626 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1592 $child->set_parent ($self);
1593 $self->{children}[$y][$x] = $child;
1594 }
1595 1628
1596 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1597 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1598 $self->realloc;
1599}
1600 1631
1601sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1602 my ($self, $child) = @_; 1639 my ($self) = @_;
1603 1640
1604 for (@{ $self->{children} }) { 1641 my (@w, @h);
1605 for (@{ $_ || [] }) { 1642
1606 $_ = undef if $_ == $child; 1643 my @children = $self->children;
1644
1645 # first pass, columns
1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1648
1649 my $sw = sum @w[$c .. $c + $cs - 1];
1650
1651 if ($w > $sw) {
1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1607 } 1653 }
1608 } 1654 }
1609}
1610 1655
1611# TODO: move to container class maybe? send children a signal on removal? 1656 # second pass, rows
1612sub clear { 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1613 my ($self) = @_;
1614
1615 my @children = $self->children;
1616 delete $self->{children};
1617
1618 for (@children) {
1619 delete $_->{parent};
1620 $_->hide;
1621 }
1622
1623 $self->realloc;
1624}
1625
1626sub get_wh {
1627 my ($self) = @_;
1628
1629 my (@w, @h);
1630
1631 for my $y (0 .. $#{$self->{children}}) {
1632 my $row = $self->{children}[$y]
1633 or next;
1634
1635 for my $x (0 .. $#$row) {
1636 my $widget = $row->[$x]
1637 or next;
1638 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1639 1659
1640 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1641 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1642 } 1664 }
1643 } 1665 }
1644 1666
1645 (\@w, \@h) 1667 (\@w, \@h)
1646} 1668}
… …
1662 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1663 1685
1664 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1665 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1666 1688
1667 # TODO: nicer code 1689 # now linearly scale the rows/columns to the allocated size
1668 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1669 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1670 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1671 1693
1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1673 1695
1674 CFPlus::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1675 1697
1676 my @row_expand = @{$self->{row_expand}}; 1698 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand; 1699 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1; 1700 my $row_expand = (sum @row_expand) || 1;
1679 1701
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681 1703
1682 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1683 1705
1684 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1685 1708
1686 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1687 my $row = $self->{children}[$r] 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1688 or next;
1689 1711
1690 my $x = 0; 1712 $widget->configure (
1691 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1692 1715 );
1693 for my $c (0 .. $#$row) {
1694 my $col_w = $ws->[$c];
1695
1696 if (my $widget = $row->[$c]) {
1697 $widget->configure ($x, $y, $col_w, $row_h);
1698 }
1699
1700 $x += $col_w;
1701 }
1702
1703 $y += $row_h;
1704 } 1716 }
1705 1717
1706 1 1718 1
1707} 1719}
1708 1720
1709sub find_widget {
1710 my ($self, $x, $y) = @_;
1711
1712 $x -= $self->{x};
1713 $y -= $self->{y};
1714
1715 my $res;
1716
1717 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1718 $res = $_->find_widget ($x, $y)
1719 and return $res;
1720 }
1721
1722 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1723}
1724
1725sub _draw {
1726 my ($self) = @_;
1727
1728 for (grep $_, @{$self->{children}}) {
1729 $_->draw for grep $_, @$_;
1730 }
1731}
1732
1733############################################################################# 1721#############################################################################
1734 1722
1735package CFPlus::UI::Fixed; 1723package DC::UI::Fixed;
1736 1724
1737use List::Util qw(min max); 1725use List::Util qw(min max);
1738 1726
1739our @ISA = CFPlus::UI::Container::; 1727our @ISA = DC::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747 1728
1748sub _scale($$$) { 1729sub _scale($$$) {
1749 my ($mode, $val, $max) = @_; 1730 my ($rel, $val, $max) = @_;
1750 1731
1751 $mode eq "abs" ? $val 1732 $rel ? $val * $max : $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754} 1733}
1755 1734
1756sub size_request { 1735sub size_request {
1757 my ($self) = @_; 1736 my ($self) = @_;
1758 1737
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760 1739
1761 # determine overall size by querying abs widgets 1740 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) { 1741 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1764 1745
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1771 } 1748 }
1772 } 1749 }
1773 1750
1774 my $W = $x2 - $x1; 1751 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1; 1752 my $H = $y2 - $y1;
1776 1753
1777 # now layout remaining widgets 1754 # now layout remaining widgets
1778 for my $child ($self->visible_children) { 1755 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1780 1759
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1789 } 1762 }
1790 } 1763 }
1791 1764
1792 my $W = $x2 - $x1; 1765 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1; 1766 my $H = $y2 - $y1;
… …
1797 1770
1798sub invoke_size_allocate { 1771sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_; 1772 my ($self, $W, $H) = @_;
1800 1773
1801 for my $child ($self->visible_children) { 1774 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1803 1777
1804 $x = _scale $pos, $x, $W; 1778 $x += $child->{c_halign} * $child->{req_w};
1805 $y = _scale $pos, $x, $H; 1779 $y += $child->{c_valign} * $child->{req_h};
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808 1780
1809 $child->configure ($x, $y, $w, $h); 1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1810 } 1782 }
1811 1783
1812 1 1784 1
1813} 1785}
1814 1786
1815############################################################################# 1787#############################################################################
1816 1788
1817package CFPlus::UI::Box; 1789package DC::UI::Box;
1818 1790
1819our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1820 1792
1821sub size_request { 1793sub size_request {
1822 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1823 1797
1824 $self->{vertical} 1798 $self->{vertical}
1825 ? ( 1799 ? (
1826 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1827 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1828 ) 1802 )
1829 : ( 1803 : (
1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1831 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1832 ) 1806 )
1833} 1807}
1834 1808
1835sub invoke_size_allocate { 1809sub invoke_size_allocate {
1836 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1857 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1858 for 0 .. $#children; 1832 for 0 .. $#children;
1859 } 1833 }
1860 } 1834 }
1861 1835
1862 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1863 1837
1864 my $pos = 0; 1838 my $pos = 0;
1865 for (0 .. $#children) { 1839 for (0 .. $#children) {
1866 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1872 1 1846 1
1873} 1847}
1874 1848
1875############################################################################# 1849#############################################################################
1876 1850
1877package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1878 1852
1879our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1880 1854
1881sub new { 1855sub new {
1882 my $class = shift; 1856 my $class = shift;
1883 1857
1884 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1887 ) 1861 )
1888} 1862}
1889 1863
1890############################################################################# 1864#############################################################################
1891 1865
1892package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1893 1867
1894our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1895 1869
1896sub new { 1870sub new {
1897 my $class = shift; 1871 my $class = shift;
1898 1872
1899 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1902 ) 1876 )
1903} 1877}
1904 1878
1905############################################################################# 1879#############################################################################
1906 1880
1907package CFPlus::UI::Label; 1881package DC::UI::Label;
1908 1882
1909our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1910 1884
1911use CFPlus::OpenGL; 1885use DC::OpenGL;
1912 1886
1913sub new { 1887sub new {
1914 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1915 1889
1916 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1921 #text => initial text 1895 #text => initial text
1922 #markup => initial narkup 1896 #markup => initial narkup
1923 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1924 #style => 0, # render flags 1898 #style => 0, # render flags
1925 ellipsise => 3, # end 1899 ellipsise => 3, # end
1926 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1927 fontsize => 1, 1901 fontsize => 1,
1928 align => -1, 1902 align => 0.5,
1929 valign => -1, 1903 valign => 0.5,
1930 padding_x => 2, 1904 padding_x => 4,
1931 padding_y => 2, 1905 padding_y => 2,
1932 can_events => 0, 1906 can_events => 0,
1933 %arg 1907 %arg
1934 ); 1908 );
1935 1909
1936 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1937 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1938 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1939 $self->{template} = $layout; 1913 $self->{template} = $layout;
1940 } 1914 }
1941 1915
1942 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1960 1934
1961 delete $self->{ox}; 1935 delete $self->{ox};
1962 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1963} 1937}
1964 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1965sub set_text { 1945sub set_text {
1966 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1967 1947
1968 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1969 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
… …
1992 1972
1993sub size_request { 1973sub size_request {
1994 my ($self) = @_; 1974 my ($self) = @_;
1995 1975
1996 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1997 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1998 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1999 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2002 1984
2003 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
2004 1986
2005 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
2006 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
2007 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2009 1991
2010 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
2011 1993
2012 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
2068 2050
2069 [$self->{layout}->size] 2051 [$self->{layout}->size]
2070 }; 2052 };
2071 2053
2072 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
2073 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2074 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2075 : ($self->{w} - $size->[0]) * 0.5);
2076 2057
2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2079 : ($self->{h} - $size->[1]) * 0.5);
2080 }; 2059 };
2081 2060
2082 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
2083 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
2084 2063# DC::OpenGL::glNewList $self->{list};
2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
2069
2070 $self->{layout}->draw;
2086} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
2087 2080
2088############################################################################# 2081#############################################################################
2089 2082
2090package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
2091 2084
2092our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
2093 2086
2094use CFPlus::OpenGL; 2087use DC::OpenGL;
2095 2088
2096sub new { 2089sub new {
2097 my $class = shift; 2090 my $class = shift;
2098 2091
2099 $class->SUPER::new ( 2092 $class->SUPER::new (
2100 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
2101 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
2102 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
2103 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
2104 can_hover => 1, 2099 can_hover => 1,
2105 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
2106 valign => 0, 2102 valign => 0.5,
2107 can_events => 1, 2103 can_events => 1,
2108 ellipsise => 0, 2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
2109 #text => ... 2107 #text => ...
2110 #hidden => "*", 2108 #hidden => "*",
2111 @_ 2109 @_
2112 ) 2110 )
2113} 2111}
… …
2160 2158
2161 my $text = $self->get_text; 2159 my $text = $self->get_text;
2162 2160
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2164 2162
2165 if ($uni == 8) { 2163 if ($sym == DC::SDLK_BACKSPACE) {
2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2167 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
2168 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
2169 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
2170 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
2171 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
2172 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2173 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2174 # what a hack 2172 # what a hack
2175 $self->{cursor} = 2173 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1 2175 ? length $1
2178 : 0; 2176 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
2180 # uh, again 2178 # uh, again
2181 $self->{cursor} = 2179 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1 2181 ? $self->{cursor} + length $1
2184 : length $self->{text}; 2182 : length $self->{text};
… …
2248 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2249 } 2247 }
2250 2248
2251 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2252 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glBegin GL_QUADS;
2254 glVertex 0 , 0;
2255 glVertex 0 , $self->{h};
2256 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2257 glVertex $self->{w}, 0;
2258 glEnd;
2259 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2260 2253
2261 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2262 2255
2263 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
2265 2258
2266 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2267 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2268 utf8::encode $text; 2261 utf8::encode $text;
2269 2262
2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2271 } 2264 }
2272 2265
2266 glColor_premultiply @{$self->{active_fg}};
2273 glBegin GL_LINES; 2267 glBegin GL_LINES;
2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2276 glEnd; 2270 glEnd;
2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2277 } 2285 }
2278} 2286}
2279 2287
2280############################################################################# 2288#############################################################################
2281 2289
2282package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2283 2291
2284our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2285 2293
2286use CFPlus::OpenGL; 2294use DC::OpenGL;
2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
2287 2305
2288sub invoke_key_down { 2306sub invoke_key_down {
2289 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
2290 2308
2291 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
… …
2297 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
2298 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
2299 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
2300 $self->update; 2318 $self->update;
2301 2319
2302 } elsif ($sym == CFPlus::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
2303 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
2304 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
2305 } 2323 }
2306 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
2307 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
2309 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
2310 } 2328 }
2311 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2312 } 2330 }
2313 2331
2314 } elsif ($sym == CFPlus::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
2315 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2317 2335
2318 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2319 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2320 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2321 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2322 } 2343 }
2323 2344
2324 } else { 2345 } else {
2325 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2326 } 2347 }
… …
2328 1 2349 1
2329} 2350}
2330 2351
2331############################################################################# 2352#############################################################################
2332 2353
2333package CFPlus::UI::TextEdit; 2354package DC::UI::TextEdit;
2334 2355
2335our @ISA = CFPlus::UI::EntryBase::; 2356our @ISA = DC::UI::EntryBase::;
2336 2357
2337use CFPlus::OpenGL; 2358use DC::OpenGL;
2359
2360sub new {
2361 my $class = shift;
2362
2363 $class->SUPER::new (
2364 padding_y => 4,
2365
2366 @_
2367 )
2368}
2338 2369
2339sub move_cursor_ver { 2370sub move_cursor_ver {
2340 my ($self, $dy) = @_; 2371 my ($self, $dy) = @_;
2341 2372
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343 2374
2344 $y += $dy; 2375 $line += $dy;
2345 2376
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2347 $self->{cursor} = $index; 2378 $self->{cursor} = $index;
2348 delete $self->{cur_h}; 2379 delete $self->{cur_h};
2349 $self->update; 2380 $self->update;
2350 return; 2381 return;
2351 } 2382 }
… …
2354sub invoke_key_down { 2385sub invoke_key_down {
2355 my ($self, $ev) = @_; 2386 my ($self, $ev) = @_;
2356 2387
2357 my $sym = $ev->{sym}; 2388 my $sym = $ev->{sym};
2358 2389
2359 if ($sym == CFPlus::SDLK_UP) { 2390 if ($sym == DC::SDLK_UP) {
2360 $self->move_cursor_ver (-1); 2391 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) { 2392 } elsif ($sym == DC::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1); 2393 $self->move_cursor_ver (+1);
2363 } else { 2394 } else {
2364 return $self->SUPER::invoke_key_down ($ev) 2395 return $self->SUPER::invoke_key_down ($ev)
2365 } 2396 }
2366 2397
2367 1 2398 1
2368} 2399}
2369 2400
2370############################################################################# 2401#############################################################################
2371 2402
2372package CFPlus::UI::Button; 2403package DC::UI::ButtonBin;
2373 2404
2374our @ISA = CFPlus::UI::Label::; 2405our @ISA = DC::UI::Bin::;
2375 2406
2376use CFPlus::OpenGL; 2407use DC::OpenGL;
2377 2408
2378my @tex = 2409my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2410 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2380 qw(b1_button_active.png); 2411 qw(b1_button_inactive.png b1_button_active.png);
2381 2412
2382sub new { 2413sub new {
2383 my $class = shift; 2414 my $class = shift;
2384 2415
2385 $class->SUPER::new ( 2416 $class->SUPER::new (
2386 padding_x => 4,
2387 padding_y => 4,
2388 fg => [1, 1, 1],
2389 active_fg => [0, 0, 1],
2390 can_hover => 1, 2417 can_hover => 1,
2391 align => 0, 2418 align => 0.5,
2392 valign => 0, 2419 valign => 0.5,
2393 can_events => 1, 2420 can_events => 1,
2394 @_ 2421 @_
2395 ) 2422 )
2396} 2423}
2397 2424
… …
2406} 2433}
2407 2434
2408sub _draw { 2435sub _draw {
2409 my ($self) = @_; 2436 my ($self) = @_;
2410 2437
2411 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2412
2413 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
2416 2441
2442 my $tex = $tex[$GRAB == $self];
2417 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 2444
2419 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2420 2446
2421 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
2422} 2448}
2423 2449
2424############################################################################# 2450#############################################################################
2425 2451
2426package CFPlus::UI::CheckBox; 2452package DC::UI::Button;
2427 2453
2428our @ISA = CFPlus::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
2429 2457
2430my @tex = 2458my @tex =
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2459 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png);
2461
2462sub new {
2463 my $class = shift;
2464
2465 $class->SUPER::new (
2466 padding_x => 8,
2467 padding_y => 4,
2468 fg => [1.0, 1.0, 1.0],
2469 active_fg => [0.8, 0.8, 0.8],
2470 can_hover => 1,
2471 align => 0.5,
2472 valign => 0.5,
2473 can_events => 1,
2474 @_
2475 )
2476}
2477
2478sub invoke_button_up {
2479 my ($self, $ev, $x, $y) = @_;
2480
2481 $self->emit ("activate")
2482 if $x >= 0 && $x < $self->{w}
2483 && $y >= 0 && $y < $self->{h};
2484
2485 1
2486}
2487
2488sub _draw {
2489 my ($self) = @_;
2490
2491 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2492
2493 glEnable GL_TEXTURE_2D;
2494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2495 glColor 0, 0, 0, 1;
2496
2497 my $tex = $tex[$GRAB == $self];
2498 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499
2500 glDisable GL_TEXTURE_2D;
2501
2502 $self->SUPER::_draw;
2503}
2504
2505#############################################################################
2506
2507package DC::UI::CheckBox;
2508
2509our @ISA = DC::UI::DrawBG::;
2510
2511my @tex =
2512 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2432 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2433 2514
2434use CFPlus::OpenGL; 2515use DC::OpenGL;
2435 2516
2436sub new { 2517sub new {
2437 my $class = shift; 2518 my $class = shift;
2438 2519
2439 $class->SUPER::new ( 2520 $class->SUPER::new (
… …
2479sub _draw { 2560sub _draw {
2480 my ($self) = @_; 2561 my ($self) = @_;
2481 2562
2482 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2483 2564
2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2485 2566
2486 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2487 2568
2488 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2489 2570
… …
2496 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2497} 2578}
2498 2579
2499############################################################################# 2580#############################################################################
2500 2581
2501package CFPlus::UI::Image; 2582package DC::UI::Image;
2502 2583
2503our @ISA = CFPlus::UI::Base::; 2584our @ISA = DC::UI::Base::;
2504 2585
2505use CFPlus::OpenGL; 2586use DC::OpenGL;
2506 2587
2507our %texture_cache; 2588our %texture_cache;
2508 2589
2509sub new { 2590sub new {
2510 my $class = shift; 2591 my $class = shift;
2511 2592
2512 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2513 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2514 @_, 2596 @_,
2515 ); 2597 );
2516 2598
2517 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2519 2601
2520 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2522 2604
2523 CFPlus::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2524 2606
2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2526 2608
2527 $self 2609 $self
2528} 2610}
2529 2611
2530sub STORABLE_freeze { 2612sub STORABLE_freeze {
2531 my ($self, $cloning) = @_; 2613 my ($self, $cloning) = @_;
2532 2614
2533 $self->{path} 2615 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2535 2617
2536 $self->{path} 2618 $self->{path}
2537} 2619}
2538 2620
2539sub STORABLE_attach { 2621sub STORABLE_attach {
… …
2543} 2625}
2544 2626
2545sub size_request { 2627sub size_request {
2546 my ($self) = @_; 2628 my ($self) = @_;
2547 2629
2548 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2549} 2631}
2550 2632
2551sub _draw { 2633sub _draw {
2552 my ($self) = @_; 2634 my ($self) = @_;
2553 2635
… …
2563 } 2645 }
2564 2646
2565 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2567 2649
2568 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
2569 2651
2570 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2571} 2653}
2572 2654
2573############################################################################# 2655#############################################################################
2574 2656
2575package CFPlus::UI::ImageButton; 2657package DC::UI::ImageButton;
2576 2658
2577our @ISA = CFPlus::UI::Image::; 2659our @ISA = DC::UI::Image::;
2578 2660
2579use CFPlus::OpenGL; 2661use DC::OpenGL;
2580 2662
2581my %textures; 2663my %textures;
2582 2664
2583sub new { 2665sub new {
2584 my $class = shift; 2666 my $class = shift;
… …
2587 padding_x => 4, 2669 padding_x => 4,
2588 padding_y => 4, 2670 padding_y => 4,
2589 fg => [1, 1, 1], 2671 fg => [1, 1, 1],
2590 active_fg => [0, 0, 1], 2672 active_fg => [0, 0, 1],
2591 can_hover => 1, 2673 can_hover => 1,
2592 align => 0, 2674 align => 0.5,
2593 valign => 0, 2675 valign => 0.5,
2594 can_events => 1, 2676 can_events => 1,
2595 @_ 2677 @_
2596 ); 2678 );
2597} 2679}
2598 2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2599sub invoke_button_up { 2687sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_; 2688 my ($self, $ev, $x, $y) = @_;
2601 2689
2602 $self->emit ("activate") 2690 $self->emit ("activate")
2603 if $x >= 0 && $x < $self->{w} 2691 if $x >= 0 && $x < $self->{w}
… …
2606 1 2694 1
2607} 2695}
2608 2696
2609############################################################################# 2697#############################################################################
2610 2698
2611package CFPlus::UI::VGauge; 2699package DC::UI::VGauge;
2612 2700
2613our @ISA = CFPlus::UI::Base::; 2701our @ISA = DC::UI::Base::;
2614 2702
2615use List::Util qw(min max); 2703use List::Util qw(min max);
2616 2704
2617use CFPlus::OpenGL; 2705use DC::OpenGL;
2618 2706
2619my %tex = ( 2707my %tex = (
2620 food => [ 2708 food => [
2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2709 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2623 ], 2711 ],
2624 grace => [ 2712 grace => [
2625 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2713 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2627 ], 2715 ],
2628 hp => [ 2716 hp => [
2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2631 ], 2719 ],
2632 mana => [ 2720 mana => [
2633 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2635 ], 2723 ],
2636); 2724);
2637 2725
2638# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2741 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2742} 2830}
2743 2831
2744############################################################################# 2832#############################################################################
2745 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
2746package CFPlus::UI::Gauge; 2972package DC::UI::Gauge;
2747 2973
2748our @ISA = CFPlus::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2749 2975
2750sub new { 2976sub new {
2751 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2752 2978
2753 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
2755 can_hover => 1, 2981 can_hover => 1,
2756 can_events => 1, 2982 can_events => 1,
2757 %arg, 2983 %arg,
2758 ); 2984 );
2759 2985
2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2763 2989
2764 $self 2990 $self
2765} 2991}
2766 2992
2767sub set_fontsize { 2993sub set_fontsize {
… …
2788 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2789} 3015}
2790 3016
2791############################################################################# 3017#############################################################################
2792 3018
2793package CFPlus::UI::Slider; 3019package DC::UI::Slider;
2794 3020
2795use strict; 3021use strict;
2796 3022
2797use CFPlus::OpenGL; 3023use DC::OpenGL;
2798 3024
2799our @ISA = CFPlus::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2800 3026
2801my @tex = 3027my @tex =
2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3028 map { new_from_file DC::Texture DC::find_rcfile $_ }
2803 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2804 3030
2805sub new { 3031sub new {
2806 my $class = shift; 3032 my $class = shift;
2807 3033
… …
2844sub set_value { 3070sub set_value {
2845 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2846 3072
2847 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2848 3074
2849 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2850 3076
2851 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2852
2853 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2854 $value = $hi - $page if $value > $hi - $page;
2855 3079
2856 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2857 if $unit; 3081 if $unit;
2858 3082
2859 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2875 3099
2876 $self->SUPER::invoke_button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2877 3101
2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2879 3103
2880 $self->invoke_mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
3105
3106 1
2881} 3107}
2882 3108
2883sub invoke_mouse_motion { 3109sub invoke_mouse_motion {
2884 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2885 3111
… …
2901sub invoke_mouse_wheel { 3127sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_; 3128 my ($self, $ev) = @_;
2903 3129
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905 3131
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2907 3133
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909 3135
2910 ! ! $delta 3136 1
2911} 3137}
2912 3138
2913sub update { 3139sub update {
2914 my ($self) = @_; 3140 my ($self) = @_;
2915 3141
… …
2921 my ($self) = @_; 3147 my ($self) = @_;
2922 3148
2923 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2924 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2925 3151
2926 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2927 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2928 3154
2929 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3155 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2930 3156
2931 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3157 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2932 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2933 3159
2934 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
… …
2964 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2965} 3191}
2966 3192
2967############################################################################# 3193#############################################################################
2968 3194
2969package CFPlus::UI::ValSlider; 3195package DC::UI::ValSlider;
2970 3196
2971our @ISA = CFPlus::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2972 3198
2973sub new { 3199sub new {
2974 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2975 3201
2976 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2977 3203
2978 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2981 to_value => sub { shift }, 3207 to_value => sub { shift },
2982 from_value => sub { shift }, 3208 from_value => sub { shift },
2983 %arg, 3209 %arg,
2984 ); 3210 );
2985 3211
… …
3005sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
3006sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
3007 3233
3008############################################################################# 3234#############################################################################
3009 3235
3010package CFPlus::UI::TextScroller; 3236package DC::UI::TextScroller;
3011 3237
3012our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
3013 3239
3014use CFPlus::OpenGL; 3240use DC::OpenGL;
3015 3241
3016sub new { 3242sub new {
3017 my $class = shift; 3243 my $class = shift;
3018 3244
3019 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
… …
3021 can_events => 1, 3247 can_events => 1,
3022 indent => 0, 3248 indent => 0,
3023 #font => default_font 3249 #font => default_font
3024 @_, 3250 @_,
3025 3251
3026 layout => (new CFPlus::Layout), 3252 layout => (new DC::Layout),
3027 par => [], 3253 par => [],
3028 max_par => 0, 3254 max_par => 0,
3029 height => 0, 3255 height => 0,
3030 children => [ 3256 children => [
3031 (new CFPlus::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
3032 (new CFPlus::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
3033 ], 3259 ],
3034 ); 3260 );
3035 3261
3036 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
3037 3263
… …
3046} 3272}
3047 3273
3048sub size_request { 3274sub size_request {
3049 my ($self) = @_; 3275 my ($self) = @_;
3050 3276
3051 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
3052 3278
3053 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request 3280 $self->SUPER::size_request
3055} 3281}
3056 3282
… …
3093 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3094 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
3095 3321
3096 $layout->set_shapes ( 3322 $layout->set_shapes (
3097 map 3323 map
3098 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3099 @{$para->{widget}} 3325 @{$para->{widget}}
3100 ); 3326 );
3101 3327
3102 $layout 3328 $layout
3103} 3329}
… …
3220 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate; 3447 $self->force_uptodate;
3222 3448
3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3224 3450
3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3226 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
3227 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
3228 3454
3229 package CFPlus::UI::Base; 3455 package DC::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h}); 3457 (0, 0, $self->{w}, $self->{h});
3232 3458
3233 my $top = int $self->{children}[1]{range}[0]; 3459 my $top = int $self->{children}[1]{range}[0];
3234 3460
… …
3245 3471
3246 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
3247 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
3248 3474
3249 $layout->render ($para->{indent}, $y - $y0); 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
3250 3477
3251 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
3252 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
3253 3480
3254 for (@w) { 3481 for (@w) {
… …
3292 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
3293} 3520}
3294 3521
3295############################################################################# 3522#############################################################################
3296 3523
3297package CFPlus::UI::Animator; 3524package DC::UI::Animator;
3298 3525
3299use CFPlus::OpenGL; 3526use DC::OpenGL;
3300 3527
3301our @ISA = CFPlus::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
3302 3529
3303sub moveto { 3530sub moveto {
3304 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
3305 3532
3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3334 glPopMatrix; 3561 glPopMatrix;
3335} 3562}
3336 3563
3337############################################################################# 3564#############################################################################
3338 3565
3339package CFPlus::UI::Flopper; 3566package DC::UI::Flopper;
3340 3567
3341our @ISA = CFPlus::UI::Button::; 3568our @ISA = DC::UI::Button::;
3342 3569
3343sub new { 3570sub new {
3344 my $class = shift; 3571 my $class = shift;
3345 3572
3346 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
… …
3358 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
3359} 3586}
3360 3587
3361############################################################################# 3588#############################################################################
3362 3589
3363package CFPlus::UI::Tooltip; 3590package DC::UI::Tooltip;
3364 3591
3365our @ISA = CFPlus::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
3366 3593
3367use CFPlus::OpenGL; 3594use DC::OpenGL;
3368 3595
3369sub new { 3596sub new {
3370 my $class = shift; 3597 my $class = shift;
3371 3598
3372 $class->SUPER::new ( 3599 $class->SUPER::new (
… …
3376} 3603}
3377 3604
3378sub set_tooltip_from { 3605sub set_tooltip_from {
3379 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
3380 3607
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
3383
3384 my $tooltip = $widget->{tooltip}; 3608 my $tip = $widget->{tooltip};
3609 $tip = $tip->($widget) if "CODE" eq ref $tip;
3610
3611 $tip = DC::Pod::section_label tooltip => $1
3612 if $tip =~ /^#(.*)$/;
3385 3613
3386 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
3387 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3389 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
3390 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
3391 } 3619 }
3392 3620
3393 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
3395 3623
3396 $self->add (new CFPlus::UI::Label 3624 $self->add (new DC::UI::Label
3397 markup => $tooltip, 3625 markup => $tip,
3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
3399 fontsize => 0.8, 3628 fontsize => 0.8,
3400 style => 1, # FLAG_INVERSE 3629 style => 1, # FLAG_INVERSE
3401 ellipsise => 0, 3630 ellipsise => 0,
3402 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
3403 ); 3632 );
… …
3440} 3669}
3441 3670
3442sub _draw { 3671sub _draw {
3443 my ($self) = @_; 3672 my ($self) = @_;
3444 3673
3445 glTranslate 0.375, 0.375;
3446
3447 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
3448 3675
3449 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
3450 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
3451 glVertex 0 , 0;
3452 glVertex 0 , $h;
3453 glVertex $w, $h;
3454 glVertex $w, 0;
3455 glEnd;
3456 3678
3457 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
3458 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
3459 glVertex 0 , 0;
3460 glVertex 0 , $h;
3461 glVertex $w, $h;
3462 glVertex $w, 0;
3463 glEnd;
3464 3681
3465 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
3466 3683
3467 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
3468} 3685}
3469 3686
3470############################################################################# 3687#############################################################################
3471 3688
3472package CFPlus::UI::Face; 3689package DC::UI::Face;
3473 3690
3474our @ISA = CFPlus::UI::DrawBG::; 3691our @ISA = DC::UI::DrawBG::;
3475 3692
3476use CFPlus::OpenGL; 3693use DC::OpenGL;
3477 3694
3478sub new { 3695sub new {
3479 my $class = shift; 3696 my $class = shift;
3480 3697
3481 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
… …
3485 can_events => 0, 3702 can_events => 0,
3486 @_, 3703 @_,
3487 ); 3704 );
3488 3705
3489 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
3490 CFPlus::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
3491 3708
3492 $self->{timer} = Event->timer ( 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3494 hard => 1,
3495 interval => $self->{animspeed},
3496 cb => sub {
3497 return unless $::CONN; 3711 return unless $::CONN;
3498 3712
3713 my $w = $widget
3714 or return;
3715
3499 ++$widget->{frame}; 3716 ++$w->{frame};
3500 $self->update_face; 3717 $w->update_face;
3718
3719 # somehow, $widget can go away
3501 $self->update; 3720 $w->update;
3502 }, 3721 $w->update_timer;
3503 ); 3722 };
3504 3723
3505 $self->update_face; 3724 $self->update_face;
3725 $self->update_timer;
3506 } 3726 }
3507 3727
3508 $self 3728 $self
3509} 3729}
3510 3730
3731sub update_timer {
3732 my ($self) = @_;
3733
3734 return unless $self->{timer};
3735
3736 if ($self->{visible}) {
3737 $self->{timer}->start;
3738 } else {
3739 $self->{timer}->stop;
3740 }
3741}
3742
3511sub update_face { 3743sub update_face {
3512 my ($self) = @_; 3744 my ($self) = @_;
3513 3745
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
3524sub size_request {
3525 my ($self) = @_;
3526
3527 if ($::CONN) { 3746 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) { 3748 if ($anim && @$anim) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3531 } else { 3750 delete $self->{face_change_cb};
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3751
3533 $self->realloc; 3752 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3753 unless ($tex->{name} || $tex->{loading}) {
3754 $tex->upload (sub { $self->reconfigure });
3755 }
3534 }); 3756 }
3535 } 3757 }
3536 } 3758 }
3537 } 3759 }
3760}
3761
3762sub size_request {
3763 my ($self) = @_;
3764
3765 if ($::CONN) {
3766 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3767 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3768 if ($tex->{name}) {
3769 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3770 } elsif (!$tex->{loading}) {
3771 $tex->upload (sub { $self->reconfigure });
3772 }
3773 }
3774
3775 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3776 }
3777 }
3538 3778
3539 ($self->{size_w} || 8, $self->{size_h} || 8) 3779 ($self->{size_w} || 8, $self->{size_h} || 8)
3540} 3780}
3541 3781
3542sub update { 3782sub update {
… …
3545 return unless $self->{visible}; 3785 return unless $self->{visible};
3546 3786
3547 $self->SUPER::update; 3787 $self->SUPER::update;
3548} 3788}
3549 3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
3550sub _draw { 3798sub _draw {
3551 my ($self) = @_; 3799 my ($self) = @_;
3552 3800
3553 return unless $::CONN;
3554
3555 $self->SUPER::_draw; 3801 $self->SUPER::_draw;
3556 3802
3557 my $faceid = $::CONN->{faceid}[$self->{face}] 3803 if (my $tex = $self->{tex}) {
3558 or return;
3559
3560 my $tex = $::CONN->{texture}[$faceid];
3561
3562 if ($tex) {
3563 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3565 glColor 0, 0, 0, 1; 3806 glColor 0, 0, 0, 1;
3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3567 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
… …
3569} 3810}
3570 3811
3571sub destroy { 3812sub destroy {
3572 my ($self) = @_; 3813 my ($self) = @_;
3573 3814
3574 $self->{timer}->cancel 3815 (delete $self->{timer})->cancel
3575 if $self->{timer}; 3816 if $self->{timer};
3576 3817
3577 $self->SUPER::destroy; 3818 $self->SUPER::destroy;
3578} 3819}
3579 3820
3580############################################################################# 3821#############################################################################
3581 3822
3582package CFPlus::UI::Buttonbar; 3823package DC::UI::Buttonbar;
3583 3824
3584our @ISA = CFPlus::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
3585 3826
3586# TODO: should actually wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
3587 3828
3588############################################################################# 3829#############################################################################
3589 3830
3590package CFPlus::UI::Menu; 3831package DC::UI::Menu;
3591 3832
3592our @ISA = CFPlus::UI::Toplevel::; 3833our @ISA = DC::UI::Toplevel::;
3593 3834
3594use CFPlus::OpenGL; 3835use DC::OpenGL;
3595 3836
3596sub new { 3837sub new {
3597 my $class = shift; 3838 my $class = shift;
3598 3839
3599 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3600 items => [], 3841 items => [],
3601 z => 100, 3842 z => 100,
3602 @_, 3843 @_,
3603 ); 3844 );
3604 3845
3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
3606 3847
3607 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
3608 my ($widget, $cb, $tooltip) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
3609 3850
3610 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
3611 if (!ref $widget) { 3852 if (!ref $widget) {
3612 if ($widget =~ /\t/) { 3853 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2; 3854 my ($left, $right) = split /\t/, $widget, 2;
3614 3855
3615 $widget = new CFPlus::UI::HBox 3856 $widget = new DC::UI::HBox
3616 can_hover => 1, 3857 can_hover => 1,
3617 can_events => 1, 3858 can_events => 1,
3618 tooltip => $tooltip, 3859 tooltip => $tooltip,
3619 children => [ 3860 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1), 3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1), 3862 (new DC::UI::Label markup => $right, align => 1),
3622 ], 3863 ],
3623 ; 3864 ;
3624 3865
3625 } else { 3866 } else {
3626 $widget = new CFPlus::UI::Label 3867 $widget = new DC::UI::Label
3627 can_hover => 1, 3868 can_hover => 1,
3628 can_events => 1, 3869 can_events => 1,
3870 align => 0,
3629 markup => $widget, 3871 markup => $widget,
3630 tooltip => $tooltip; 3872 tooltip => $tooltip;
3631 } 3873 }
3632 } 3874 }
3633 3875
… …
3679 1 3921 1
3680} 3922}
3681 3923
3682############################################################################# 3924#############################################################################
3683 3925
3684package CFPlus::UI::Multiplexer; 3926package DC::UI::Multiplexer;
3685 3927
3686our @ISA = CFPlus::UI::Container::; 3928our @ISA = DC::UI::Container::;
3687 3929
3688sub new { 3930sub new {
3689 my $class = shift; 3931 my $class = shift;
3690 3932
3691 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
… …
3752 $self->{current}->draw; 3994 $self->{current}->draw;
3753} 3995}
3754 3996
3755############################################################################# 3997#############################################################################
3756 3998
3757package CFPlus::UI::Notebook; 3999package DC::UI::Notebook;
3758 4000
4001use DC::OpenGL;
4002
3759our @ISA = CFPlus::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3760 4004
3761sub new { 4005sub new {
3762 my $class = shift; 4006 my $class = shift;
3763 4007
3764 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3765 buttonbar => (new CFPlus::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3767 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3768 @_, 4013 @_,
3769 ); 4014 );
3770 4015
3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3772 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3773 4018
4019 {
4020 Scalar::Util::weaken (my $wself = $self);
4021
4022 $self->{multiplexer}->connect (c_add => sub {
4023 my ($mplex, $widgets) = @_;
4024
4025 for my $child (@$widgets) {
4026 Scalar::Util::weaken $child;
4027 $child->{c_tab_} ||= do {
4028 my $tab =
4029 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4030 ? $child->{c_tab}
4031 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4032
4033 $tab->connect (activate => sub {
4034 $wself->set_current_page ($child);
4035 });
4036
4037 $tab
4038 };
4039
4040 $self->{buttonbar}->add ($child->{c_tab_});
4041 }
4042 });
4043
4044 $self->{multiplexer}->connect (c_remove => sub {
4045 my ($mplex, $widgets) = @_;
4046
4047 for my $child (@$widgets) {
4048 $wself->{buttonbar}->remove ($child->{c_tab_});
4049 }
4050 });
4051 }
4052
3774 $self 4053 $self
3775} 4054}
3776 4055
3777sub add { 4056sub add {
4057 my ($self, @widgets) = @_;
4058
4059 $self->{multiplexer}->add (@widgets)
4060}
4061
4062sub remove {
4063 my ($self, @widgets) = @_;
4064
4065 $self->{multiplexer}->remove (@widgets)
4066}
4067
4068sub pages {
4069 my ($self) = @_;
4070 $self->{multiplexer}->children
4071}
4072
4073sub page_index {
4074 my ($self, $widget) = @_;
4075
4076 my $i = 0;
4077 for ($self->pages) {
4078 if ($_ eq $widget) { return $i };
4079 $i++;
4080 }
4081
4082 undef
4083}
4084
4085sub add_tab {
3778 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3779 4087
3780 CFPlus::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3781 4090
3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3783 markup => $title,
3784 tooltip => $tooltip,
3785 on_activate => sub { $self->set_current_page ($widget) },
3786 );
3787
3788 $self->{multiplexer}->add ($widget); 4091 $self->add ($widget);
3789} 4092}
3790 4093
3791sub get_current_page { 4094sub get_current_page {
3792 my ($self) = @_; 4095 my ($self) = @_;
3793 4096
… …
3799 4102
3800 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3801 $self->emit (page_changed => $self->{multiplexer}{current}); 4104 $self->emit (page_changed => $self->{multiplexer}{current});
3802} 4105}
3803 4106
4107sub _draw {
4108 my ($self) = @_;
4109
4110 $self->SUPER::_draw ();
4111
4112 if (my $cur = $self->{multiplexer}{current}) {
4113 if ($cur = $cur->{c_tab_}) {
4114 glTranslate $self->{buttonbar}{x} + $cur->{x},
4115 $self->{buttonbar}{y} + $cur->{y};
4116 glLineWidth 3;
4117 #glEnable GL_BLEND;
4118 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4119 glColor @{$self->{active_outline}};
4120 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4121 glLineWidth 1;
4122 #glDisable GL_BLEND;
4123 }
4124 }
4125}
4126
3804############################################################################# 4127#############################################################################
3805 4128
3806package CFPlus::UI::Selector; 4129package DC::UI::Selector;
3807 4130
3808use utf8; 4131use utf8;
3809 4132
3810our @ISA = CFPlus::UI::Button::; 4133our @ISA = DC::UI::Button::;
3811 4134
3812sub new { 4135sub new {
3813 my $class = shift; 4136 my $class = shift;
3814 4137
3815 my $self = $class->SUPER::new ( 4138 my $self = $class->SUPER::new (
… …
3832 my ($value, $title, $tooltip) = @$_; 4155 my ($value, $title, $tooltip) = @$_;
3833 4156
3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3835 } 4158 }
3836 4159
3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3838} 4161}
3839 4162
3840sub _set_value { 4163sub _set_value {
3841 my ($self, $value) = @_; 4164 my ($self, $value) = @_;
3842 4165
3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
3844 or return; 4168 or return;
3845 4169
3846 $self->{value} = $item->[0]; 4170 $self->{value} = $item->[0];
3847 $self->set_markup ("$item->[1] ⇓"); 4171 $self->set_markup ("$item->[1] ⇓");
3848 $self->set_tooltip ($item->[2]); 4172# $self->set_tooltip ($item->[2]);
3849} 4173}
3850 4174
3851sub set_value { 4175sub set_value {
3852 my ($self, $value) = @_; 4176 my ($self, $value) = @_;
3853 4177
… …
3855 4179
3856 $self->_set_value ($value); 4180 $self->_set_value ($value);
3857 $self->emit (changed => $value); 4181 $self->emit (changed => $value);
3858} 4182}
3859 4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
3860############################################################################# 4191#############################################################################
3861 4192
3862package CFPlus::UI::Statusbox; 4193package DC::UI::Statusbox;
3863 4194
3864our @ISA = CFPlus::UI::VBox::; 4195our @ISA = DC::UI::VBox::;
3865 4196
3866sub new { 4197sub new {
3867 my $class = shift; 4198 my $class = shift;
3868 4199
3869 my $self = $class->SUPER::new ( 4200 my $self = $class->SUPER::new (
3870 fontsize => 0.8, 4201 fontsize => 0.8,
3871 @_, 4202 @_,
3872 ); 4203 );
3873 4204
3874 CFPlus::weaken (my $this = $self); 4205 DC::weaken (my $this = $self);
3875 4206
3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3877 4208
3878 $self 4209 $self
3879} 4210}
3880 4211
3881sub reorder { 4212sub reorder {
3882 my ($self) = @_; 4213 my ($self) = @_;
3883 my $NOW = Time::HiRes::time; 4214 my $NOW = Time::HiRes::time;
3884 4215
3885 # freeze display when hovering over any label 4216 # freeze display when hovering over any label
3886 return if $CFPlus::UI::TOOLTIP->{owner} 4217 return if $DC::UI::TOOLTIP->{owner}
3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3888 values %{ $self->{item} }; 4219 values %{ $self->{item} };
3889 4220
3890 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3891 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3892 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3893 4226
3894 my @widgets; 4227 my @widgets;
3895 4228
3896 my @items = sort { 4229 my @items = sort {
3897 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
3898 or $b->{id} <=> $a->{id} 4231 or $b->{id} <=> $a->{id}
3899 } values %{ $self->{item} }; 4232 } values %{ $self->{item} };
3900
3901 $self->{timer}->interval (1);
3902 4233
3903 my $count = 10 + 1; 4234 my $count = 10 + 1;
3904 for my $item (@items) { 4235 for my $item (@items) {
3905 last unless --$count; 4236 last unless --$count;
3906 4237
… …
3913 for ($short) { 4244 for ($short) {
3914 s/^\s+//; 4245 s/^\s+//;
3915 s/\s+/ /g; 4246 s/\s+/ /g;
3916 } 4247 }
3917 4248
3918 new CFPlus::UI::Label 4249 new DC::UI::Label
3919 markup => $short, 4250 markup => $short,
3920 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3921 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3922 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3923 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3924 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3925 fg => [@{ $item->{fg} }], 4257 fg => [@{ $item->{fg} }],
3926 can_events => 1, 4258 can_events => 1,
3927 can_hover => 1 4259 can_hover => 1
3928 }; 4260 };
3929 4261
3930 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3931 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3932 $label->update; 4264 $label->update;
3933 $label->set_max_size (undef, $label->{req_h} * $diff) 4265 $label->set_max_size (undef, $label->{req_h} * $diff)
3934 if $diff < 1; 4266 if $diff < 1;
3935 $self->{timer}->interval (1/30); 4267 $self->{timer}->set (1/30, 1/30);
3936 } else { 4268 } else {
3937 $label->{fg}[3] = $item->{fg}[3] || 1; 4269 $label->{fg}[3] = $item->{fg}[3] || 1;
3938 } 4270 }
3939 4271
3940 push @widgets, $label; 4272 push @widgets, $label;
… …
4002 $self->SUPER::destroy; 4334 $self->SUPER::destroy;
4003} 4335}
4004 4336
4005############################################################################# 4337#############################################################################
4006 4338
4007package CFPlus::UI::Root; 4339package DC::UI::Root;
4008 4340
4009our @ISA = CFPlus::UI::Container::; 4341our @ISA = DC::UI::Container::;
4010 4342
4011use List::Util qw(min max); 4343use List::Util qw(min max);
4012 4344
4013use CFPlus::OpenGL; 4345use DC::OpenGL;
4014 4346
4015sub new { 4347sub new {
4016 my $class = shift; 4348 my $class = shift;
4017 4349
4018 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
4019 visible => 1, 4351 visible => 1,
4020 @_, 4352 @_,
4021 ); 4353 );
4022 4354
4023 CFPlus::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
4024 4356
4025 $self 4357 $self
4026} 4358}
4027 4359
4028sub size_request { 4360sub size_request {
… …
4076} 4408}
4077 4409
4078sub update { 4410sub update {
4079 my ($self) = @_; 4411 my ($self) = @_;
4080 4412
4081 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
4082} 4414}
4083 4415
4084sub add { 4416sub add {
4085 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
4086 4418
… …
4123 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
4124 $_->() 4456 $_->()
4125 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
4126 } 4458 }
4127 4459
4128 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
4129 my %queue; 4461 my %queue;
4130 my @queue; 4462 my @queue;
4131 my $widget; 4463 my $widget;
4132 4464
4133 outer: 4465 outer:
… …
4153 4485
4154 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
4155 4487
4156 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
4157 4489
4158 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
4159 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4491 $h += $widget->{padding_y} * 2;
4492
4493 $w = max $widget->{min_w}, $w;
4494 $h = max $widget->{min_h}, $h;
4160 4495
4161 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4162 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4163 4498
4164 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4180 } 4515 }
4181 } 4516 }
4182 4517
4183 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
4184 } 4519 }
4185 }
4186 4520
4187 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
4188 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
4189 values %$size_alloc; 4523 values %$size_alloc;
4190 4524
4191 while () { 4525 while () {
4192 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
4193 4527
4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4195 4529
4196 $w = 0 if $w < 0;
4197 $h = 0 if $h < 0;
4198
4199 $w = max $widget->{min_w}, $w; 4530 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h; 4531 $h = max $widget->{min_h}, $h;
4201 4532
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204 4535
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207 4538
4208 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
4209 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
4210 4541
4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4542 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4212 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
4213 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
4214 4545
4215 $widget->{w} = $w; 4546 $widget->{w} = $w;
4216 $widget->{h} = $h; 4547 $widget->{h} = $h;
4217 4548
4218 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
4219 } 4551 }
4220 } 4552 }
4221 } 4553 }
4222 4554
4223 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
4224 $_->() 4556 $_->()
4225 for values %{delete $self->{post_alloc_hook}}; 4557 for values %{delete $self->{post_alloc_hook}};
4226 } 4558 }
4227
4228 4559
4229 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4231 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
4232 4563
… …
4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4236 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
4237 glLoadIdentity; 4568 glLoadIdentity;
4238 4569
4239 { 4570 {
4240 package CFPlus::UI::Base; 4571 package DC::UI::Base;
4241 4572
4242 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4243 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
4244 4575
4245 $self->_draw; 4576 $self->_draw;
4246 } 4577 }
4247} 4578}
4248 4579
4249############################################################################# 4580#############################################################################
4250 4581
4251package CFPlus::UI; 4582package DC::UI;
4252 4583
4253$ROOT = new CFPlus::UI::Root; 4584$ROOT = new DC::UI::Root;
4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
4255 4586
42561 45871
4257 4588

Diff Legend

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