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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFPlus; 8use DC;
11use CFPlus::Pod; 9use DC::Pod;
12use CFPlus::Texture; 10use DC::Texture;
13 11
14our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
15 13
16our $LAYOUT; 14our $LAYOUT;
17our $ROOT; 15our $ROOT;
18our $TOOLTIP; 16our $TOOLTIP;
19our $BUTTON_STATE; 17our $BUTTON_STATE;
20 18
21our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
22 20
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
24 if (!$GRAB) { 24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 29 $TOOLTIP->hide;
29 30
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 33
32 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
33 35
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 37 $TOOLTIP->show;
40 } 38 }
41 39
42 return; 40 return;
43 } 41 }
44 } 42 }
45 } 43 }
46 44
47 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
49}); 48};
50 49
51sub get_layout { 50sub get_layout {
52 my $layout; 51 my $layout;
53 52
54 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
89 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
90 89
91 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
93 92
94 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
95 } 94 }
96} 95}
97 96
98sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
99 my ($ev) = @_; 98 my ($ev) = @_;
… …
105 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
106 105
107 $GRAB = $widget; 106 $GRAB = $widget;
108 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
109 108
110 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
111 } 110 }
112 111
113 if ($GRAB) { 112 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 114 # mousewheel
116 $ev->{dx} = 0;
117 $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
118 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
119 } else { 122 } else {
120 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
121 } 124 }
122 } 125 }
… …
136 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
137 $grab->update if $grab; 140 $grab->update if $grab;
138 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
139 142
140 check_hover $widget; 143 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
142 } 145 }
143} 146}
144 147
145sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
146 my ($ev) = @_; 149 my ($ev) = @_;
… …
208 reconfigure_widgets; 211 reconfigure_widgets;
209} 212}
210 213
211############################################################################# 214#############################################################################
212 215
213package CFPlus::UI::Event; 216package DC::UI::Event;
214 217
215sub xy { 218sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217} 220}
218 221
219############################################################################# 222#############################################################################
220 223
221package CFPlus::UI::Base; 224package DC::UI::Base;
222 225
223use strict; 226use strict;
224 227
225use CFPlus::OpenGL; 228use DC::OpenGL;
226 229
227sub new { 230sub new {
228 my $class = shift; 231 my $class = shift;
229 232
230 my $self = bless { 233 my $self = bless {
… …
235 h => undef, 238 h => undef,
236 can_events => 1, 239 can_events => 1,
237 @_ 240 @_
238 }, $class; 241 }, $class;
239 242
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
241 244
242 for (keys %$self) { 245 for (keys %$self) {
243 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
245 } 248 }
246 } 249 }
247 250
248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
249 $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};
250 $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};
251 $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};
252 $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};
253 256
254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
256 259
257 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
266 $self->hide; 269 $self->hide;
267 $self->emit ("destroy"); 270 $self->emit ("destroy");
268 %$self = (); 271 %$self = ();
269} 272}
270 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
271sub show { 278sub show {
272 my ($self) = @_; 279 my ($self) = @_;
273 280
274 return if $self->{parent}; 281 return if $self->{parent};
275 282
276 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
277} 284}
278 285
279sub set_visible { 286sub set_visible {
280 my ($self) = @_; 287 my ($self) = @_;
281 288
… …
302 delete $self->{root}; 309 delete $self->{root};
303 310
304 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
305 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
306 313
307 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
308 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
309 316
310 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
311 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
312} 319}
… …
314sub set_visibility { 321sub set_visibility {
315 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
316 323
317 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
318 325
319 $visible ? $self->hide 326 $visible ? $self->show
320 : $self->show; 327 : $self->hide;
321} 328}
322 329
323sub toggle_visibility { 330sub toggle_visibility {
324 my ($self) = @_; 331 my ($self) = @_;
325 332
… …
331sub hide { 338sub hide {
332 my ($self) = @_; 339 my ($self) = @_;
333 340
334 $self->set_invisible; 341 $self->set_invisible;
335 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
336 $self->{parent}->remove ($self) 346 $parent->remove ($self);
337 if $self->{parent}; 347 }
338} 348}
339 349
340sub move_abs { 350sub move_abs {
341 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
342 352
… …
354 $self->{force_h} = $h; 364 $self->{force_h} = $h;
355 365
356 $self->realloc; 366 $self->realloc;
357} 367}
358 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
359sub size_request { 387sub size_request {
360 require Carp; 388 require Carp;
361 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
362} 390}
363 391
… …
369 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
370 398
371 if ($self->{aspect}) { 399 if ($self->{aspect}) {
372 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
373 401
374 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
375 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
376 404
377 # use alignment to adjust x, y 405 # use alignment to adjust x, y
378 406
379 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
380 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
… …
421 449
422 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
423 451
424 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
425 453
426 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
427 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
428 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
429 } 457 }
430} 458}
431 459
432# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
433sub coord2local { 461sub coord2local {
434 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
435 463
436 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
437 465
438 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
439} 467}
440 468
441# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
442sub coord2global { 470sub coord2global {
443 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
444 472
445 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
446 474
447 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
448} 476}
449 477
450sub invoke_focus_in { 478sub invoke_focus_in {
… …
499sub connect { 527sub connect {
500 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
501 529
502 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
503 531
504 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
505 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
506 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
507 } 535 }
508} 536}
509 537
… …
530 ? $args[0]->xy ($self) 558 ? $args[0]->xy ($self)
531 : (); 559 : ();
532 560
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 561 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 562
535 #d##TODO# stop propagating at first true, do not use sum 563 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 564 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 565 ($self->can ("invoke_$signal") || sub { 1 }), # closure
566 ) {
567 return $cb->($self, @args, @append) || next;
568 }
569
570 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 572}
540 573
541sub find_widget { 574#sub find_widget {
542 my ($self, $x, $y) = @_; 575# in .xs
543
544 return () unless $self->{can_events};
545
546 return $self
547 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550 ()
551}
552 576
553sub set_parent { 577sub set_parent {
554 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
555 579
556 Scalar::Util::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
558} 582}
559 583
560sub realloc { 584sub realloc {
561 my ($self) = @_; 585 my ($self) = @_;
… …
587 611
588# 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
589# functions seems pointless. 613# functions seems pointless.
590our ($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
591 615
592sub draw { 616#sub draw {
593 my ($self) = @_; 617#CFPlus.xs
594
595 return unless $self->{h} && $self->{w};
596
597 # update screen rectangle
598 local $draw_x = $draw_x + $self->{x};
599 local $draw_y = $draw_y + $self->{y};
600
601 # skip widgets that are entirely outside the drawing area
602 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
603 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
604
605 glPushMatrix;
606 glTranslate $self->{x}, $self->{y}, 0;
607
608 if ($self == $HOVER && $self->{can_hover}) {
609 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
610 glEnable GL_BLEND;
611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glBegin GL_QUADS;
613 glVertex 0 , 0;
614 glVertex $self->{w}, 0;
615 glVertex $self->{w}, $self->{h};
616 glVertex 0 , $self->{h};
617 glEnd;
618 glDisable GL_BLEND;
619 }
620
621 if ($ENV{CFPLUS_DEBUG} & 1) {
622 glPushMatrix;
623 glColor 1, 1, 0, 1;
624 glTranslate 0.375, 0.375;
625 glBegin GL_LINE_LOOP;
626 glVertex 0 , 0;
627 glVertex $self->{w} - 1, 0;
628 glVertex $self->{w} - 1, $self->{h} - 1;
629 glVertex 0 , $self->{h} - 1;
630 glEnd;
631 glPopMatrix;
632 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
633 }
634
635 $self->_draw;
636 glPopMatrix;
637}
638 618
639sub _draw { 619sub _draw {
640 my ($self) = @_; 620 my ($self) = @_;
641 621
642 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
643} 623}
644 624
645sub DESTROY { 625sub DESTROY {
646 my ($self) = @_; 626 my ($self) = @_;
647 627
648 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
649 629
630 local $@;
650 eval { $self->destroy }; 631 eval { $self->destroy };
651 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652 633
653 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
654} 635}
655 636
656############################################################################# 637#############################################################################
657 638
658package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
659 640
660our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
661 642
662use strict; 643use strict;
663use CFPlus::OpenGL; 644use DC::OpenGL;
664 645
665sub new { 646sub new {
666 my $class = shift; 647 my $class = shift;
667
668 # range [value, low, high, page]
669 648
670 $class->SUPER::new ( 649 $class->SUPER::new (
671 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
672 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
673 @_ 652 @_
… …
685 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
686 665
687 glEnable GL_BLEND; 666 glEnable GL_BLEND;
688 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
689 glColor_premultiply @$color; 668 glColor_premultiply @$color;
690
691 glBegin GL_QUADS;
692 glVertex 0 , 0;
693 glVertex 0 , $h;
694 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
695 glVertex $w, 0;
696 glEnd;
697
698 glDisable GL_BLEND; 670 glDisable GL_BLEND;
699 } 671 }
700} 672}
701 673
702############################################################################# 674#############################################################################
703 675
704package CFPlus::UI::Empty; 676package DC::UI::Empty;
705 677
706our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
707 679
708sub new { 680sub new {
709 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
710 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
711} 683}
… …
718 690
719sub draw { } 691sub draw { }
720 692
721############################################################################# 693#############################################################################
722 694
723package CFPlus::UI::Container; 695package DC::UI::Container;
724 696
725our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
726 698
727sub new { 699sub new {
728 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
729 701
730 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
734 can_events => 0, 706 can_events => 0,
735 %arg, 707 %arg,
736 ); 708 );
737 709
738 $self->add (@$children) 710 $self->add (@$children)
739 if $children; 711 if $children && @$children;
740 712
741 $self 713 $self
742} 714}
743 715
744sub realloc { 716sub realloc {
… …
753 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
754 726
755 $_->set_parent ($self) 727 $_->set_parent ($self)
756 for @widgets; 728 for @widgets;
757 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
758 use sort 'stable'; 731 use sort 'stable';
759 732
760 $self->{children} = [ 733 $self->{children} = [
761 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
762 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
763 ]; 736 ];
764 737
765 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
766} 743}
767 744
768sub children { 745sub children {
769 @{ $_[0]{children} } 746 @{ $_[0]{children} }
770} 747}
771 748
772sub remove { 749sub remove {
773 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
774 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
775 delete $child->{parent}; 755 delete $child->{parent};
776 $child->hide; 756 $child->hide;
777
778 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
779 759
780 $self->realloc; 760 $self->realloc;
781} 761}
782 762
783sub clear { 763sub clear {
784 my ($self) = @_; 764 my ($self) = @_;
785 765
786 my $children = delete $self->{children}; 766 my $children = $self->{children};
787 $self->{children} = []; 767 $self->{children} = [];
788 768
789 for (@$children) { 769 for (@$children) {
790 delete $_->{parent}; 770 delete $_->{parent};
791 $_->hide; 771 $_->hide;
… …
811} 791}
812 792
813sub _draw { 793sub _draw {
814 my ($self) = @_; 794 my ($self) = @_;
815 795
816 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
817} 797}
818 798
819############################################################################# 799#############################################################################
820 800
821package CFPlus::UI::Bin; 801package DC::UI::Bin;
822 802
823our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
824 804
825sub new { 805sub new {
826 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
827 807
828 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
829 809
830 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
831} 811}
832 812
833sub add { 813sub add {
834 my ($self, $child) = @_; 814 my ($self, $child) = @_;
835 815
836 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
837 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
838} 818}
839 819
840sub remove { 820sub remove {
841 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
842 822
843 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
844 824
845 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
846 unless @{$self->{children}}; 826 unless @{$self->{children}};
847} 827}
848 828
849sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
850 830
… …
859 839
860 1 840 1
861} 841}
862 842
863############################################################################# 843#############################################################################
864
865# back-buffered drawing area 844# back-buffered drawing area
866 845
867package CFPlus::UI::Window; 846package DC::UI::Window;
868 847
869our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
870 849
871use CFPlus::OpenGL; 850use DC::OpenGL;
872 851
873sub new { 852sub new {
874 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
875 854
876 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
898} 877}
899 878
900sub render_child { 879sub render_child {
901 my ($self) = @_; 880 my ($self) = @_;
902 881
903 $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 {
904 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
905 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
906 885
907 { 886 {
908 package CFPlus::UI::Base; 887 package DC::UI::Base;
909 888
910 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
911 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
912 891
913 $self->_render; 892 $self->_render;
… …
930 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
931} 910}
932 911
933############################################################################# 912#############################################################################
934 913
935package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
936 915
916use List::Util qw(min max);
917
937our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
938 919
939sub new { 920sub new {
940 my $class = shift; 921 my $class = shift;
941 922
942 $class->SUPER::new ( 923 $class->SUPER::new (
… …
949sub size_request { 930sub size_request {
950 my ($self) = @_; 931 my ($self) = @_;
951 932
952 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953 934
954 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
955 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
956 937
957 ($w, $h) 938 ($w, $h)
958} 939}
959 940
960sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
972} 953}
973 954
974sub set_offset { 955sub set_offset {
975 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
976 957
958 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
959 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
960
961 if ($x != $self->{view_x} or $y != $self->{view_y}) {
977 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
979 964
965 $self->emit (changed => $x, $y);
980 $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 }
981} 986}
982 987
983# 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
984sub coord2local { 989sub coord2local {
985 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
1000 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1001 1006
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 1009 ) {
1005 $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})
1006 } else { 1011 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1008 } 1013 }
1009} 1014}
1010 1015
1011sub _render { 1016sub _render {
1012 my ($self) = @_; 1017 my ($self) = @_;
1013 1018
1014 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};
1015 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};
1016 1021
1017 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1018 1023
1019 $self->SUPER::_render; 1024 $self->SUPER::_render;
1020} 1025}
1021 1026
1022############################################################################# 1027#############################################################################
1023 1028
1024package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1025 1030
1026our @ISA = CFPlus::UI::HBox::; 1031our @ISA = DC::UI::Table::;
1027 1032
1028sub new { 1033sub new {
1029 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1030 1035
1031 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1032 1037
1033 my $self; 1038 my $self;
1034 1039
1035 my $slider = new CFPlus::UI::Slider 1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1043 vertical => 0,
1044 range => [0, 0, 1, 0.01], # HACK fix
1045 on_changed => sub {
1046 $self->{hpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 },
1049 ;
1050
1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
1036 vertical => 1, 1054 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1056 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1059 },
1041 ; 1060 ;
1042 1061
1043 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1045 can_events => 1, 1065 can_events => 1,
1046 slider => $slider, 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
1047 %arg, 1070 %arg,
1048 ); 1071 );
1049 1072
1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1092 ;
1093
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1094 $self->SUPER::add ($self->{vp});
1095
1051 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1052 1097
1053 $self 1098 $self
1054} 1099}
1055
1056#TODO# update range on size_allocate depending on child
1057 1100
1058sub add { 1101sub add {
1059 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1060 1103
1061 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1062} 1105}
1063 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1111sub update_slider {
1112 my ($self) = @_;
1113
1114 my $child = ($self->{vp} or return)->child;
1115
1116 if ($self->{scroll_x}) {
1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1119
1120 my $visible = $w1 > $w2;
1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1126 }
1127
1128 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
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);
1156 };
1157}
1158
1064sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1066 1161
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->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};
1070 1164
1071 1 1165 1
1072} 1166}
1073 1167
1074sub update_slider { 1168sub invoke_button_down {
1075 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1076 1170
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1171 if ($ev->{button} == 2) {
1078} 1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1079 1175
1080sub update { 1176 0
1081 my ($self) = @_; 1177}
1082 1178
1083 $self->SUPER::update; 1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1084 1181
1085 $self->update_slider; 1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1086} 1198}
1087 1199
1088sub invoke_size_allocate { 1200sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1090 1202
1091 $self->update_slider; 1203 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1205}
1095 1206
1096############################################################################# 1207#############################################################################
1097 1208
1098package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1099 1210
1100our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1101 1212
1102use CFPlus::OpenGL; 1213use DC::OpenGL;
1103 1214
1104sub new { 1215sub new {
1105 my $class = shift; 1216 my $class = shift;
1106 1217
1107 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1117 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1118 1229
1119 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1120 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1121 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1122
1123 glBegin GL_QUADS;
1124 glVertex 0 , 0;
1125 glVertex 0 , $h;
1126 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1127 glVertex $w, 0;
1128 glEnd;
1129
1130 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1131 } 1235 }
1132 1236
1133 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1134} 1238}
1135 1239
1136############################################################################# 1240#############################################################################
1137 1241
1138package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1139 1243
1140our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1141 1245
1142use CFPlus::OpenGL; 1246use DC::OpenGL;
1143 1247
1144sub new { 1248sub new {
1145 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1146 1250
1147 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1148 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1149 align => 1, 1253 align => 1,
1150 valign => 0, 1254 valign => 0.5,
1151 text => $arg{label}, 1255 text => $arg{label},
1152 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1153 } 1257 }
1154 1258
1155 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
… …
1165 1269
1166sub add { 1270sub add {
1167 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1168 1272
1169 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1170 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1171} 1275}
1172 1276
1173sub border { 1277sub border {
1174 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1175} 1279}
… …
1233 } 1337 }
1234} 1338}
1235 1339
1236############################################################################# 1340#############################################################################
1237 1341
1238package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1239 1343
1240our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1241 1345
1242use CFPlus::OpenGL; 1346use DC::OpenGL;
1243 1347
1244my $bg = 1348my $bg =
1245 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_resource DC::Texture "d1_bg.png",
1246 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1247 1351
1248my @border = 1352my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_resource DC::Texture $_, mipmap => 1 }
1250 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_resource DC::Texture $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1251 1359
1252sub new { 1360sub new {
1253 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1254 1362
1255 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1256 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1257 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1258 border => 0.6, 1366 border => 1,
1259 can_events => 1, 1367 can_events => 1,
1260 min_w => 64, 1368 min_w => 64,
1261 min_h => 32, 1369 min_h => 32,
1262 %arg, 1370 %arg,
1263 ); 1371 );
1264 1372
1265 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1266 align => 0, 1374 align => 0.5,
1267 valign => 1, 1375 valign => 1,
1268 text => $self->{title}, 1376 text => $self->{title},
1269 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1270 if exists $self->{title}; 1378 if exists $self->{title};
1271 1379
1272 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1273 $self->{close_button} = 1381 $self->{close_button} =
1274 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1275 path => 'x1_close.png', 1383 path => 'x1_close.png',
1276 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1277 1385
1278 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1279 } 1387 }
1280 1388
1281 $self 1389 $self
1282} 1390}
1283 1391
1284sub add { 1392sub add {
1285 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1286 1394
1287 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1288 $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};
1289 $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};
1290} 1398}
1291 1399
1292sub border { 1400sub border {
1293 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
1294} 1411}
1295 1412
1296sub size_request { 1413sub size_request {
1297 my ($self) = @_; 1414 my ($self) = @_;
1298 1415
… …
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1542
1426 my $border = $self->border; 1543 my $border = $self->border;
1427 1544
1428 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $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);
1433 1564
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1436 1567
1437 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1456 if $self->{close_button}; 1587 if $self->{close_button};
1457} 1588}
1458 1589
1459############################################################################# 1590#############################################################################
1460 1591
1461package CFPlus::UI::Table; 1592package DC::UI::Table;
1462 1593
1463our @ISA = CFPlus::UI::Base::; 1594our @ISA = DC::UI::Container::;
1464 1595
1465use List::Util qw(max sum); 1596use List::Util qw(max sum);
1466 1597
1467use CFPlus::OpenGL; 1598use DC::OpenGL;
1468 1599
1469sub new { 1600sub new {
1470 my $class = shift; 1601 my $class = shift;
1471 1602
1472 $class->SUPER::new ( 1603 $class->SUPER::new (
1473 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
1474 @_, 1606 @_,
1475 ) 1607 )
1476} 1608}
1477 1609
1478sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480}
1481
1482sub 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 {
1483 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1484 1625
1485 while (@_) { 1626 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child;
1489 }
1490 1628
1491 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1492 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1493 $self->realloc;
1494}
1495 1631
1496sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1497 my ($self, $child) = @_; 1639 my ($self) = @_;
1498 1640
1499 # TODO: not yet implemented 1641 my (@w, @h);
1500}
1501
1502# TODO: move to container class maybe? send children a signal on removal?
1503sub clear {
1504 my ($self) = @_;
1505 1642
1506 my @children = $self->children; 1643 my @children = $self->children;
1507 delete $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];
1653 }
1508 1654 }
1509 for (@children) {
1510 delete $_->{parent};
1511 $_->hide;
1512 }
1513 1655
1514 $self->realloc; 1656 # second pass, rows
1515} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1516
1517sub get_wh {
1518 my ($self) = @_;
1519
1520 my (@w, @h);
1521
1522 for my $y (0 .. $#{$self->{children}}) {
1523 my $row = $self->{children}[$y]
1524 or next;
1525
1526 for my $x (0 .. $#$row) {
1527 my $widget = $row->[$x]
1528 or next;
1529 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1530 1659
1531 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1532 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1533 } 1664 }
1534 } 1665 }
1535 1666
1536 (\@w, \@h) 1667 (\@w, \@h)
1537} 1668}
… …
1553 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1554 1685
1555 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1557 1688
1558 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
1559 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1562 1693
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1695
1567 CFPlus::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1697
1698 my @row_expand = @{$self->{row_expand}};
1699 @row_expand = (1) x @$ws unless @row_expand;
1700 my $row_expand = (sum @row_expand) || 1;
1701
1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1703
1568 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1569 1705
1570 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571 1708
1572 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1573 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)};
1574 or next;
1575 1711
1576 my $x = 0; 1712 $widget->configure (
1577 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578 1715 );
1579 for my $c (0 .. $#$row) { 1716 }
1580 my $col_w = $ws->[$c];
1581 1717
1582 if (my $widget = $row->[$c]) { 1718 1
1583 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1584 }
1585 1720
1586 $x += $col_w; 1721#############################################################################
1722
1723package DC::UI::Fixed;
1724
1725use List::Util qw(min max);
1726
1727our @ISA = DC::UI::Container::;
1728
1729sub _scale($$$) {
1730 my ($rel, $val, $max) = @_;
1731
1732 $rel ? $val * $max : $val
1733}
1734
1735sub size_request {
1736 my ($self) = @_;
1737
1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1739
1740 # determine overall size by querying abs widgets
1741 for my $child ($self->visible_children) {
1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1745
1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1587 } 1748 }
1749 }
1588 1750
1589 $y += $row_h; 1751 my $W = $x2 - $x1;
1752 my $H = $y2 - $y1;
1753
1754 # now layout remaining widgets
1755 for my $child ($self->visible_children) {
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;
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 ($W, $H)
1769}
1770
1771sub invoke_size_allocate {
1772 my ($self, $W, $H) = @_;
1773
1774 for my $child ($self->visible_children) {
1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1777
1778 $x += $child->{c_halign} * $child->{req_w};
1779 $y += $child->{c_valign} * $child->{req_h};
1780
1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1590 } 1782 }
1591 1783
1592 1 1784 1
1593} 1785}
1594 1786
1595sub find_widget {
1596 my ($self, $x, $y) = @_;
1597
1598 $x -= $self->{x};
1599 $y -= $self->{y};
1600
1601 my $res;
1602
1603 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1604 $res = $_->find_widget ($x, $y)
1605 and return $res;
1606 }
1607
1608 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1609}
1610
1611sub _draw {
1612 my ($self) = @_;
1613
1614 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_;
1616 }
1617}
1618
1619############################################################################# 1787#############################################################################
1620 1788
1621package CFPlus::UI::Box; 1789package DC::UI::Box;
1622 1790
1623our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1624 1792
1625sub size_request { 1793sub size_request {
1626 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1627 1797
1628 $self->{vertical} 1798 $self->{vertical}
1629 ? ( 1799 ? (
1630 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1631 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1632 ) 1802 )
1633 : ( 1803 : (
1634 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1635 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1636 ) 1806 )
1637} 1807}
1638 1808
1639sub invoke_size_allocate { 1809sub invoke_size_allocate {
1640 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1661 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1662 for 0 .. $#children; 1832 for 0 .. $#children;
1663 } 1833 }
1664 } 1834 }
1665 1835
1666 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1667 1837
1668 my $pos = 0; 1838 my $pos = 0;
1669 for (0 .. $#children) { 1839 for (0 .. $#children) {
1670 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1671 $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));
… …
1676 1 1846 1
1677} 1847}
1678 1848
1679############################################################################# 1849#############################################################################
1680 1850
1681package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1682 1852
1683our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1684 1854
1685sub new { 1855sub new {
1686 my $class = shift; 1856 my $class = shift;
1687 1857
1688 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1691 ) 1861 )
1692} 1862}
1693 1863
1694############################################################################# 1864#############################################################################
1695 1865
1696package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1697 1867
1698our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1699 1869
1700sub new { 1870sub new {
1701 my $class = shift; 1871 my $class = shift;
1702 1872
1703 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1706 ) 1876 )
1707} 1877}
1708 1878
1709############################################################################# 1879#############################################################################
1710 1880
1711package CFPlus::UI::Label; 1881package DC::UI::Label;
1712 1882
1713our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1714 1884
1715use CFPlus::OpenGL; 1885use DC::OpenGL;
1716 1886
1717sub new { 1887sub new {
1718 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1719 1889
1720 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1725 #text => initial text 1895 #text => initial text
1726 #markup => initial narkup 1896 #markup => initial narkup
1727 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1728 #style => 0, # render flags 1898 #style => 0, # render flags
1729 ellipsise => 3, # end 1899 ellipsise => 3, # end
1730 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1731 fontsize => 1, 1901 fontsize => 1,
1732 align => -1, 1902 align => 0.5,
1733 valign => -1, 1903 valign => 0.5,
1734 padding_x => 2, 1904 padding_x => 4,
1735 padding_y => 2, 1905 padding_y => 2,
1736 can_events => 0, 1906 can_events => 0,
1737 %arg 1907 %arg
1738 ); 1908 );
1739 1909
1740 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1741 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1742 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1743 $self->{template} = $layout; 1913 $self->{template} = $layout;
1744 } 1914 }
1745 1915
1746 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1764 1934
1765 delete $self->{ox}; 1935 delete $self->{ox};
1766 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1767} 1937}
1768 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1769sub set_text { 1945sub set_text {
1770 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1771 1947
1772 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1773 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
… …
1796 1972
1797sub size_request { 1973sub size_request {
1798 my ($self) = @_; 1974 my ($self) = @_;
1799 1975
1800 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1801 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1802 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1803 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1804 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1805 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1806 1984
1807 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1808 1986
1809 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1810 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1811 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1812 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 1991
1814 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1815 1993
1816 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1872 2050
1873 [$self->{layout}->size] 2051 [$self->{layout}->size]
1874 }; 2052 };
1875 2053
1876 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1877 $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);
1878 : $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);
1879 : ($self->{w} - $size->[0]) * 0.5);
1880 2057
1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1883 : ($self->{h} - $size->[1]) * 0.5);
1884 }; 2059 };
1885 2060
1886 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
1887 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
1888 2063# DC::OpenGL::glNewList $self->{list};
1889 $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;
1890} 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#}
1891 2080
1892############################################################################# 2081#############################################################################
1893 2082
1894package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
1895 2084
1896our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
1897 2086
1898use CFPlus::OpenGL; 2087use DC::OpenGL;
1899 2088
1900sub new { 2089sub new {
1901 my $class = shift; 2090 my $class = shift;
1902 2091
1903 $class->SUPER::new ( 2092 $class->SUPER::new (
1904 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1905 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1906 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1907 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1908 can_hover => 1, 2099 can_hover => 1,
1909 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1910 valign => 0, 2102 valign => 0.5,
1911 can_events => 1, 2103 can_events => 1,
1912 ellipsise => 0, 2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1913 #text => ... 2107 #text => ...
1914 #hidden => "*", 2108 #hidden => "*",
1915 @_ 2109 @_
1916 ) 2110 )
1917} 2111}
… …
1962 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1964 2158
1965 my $text = $self->get_text; 2159 my $text = $self->get_text;
1966 2160
1967 if ($uni == 8) { 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
2163 if ($sym == DC::SDLK_BACKSPACE) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
1970 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2172 # what a hack
1976 $self->{cursor} = 0; 2173 $self->{cursor} =
2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2175 ? length $1
2176 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
2178 # uh, again
2179 $self->{cursor} =
2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2181 ? $self->{cursor} + length $1
2182 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2183 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2184 $text = "";
1981 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2187 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2192 } else {
1987 return 0; 2193 return 0;
1988 } 2194 }
1989 2195
… …
2040 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2041 } 2247 }
2042 2248
2043 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2044 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2045 glBegin GL_QUADS;
2046 glVertex 0 , 0;
2047 glVertex 0 , $self->{h};
2048 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2049 glVertex $self->{w}, 0;
2050 glEnd;
2051 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2052 2253
2053 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2054 2255
2055 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
2057 2258
2058 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2059 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2060 utf8::encode $text; 2261 utf8::encode $text;
2061 2262
2062 @$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);
2063 } 2264 }
2064 2265
2266 glColor_premultiply @{$self->{active_fg}};
2065 glBegin GL_LINES; 2267 glBegin GL_LINES;
2066 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};
2067 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};
2068 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;
2069 } 2285 }
2070} 2286}
2071 2287
2072############################################################################# 2288#############################################################################
2073 2289
2074package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2075 2291
2076our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2077 2293
2078use 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
2079 2305
2080sub invoke_key_down { 2306sub invoke_key_down {
2081 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
2082 2308
2083 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
… …
2089 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
2090 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
2091 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
2092 $self->update; 2318 $self->update;
2093 2319
2094 } elsif ($sym == CFPlus::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
2095 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
2096 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
2097 } 2323 }
2098 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
2099 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
2101 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
2102 } 2328 }
2103 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2104 } 2330 }
2105 2331
2106 } elsif ($sym == CFPlus::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
2107 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
2108 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2109 2335
2110 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2111 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2112 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2113 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2114 } 2343 }
2115 2344
2116 } else { 2345 } else {
2117 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2118 } 2347 }
… …
2120 1 2349 1
2121} 2350}
2122 2351
2123############################################################################# 2352#############################################################################
2124 2353
2125package CFPlus::UI::TextEdit; 2354package DC::UI::TextEdit;
2126 2355
2127our @ISA = CFPlus::UI::EntryBase::; 2356our @ISA = DC::UI::EntryBase::;
2128 2357
2129use 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}
2130 2369
2131sub move_cursor_ver { 2370sub move_cursor_ver {
2132 my ($self, $dy) = @_; 2371 my ($self, $dy) = @_;
2133 2372
2134 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2135 2374
2136 $y += $dy; 2375 $line += $dy;
2137 2376
2138 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))) {
2139 $self->{cursor} = $index; 2378 $self->{cursor} = $index;
2140 delete $self->{cur_h}; 2379 delete $self->{cur_h};
2141 $self->update; 2380 $self->update;
2142 return; 2381 return;
2143 } 2382 }
… …
2146sub invoke_key_down { 2385sub invoke_key_down {
2147 my ($self, $ev) = @_; 2386 my ($self, $ev) = @_;
2148 2387
2149 my $sym = $ev->{sym}; 2388 my $sym = $ev->{sym};
2150 2389
2151 if ($sym == CFPlus::SDLK_UP) { 2390 if ($sym == DC::SDLK_UP) {
2152 $self->move_cursor_ver (-1); 2391 $self->move_cursor_ver (-1);
2153 } elsif ($sym == CFPlus::SDLK_DOWN) { 2392 } elsif ($sym == DC::SDLK_DOWN) {
2154 $self->move_cursor_ver (+1); 2393 $self->move_cursor_ver (+1);
2155 } else { 2394 } else {
2156 return $self->SUPER::invoke_key_down ($ev) 2395 return $self->SUPER::invoke_key_down ($ev)
2157 } 2396 }
2158 2397
2159 1 2398 1
2160} 2399}
2161 2400
2162############################################################################# 2401#############################################################################
2163 2402
2164package CFPlus::UI::Button; 2403package DC::UI::ButtonBin;
2165 2404
2166our @ISA = CFPlus::UI::Label::; 2405our @ISA = DC::UI::Bin::;
2167 2406
2168use CFPlus::OpenGL; 2407use DC::OpenGL;
2169 2408
2170my @tex = 2409my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2410 map { new_from_resource DC::Texture $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2411 qw(b1_button_inactive.png b1_button_active.png);
2173 2412
2174sub new { 2413sub new {
2175 my $class = shift; 2414 my $class = shift;
2176 2415
2177 $class->SUPER::new ( 2416 $class->SUPER::new (
2178 padding_x => 4,
2179 padding_y => 4,
2180 fg => [1, 1, 1],
2181 active_fg => [0, 0, 1],
2182 can_hover => 1, 2417 can_hover => 1,
2183 align => 0, 2418 align => 0.5,
2184 valign => 0, 2419 valign => 0.5,
2185 can_events => 1, 2420 can_events => 1,
2186 @_ 2421 @_
2187 ) 2422 )
2188} 2423}
2189 2424
… …
2198} 2433}
2199 2434
2200sub _draw { 2435sub _draw {
2201 my ($self) = @_; 2436 my ($self) = @_;
2202 2437
2203 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2204
2205 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
2208 2441
2442 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2444
2211 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2212 2446
2213 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
2214} 2448}
2215 2449
2216############################################################################# 2450#############################################################################
2217 2451
2218package CFPlus::UI::CheckBox; 2452package DC::UI::Button;
2219 2453
2220our @ISA = CFPlus::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
2221 2457
2222my @tex = 2458my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2459 map { new_from_resource DC::Texture $_, 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_resource DC::Texture $_, mipmap => 1 }
2224 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2225 2514
2226use CFPlus::OpenGL; 2515use DC::OpenGL;
2227 2516
2228sub new { 2517sub new {
2229 my $class = shift; 2518 my $class = shift;
2230 2519
2231 $class->SUPER::new ( 2520 $class->SUPER::new (
… …
2271sub _draw { 2560sub _draw {
2272 my ($self) = @_; 2561 my ($self) = @_;
2273 2562
2274 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2275 2564
2276 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2277 2566
2278 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2279 2568
2280 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;
2281 2570
… …
2288 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2289} 2578}
2290 2579
2291############################################################################# 2580#############################################################################
2292 2581
2293package CFPlus::UI::Image; 2582package DC::UI::Image;
2294 2583
2295our @ISA = CFPlus::UI::Base::; 2584our @ISA = DC::UI::Base::;
2296 2585
2297use CFPlus::OpenGL; 2586use DC::OpenGL;
2298 2587
2299our %texture_cache; 2588our %texture_cache;
2300 2589
2301sub new { 2590sub new {
2302 my $class = shift; 2591 my $class = shift;
2303 2592
2304 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2305 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2306 @_, 2596 @_,
2307 ); 2597 );
2308 2598
2309 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2310 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2311 2601
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2314 2604
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2316 2606
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2608
2319 $self 2609 $self
2320} 2610}
2321 2611
2322sub STORABLE_freeze { 2612sub STORABLE_freeze {
2323 my ($self, $cloning) = @_; 2613 my ($self, $cloning) = @_;
2324 2614
2325 $self->{path} 2615 $self->{path}
2326 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";
2327 2617
2328 $self->{path} 2618 $self->{path}
2329} 2619}
2330 2620
2331sub STORABLE_attach { 2621sub STORABLE_attach {
… …
2335} 2625}
2336 2626
2337sub size_request { 2627sub size_request {
2338 my ($self) = @_; 2628 my ($self) = @_;
2339 2629
2340 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2341} 2631}
2342 2632
2343sub _draw { 2633sub _draw {
2344 my ($self) = @_; 2634 my ($self) = @_;
2345 2635
… …
2355 } 2645 }
2356 2646
2357 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2359 2649
2360 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
2361 2651
2362 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2363} 2653}
2364 2654
2365############################################################################# 2655#############################################################################
2366 2656
2367package CFPlus::UI::ImageButton; 2657package DC::UI::ImageButton;
2368 2658
2369our @ISA = CFPlus::UI::Image::; 2659our @ISA = DC::UI::Image::;
2370 2660
2371use CFPlus::OpenGL; 2661use DC::OpenGL;
2372 2662
2373my %textures; 2663my %textures;
2374 2664
2375sub new { 2665sub new {
2376 my $class = shift; 2666 my $class = shift;
… …
2379 padding_x => 4, 2669 padding_x => 4,
2380 padding_y => 4, 2670 padding_y => 4,
2381 fg => [1, 1, 1], 2671 fg => [1, 1, 1],
2382 active_fg => [0, 0, 1], 2672 active_fg => [0, 0, 1],
2383 can_hover => 1, 2673 can_hover => 1,
2384 align => 0, 2674 align => 0.5,
2385 valign => 0, 2675 valign => 0.5,
2386 can_events => 1, 2676 can_events => 1,
2387 @_ 2677 @_
2388 ); 2678 );
2389} 2679}
2390 2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2391sub invoke_button_up { 2687sub invoke_button_up {
2392 my ($self, $ev, $x, $y) = @_; 2688 my ($self, $ev, $x, $y) = @_;
2393 2689
2394 $self->emit ("activate") 2690 $self->emit ("activate")
2395 if $x >= 0 && $x < $self->{w} 2691 if $x >= 0 && $x < $self->{w}
… …
2398 1 2694 1
2399} 2695}
2400 2696
2401############################################################################# 2697#############################################################################
2402 2698
2403package CFPlus::UI::VGauge; 2699package DC::UI::VGauge;
2404 2700
2405our @ISA = CFPlus::UI::Base::; 2701our @ISA = DC::UI::Base::;
2406 2702
2407use List::Util qw(min max); 2703use List::Util qw(min max);
2408 2704
2409use CFPlus::OpenGL; 2705use DC::OpenGL;
2410 2706
2411my %tex = ( 2707my %tex = (
2412 food => [ 2708 food => [
2413 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
2414 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2415 ], 2711 ],
2416 grace => [ 2712 grace => [
2417 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
2418 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/
2419 ], 2715 ],
2420 hp => [ 2716 hp => [
2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2422 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2423 ], 2719 ],
2424 mana => [ 2720 mana => [
2425 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2426 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/
2427 ], 2723 ],
2428); 2724);
2429 2725
2430# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2533 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2534} 2830}
2535 2831
2536############################################################################# 2832#############################################################################
2537 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
2538package CFPlus::UI::Gauge; 2972package DC::UI::Gauge;
2539 2973
2540our @ISA = CFPlus::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2541 2975
2542sub new { 2976sub new {
2543 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2544 2978
2545 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
2547 can_hover => 1, 2981 can_hover => 1,
2548 can_events => 1, 2982 can_events => 1,
2549 %arg, 2983 %arg,
2550 ); 2984 );
2551 2985
2552 $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");
2553 $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);
2554 $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");
2555 2989
2556 $self 2990 $self
2557} 2991}
2558 2992
2559sub set_fontsize { 2993sub set_fontsize {
… …
2580 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2581} 3015}
2582 3016
2583############################################################################# 3017#############################################################################
2584 3018
2585package CFPlus::UI::Slider; 3019package DC::UI::Slider;
2586 3020
2587use strict; 3021use strict;
2588 3022
2589use CFPlus::OpenGL; 3023use DC::OpenGL;
2590 3024
2591our @ISA = CFPlus::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2592 3026
2593my @tex = 3027my @tex =
2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
2595 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2596 3030
2597sub new { 3031sub new {
2598 my $class = shift; 3032 my $class = shift;
2599 3033
… …
2636sub set_value { 3070sub set_value {
2637 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2638 3072
2639 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2640 3074
2641 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2642 3076
2643 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2644
2645 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2646 $value = $hi - $page if $value > $hi - $page;
2647 3079
2648 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2649 if $unit; 3081 if $unit;
2650 3082
2651 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2667 3099
2668 $self->SUPER::invoke_button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2669 3101
2670 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2671 3103
2672 $self->invoke_mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
3105
3106 1
2673} 3107}
2674 3108
2675sub invoke_mouse_motion { 3109sub invoke_mouse_motion {
2676 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2677 3111
… …
2693sub invoke_mouse_wheel { 3127sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 3128 my ($self, $ev) = @_;
2695 3129
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 3131
3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3133
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 3135
2700 ! ! $delta 3136 1
2701} 3137}
2702 3138
2703sub update { 3139sub update {
2704 my ($self) = @_; 3140 my ($self) = @_;
2705 3141
… …
2711 my ($self) = @_; 3147 my ($self) = @_;
2712 3148
2713 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2714 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2715 3151
2716 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2717 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2718 3154
2719 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};
2720 3156
2721 $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;
2722 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2723 3159
2724 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
… …
2754 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2755} 3191}
2756 3192
2757############################################################################# 3193#############################################################################
2758 3194
2759package CFPlus::UI::ValSlider; 3195package DC::UI::ValSlider;
2760 3196
2761our @ISA = CFPlus::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2762 3198
2763sub new { 3199sub new {
2764 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2765 3201
2766 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2767 3203
2768 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2769 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2770 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2771 to_value => sub { shift }, 3207 to_value => sub { shift },
2772 from_value => sub { shift }, 3208 from_value => sub { shift },
2773 %arg, 3209 %arg,
2774 ); 3210 );
2775 3211
… …
2795sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2796sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2797 3233
2798############################################################################# 3234#############################################################################
2799 3235
2800package CFPlus::UI::TextScroller; 3236package DC::UI::TextScroller;
2801 3237
2802our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2803 3239
2804use CFPlus::OpenGL; 3240use DC::OpenGL;
2805 3241
2806sub new { 3242sub new {
2807 my $class = shift; 3243 my $class = shift;
2808 3244
2809 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
… …
2811 can_events => 1, 3247 can_events => 1,
2812 indent => 0, 3248 indent => 0,
2813 #font => default_font 3249 #font => default_font
2814 @_, 3250 @_,
2815 3251
2816 layout => (new CFPlus::Layout), 3252 layout => (new DC::Layout),
2817 par => [], 3253 par => [],
3254 max_par => 0,
2818 height => 0, 3255 height => 0,
2819 children => [ 3256 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2822 ], 3259 ],
2823 ); 3260 );
2824 3261
2825 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2826 3263
… …
2835} 3272}
2836 3273
2837sub size_request { 3274sub size_request {
2838 my ($self) = @_; 3275 my ($self) = @_;
2839 3276
2840 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
2841 3278
2842 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
2843 $self->SUPER::size_request 3280 $self->SUPER::size_request
2844} 3281}
2845 3282
… …
2882 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2883 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
2884 3321
2885 $layout->set_shapes ( 3322 $layout->set_shapes (
2886 map 3323 map
2887 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2888 @{$para->{widget}} 3325 @{$para->{widget}}
2889 ); 3326 );
2890 3327
2891 $layout 3328 $layout
2892} 3329}
… …
2947 3384
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3385 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3386 push @{$self->{par}}, $para;
2950 } 3387 }
2951 3388
3389 if (my $max = $self->{max_par}) {
3390 shift @{$self->{par}} while @{$self->{par}} > $max;
3391 }
3392
2952 $self->{need_reflow}++; 3393 $self->{need_reflow}++;
2953 $self->update; 3394 $self->update;
2954} 3395}
2955 3396
2956sub scroll_to_bottom { 3397sub scroll_to_bottom {
… …
3005 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3006 $self->force_uptodate; 3447 $self->force_uptodate;
3007 3448
3008 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3009 3450
3010 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3011 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
3012 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
3013 3454
3014 package CFPlus::UI::Base; 3455 package DC::UI::Base;
3015 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3016 (0, 0, $self->{w}, $self->{h}); 3457 (0, 0, $self->{w}, $self->{h});
3017 3458
3018 my $top = int $self->{children}[1]{range}[0]; 3459 my $top = int $self->{children}[1]{range}[0];
3019 3460
… …
3030 3471
3031 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
3032 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
3033 3474
3034 $layout->render ($para->{indent}, $y - $y0); 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
3035 3477
3036 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
3037 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
3038 3480
3039 for (@w) { 3481 for (@w) {
… …
3077 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
3078} 3520}
3079 3521
3080############################################################################# 3522#############################################################################
3081 3523
3082package CFPlus::UI::Animator; 3524package DC::UI::Animator;
3083 3525
3084use CFPlus::OpenGL; 3526use DC::OpenGL;
3085 3527
3086our @ISA = CFPlus::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
3087 3529
3088sub moveto { 3530sub moveto {
3089 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
3090 3532
3091 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3119 glPopMatrix; 3561 glPopMatrix;
3120} 3562}
3121 3563
3122############################################################################# 3564#############################################################################
3123 3565
3124package CFPlus::UI::Flopper; 3566package DC::UI::Flopper;
3125 3567
3126our @ISA = CFPlus::UI::Button::; 3568our @ISA = DC::UI::Button::;
3127 3569
3128sub new { 3570sub new {
3129 my $class = shift; 3571 my $class = shift;
3130 3572
3131 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
… …
3143 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
3144} 3586}
3145 3587
3146############################################################################# 3588#############################################################################
3147 3589
3148package CFPlus::UI::Tooltip; 3590package DC::UI::Tooltip;
3149 3591
3150our @ISA = CFPlus::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
3151 3593
3152use CFPlus::OpenGL; 3594use DC::OpenGL;
3153 3595
3154sub new { 3596sub new {
3155 my $class = shift; 3597 my $class = shift;
3156 3598
3157 $class->SUPER::new ( 3599 $class->SUPER::new (
… …
3161} 3603}
3162 3604
3163sub set_tooltip_from { 3605sub set_tooltip_from {
3164 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
3165 3607
3166 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3167 if $widget->{tooltip} =~ /^#(.*)$/;
3168
3169 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 =~ /^#(.*)$/;
3170 3613
3171 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
3172 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
3173 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3174 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
3175 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
3176 } 3619 }
3177 3620
3178 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
3179 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
3180 3623
3181 $self->add (new CFPlus::UI::Label 3624 $self->add (new DC::UI::Label
3182 markup => $tooltip, 3625 markup => $tip,
3183 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
3184 fontsize => 0.8, 3628 fontsize => 0.8,
3185 style => 1, # FLAG_INVERSE 3629 style => 1, # FLAG_INVERSE
3186 ellipsise => 0, 3630 ellipsise => 0,
3187 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
3188 ); 3632 );
… …
3225} 3669}
3226 3670
3227sub _draw { 3671sub _draw {
3228 my ($self) = @_; 3672 my ($self) = @_;
3229 3673
3230 glTranslate 0.375, 0.375;
3231
3232 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
3233 3675
3234 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
3235 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
3236 glVertex 0 , 0;
3237 glVertex 0 , $h;
3238 glVertex $w, $h;
3239 glVertex $w, 0;
3240 glEnd;
3241 3678
3242 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
3243 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
3244 glVertex 0 , 0;
3245 glVertex 0 , $h;
3246 glVertex $w, $h;
3247 glVertex $w, 0;
3248 glEnd;
3249 3681
3250 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
3251 3683
3252 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
3253} 3685}
3254 3686
3255############################################################################# 3687#############################################################################
3256 3688
3257package CFPlus::UI::Face; 3689package DC::UI::Face;
3258 3690
3259our @ISA = CFPlus::UI::DrawBG::; 3691our @ISA = DC::UI::DrawBG::;
3260 3692
3261use CFPlus::OpenGL; 3693use DC::OpenGL;
3262 3694
3263sub new { 3695sub new {
3264 my $class = shift; 3696 my $class = shift;
3265 3697
3266 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3699 size_w => 32,
3700 size_h => 8,
3267 aspect => 1, 3701 aspect => 1,
3268 can_events => 0, 3702 can_events => 0,
3269 @_, 3703 @_,
3270 ); 3704 );
3271 3705
3272 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
3274 3708
3275 $self->{timer} = Event->timer ( 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3277 hard => 1, 3711 return unless $::CONN;
3278 interval => $self->{animspeed}, 3712
3279 cb => sub { 3713 my $w = $widget
3714 or return;
3715
3280 ++$widget->{frame}; 3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
3281 $widget->update; 3720 $w->update;
3282 }, 3721 $w->update_timer;
3283 ); 3722 };
3723
3724 $self->update_face;
3725 $self->update_timer;
3284 } 3726 }
3285 3727
3286 $self 3728 $self
3287} 3729}
3288 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
3743sub update_face {
3744 my ($self) = @_;
3745
3746 if ($::CONN) {
3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3748 if ($anim && @$anim) {
3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3750 delete $self->{face_change_cb};
3751
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 }
3756 }
3757 }
3758 }
3759 }
3760}
3761
3289sub size_request { 3762sub size_request {
3290 (32, 8) 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 }
3778
3779 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3780}
3292 3781
3293sub update { 3782sub update {
3294 my ($self) = @_; 3783 my ($self) = @_;
3295 3784
3296 return unless $self->{visible}; 3785 return unless $self->{visible};
3297 3786
3298 $self->SUPER::update; 3787 $self->SUPER::update;
3299} 3788}
3300 3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
3301sub _draw { 3798sub _draw {
3302 my ($self) = @_; 3799 my ($self) = @_;
3303 3800
3304 return unless $::CONN;
3305
3306 $self->SUPER::_draw; 3801 $self->SUPER::_draw;
3307 3802
3308 my $face; 3803 if (my $tex = $self->{tex}) {
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}];
3312
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3318
3319 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3806 glColor 0, 0, 0, 1;
3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
… …
3326} 3810}
3327 3811
3328sub destroy { 3812sub destroy {
3329 my ($self) = @_; 3813 my ($self) = @_;
3330 3814
3331 $self->{timer}->cancel 3815 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3816 if $self->{timer};
3333 3817
3334 $self->SUPER::destroy; 3818 $self->SUPER::destroy;
3335} 3819}
3336 3820
3337############################################################################# 3821#############################################################################
3338 3822
3339package CFPlus::UI::Buttonbar; 3823package DC::UI::Buttonbar;
3340 3824
3341our @ISA = CFPlus::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
3342 3826
3343# TODO: should actually wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
3344 3828
3345############################################################################# 3829#############################################################################
3346 3830
3347package CFPlus::UI::Menu; 3831package DC::UI::Menu;
3348 3832
3349our @ISA = CFPlus::UI::Toplevel::; 3833our @ISA = DC::UI::Toplevel::;
3350 3834
3351use CFPlus::OpenGL; 3835use DC::OpenGL;
3352 3836
3353sub new { 3837sub new {
3354 my $class = shift; 3838 my $class = shift;
3355 3839
3356 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3357 items => [], 3841 items => [],
3358 z => 100, 3842 z => 100,
3359 @_, 3843 @_,
3360 ); 3844 );
3361 3845
3362 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
3363 3847
3364 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
3365 my ($widget, $cb, $tooltip) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
3366 3850
3367 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
3368 if (!ref $widget) { 3852 if (!ref $widget) {
3369 if ($widget =~ /\t/) { 3853 if ($widget =~ /\t/) {
3370 my ($left, $right) = split /\t/, $widget, 2; 3854 my ($left, $right) = split /\t/, $widget, 2;
3371 3855
3372 $widget = new CFPlus::UI::HBox 3856 $widget = new DC::UI::HBox
3373 can_hover => 1, 3857 can_hover => 1,
3374 can_events => 1, 3858 can_events => 1,
3375 tooltip => $tooltip, 3859 tooltip => $tooltip,
3376 children => [ 3860 children => [
3377 (new CFPlus::UI::Label markup => $left, expand => 1), 3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3378 (new CFPlus::UI::Label markup => $right, align => +1), 3862 (new DC::UI::Label markup => $right, align => 1),
3379 ], 3863 ],
3380 ; 3864 ;
3381 3865
3382 } else { 3866 } else {
3383 $widget = new CFPlus::UI::Label 3867 $widget = new DC::UI::Label
3384 can_hover => 1, 3868 can_hover => 1,
3385 can_events => 1, 3869 can_events => 1,
3870 align => 0,
3386 markup => $widget, 3871 markup => $widget,
3387 tooltip => $tooltip; 3872 tooltip => $tooltip;
3388 } 3873 }
3389 } 3874 }
3390 3875
… …
3436 1 3921 1
3437} 3922}
3438 3923
3439############################################################################# 3924#############################################################################
3440 3925
3441package CFPlus::UI::Multiplexer; 3926package DC::UI::Multiplexer;
3442 3927
3443our @ISA = CFPlus::UI::Container::; 3928our @ISA = DC::UI::Container::;
3444 3929
3445sub new { 3930sub new {
3446 my $class = shift; 3931 my $class = shift;
3447 3932
3448 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
… …
3509 $self->{current}->draw; 3994 $self->{current}->draw;
3510} 3995}
3511 3996
3512############################################################################# 3997#############################################################################
3513 3998
3514package CFPlus::UI::Notebook; 3999package DC::UI::Notebook;
3515 4000
4001use DC::OpenGL;
4002
3516our @ISA = CFPlus::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3517 4004
3518sub new { 4005sub new {
3519 my $class = shift; 4006 my $class = shift;
3520 4007
3521 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3522 buttonbar => (new CFPlus::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3523 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3524 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3525 @_, 4013 @_,
3526 ); 4014 );
3527 4015
3528 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3529 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3530 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
3531 $self 4053 $self
3532} 4054}
3533 4055
3534sub 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 {
3535 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3536 4087
3537 Scalar::Util::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3538 4090
3539 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title,
3541 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) },
3543 );
3544
3545 $self->{multiplexer}->add ($widget); 4091 $self->add ($widget);
3546} 4092}
3547 4093
3548sub get_current_page { 4094sub get_current_page {
3549 my ($self) = @_; 4095 my ($self) = @_;
3550 4096
… …
3556 4102
3557 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3558 $self->emit (page_changed => $self->{multiplexer}{current}); 4104 $self->emit (page_changed => $self->{multiplexer}{current});
3559} 4105}
3560 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
3561############################################################################# 4127#############################################################################
3562 4128
3563package CFPlus::UI::Selector; 4129package DC::UI::Selector;
3564 4130
3565use utf8; 4131use utf8;
3566 4132
3567our @ISA = CFPlus::UI::Button::; 4133our @ISA = DC::UI::Button::;
3568 4134
3569sub new { 4135sub new {
3570 my $class = shift; 4136 my $class = shift;
3571 4137
3572 my $self = $class->SUPER::new ( 4138 my $self = $class->SUPER::new (
… …
3589 my ($value, $title, $tooltip) = @$_; 4155 my ($value, $title, $tooltip) = @$_;
3590 4156
3591 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3592 } 4158 }
3593 4159
3594 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3595} 4161}
3596 4162
3597sub _set_value { 4163sub _set_value {
3598 my ($self, $value) = @_; 4164 my ($self, $value) = @_;
3599 4165
3600 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
3601 or return; 4168 or return;
3602 4169
3603 $self->{value} = $item->[0]; 4170 $self->{value} = $item->[0];
3604 $self->set_markup ("$item->[1] ⇓"); 4171 $self->set_markup ("$item->[1] ⇓");
3605 $self->set_tooltip ($item->[2]); 4172# $self->set_tooltip ($item->[2]);
3606} 4173}
3607 4174
3608sub set_value { 4175sub set_value {
3609 my ($self, $value) = @_; 4176 my ($self, $value) = @_;
3610 4177
… …
3612 4179
3613 $self->_set_value ($value); 4180 $self->_set_value ($value);
3614 $self->emit (changed => $value); 4181 $self->emit (changed => $value);
3615} 4182}
3616 4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
3617############################################################################# 4191#############################################################################
3618 4192
3619package CFPlus::UI::Statusbox; 4193package DC::UI::Statusbox;
3620 4194
3621our @ISA = CFPlus::UI::VBox::; 4195our @ISA = DC::UI::VBox::;
3622 4196
3623sub new { 4197sub new {
3624 my $class = shift; 4198 my $class = shift;
3625 4199
3626 my $self = $class->SUPER::new ( 4200 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 4201 fontsize => 0.8,
3628 @_, 4202 @_,
3629 ); 4203 );
3630 4204
3631 Scalar::Util::weaken (my $this = $self); 4205 DC::weaken (my $this = $self);
3632 4206
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3634 4208
3635 $self 4209 $self
3636} 4210}
3637 4211
3638sub reorder { 4212sub reorder {
3639 my ($self) = @_; 4213 my ($self) = @_;
3640 my $NOW = Time::HiRes::time; 4214 my $NOW = Time::HiRes::time;
3641 4215
3642 # freeze display when hovering over any label 4216 # freeze display when hovering over any label
3643 return if $CFPlus::UI::TOOLTIP->{owner} 4217 return if $DC::UI::TOOLTIP->{owner}
3644 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3645 values %{ $self->{item} }; 4219 values %{ $self->{item} };
3646 4220
3647 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3648 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3649 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3650 4226
3651 my @widgets; 4227 my @widgets;
3652 4228
3653 my @items = sort { 4229 my @items = sort {
3654 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
3655 or $b->{id} <=> $a->{id} 4231 or $b->{id} <=> $a->{id}
3656 } values %{ $self->{item} }; 4232 } values %{ $self->{item} };
3657
3658 $self->{timer}->interval (1);
3659 4233
3660 my $count = 10 + 1; 4234 my $count = 10 + 1;
3661 for my $item (@items) { 4235 for my $item (@items) {
3662 last unless --$count; 4236 last unless --$count;
3663 4237
… …
3670 for ($short) { 4244 for ($short) {
3671 s/^\s+//; 4245 s/^\s+//;
3672 s/\s+/ /g; 4246 s/\s+/ /g;
3673 } 4247 }
3674 4248
3675 new CFPlus::UI::Label 4249 new DC::UI::Label
3676 markup => $short, 4250 markup => $short,
3677 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3678 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3679 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3680 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3681 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3682 fg => [@{ $item->{fg} }], 4257 fg => [@{ $item->{fg} }],
3683 can_events => 1, 4258 can_events => 1,
3684 can_hover => 1 4259 can_hover => 1
3685 }; 4260 };
3686 4261
3687 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3688 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3689 $label->update; 4264 $label->update;
3690 $label->set_max_size (undef, $label->{req_h} * $diff) 4265 $label->set_max_size (undef, $label->{req_h} * $diff)
3691 if $diff < 1; 4266 if $diff < 1;
3692 $self->{timer}->interval (1/30); 4267 $self->{timer}->set (1/30, 1/30);
3693 } else { 4268 } else {
3694 $label->{fg}[3] = $item->{fg}[3] || 1; 4269 $label->{fg}[3] = $item->{fg}[3] || 1;
3695 } 4270 }
3696 4271
3697 push @widgets, $label; 4272 push @widgets, $label;
… …
3759 $self->SUPER::destroy; 4334 $self->SUPER::destroy;
3760} 4335}
3761 4336
3762############################################################################# 4337#############################################################################
3763 4338
3764package CFPlus::UI::Root; 4339package DC::UI::Root;
3765 4340
3766our @ISA = CFPlus::UI::Container::; 4341our @ISA = DC::UI::Container::;
3767 4342
3768use List::Util qw(min max); 4343use List::Util qw(min max);
3769 4344
3770use CFPlus::OpenGL; 4345use DC::OpenGL;
3771 4346
3772sub new { 4347sub new {
3773 my $class = shift; 4348 my $class = shift;
3774 4349
3775 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
3776 visible => 1, 4351 visible => 1,
3777 @_, 4352 @_,
3778 ); 4353 );
3779 4354
3780 Scalar::Util::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
3781 4356
3782 $self 4357 $self
3783} 4358}
3784 4359
3785sub size_request { 4360sub size_request {
… …
3833} 4408}
3834 4409
3835sub update { 4410sub update {
3836 my ($self) = @_; 4411 my ($self) = @_;
3837 4412
3838 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
3839} 4414}
3840 4415
3841sub add { 4416sub add {
3842 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
3843 4418
… …
3880 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
3881 $_->() 4456 $_->()
3882 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
3883 } 4458 }
3884 4459
3885 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
3886 my %queue; 4461 my %queue;
3887 my @queue; 4462 my @queue;
3888 my $widget; 4463 my $widget;
3889 4464
3890 outer: 4465 outer:
… …
3910 4485
3911 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
3912 4487
3913 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
3914 4489
3915 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
3916 $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;
3917 4495
3918 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3919 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3920 4498
3921 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3937 } 4515 }
3938 } 4516 }
3939 4517
3940 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
3941 } 4519 }
3942 }
3943 4520
3944 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
3945 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
3946 values %$size_alloc; 4523 values %$size_alloc;
3947 4524
3948 while () { 4525 while () {
3949 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
3950 4527
3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3952 4529
3953 $w = 0 if $w < 0;
3954 $h = 0 if $h < 0;
3955
3956 $w = max $widget->{min_w}, $w; 4530 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h; 4531 $h = max $widget->{min_h}, $h;
3958 4532
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961 4535
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964 4538
3965 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
3966 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
3967 4541
3968 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}) {
3969 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
3970 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
3971 4545
3972 $widget->{w} = $w; 4546 $widget->{w} = $w;
3973 $widget->{h} = $h; 4547 $widget->{h} = $h;
3974 4548
3975 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
3976 } 4551 }
3977 } 4552 }
3978 } 4553 }
3979 4554
3980 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
3981 $_->() 4556 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4557 for values %{delete $self->{post_alloc_hook}};
3983 } 4558 }
3984
3985 4559
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
3989 4563
… …
3992 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3993 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
3994 glLoadIdentity; 4568 glLoadIdentity;
3995 4569
3996 { 4570 {
3997 package CFPlus::UI::Base; 4571 package DC::UI::Base;
3998 4572
3999 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4000 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
4001 4575
4002 $self->_draw; 4576 $self->_draw;
4003 } 4577 }
4004} 4578}
4005 4579
4006############################################################################# 4580#############################################################################
4007 4581
4008package CFPlus::UI; 4582package DC::UI;
4009 4583
4010$ROOT = new CFPlus::UI::Root; 4584$ROOT = new DC::UI::Root;
4011$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
4012 4586
40131 45871
4014 4588

Diff Legend

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