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.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.470 by root, Fri Sep 19 02:24:32 2008 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use DC;
10use CFPlus::Pod; 9use DC::Pod;
11use CFPlus::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
210 reconfigure_widgets; 211 reconfigure_widgets;
211} 212}
212 213
213############################################################################# 214#############################################################################
214 215
215package CFPlus::UI::Event; 216package DC::UI::Event;
216 217
217sub xy { 218sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 220}
220 221
221############################################################################# 222#############################################################################
222 223
223package CFPlus::UI::Base; 224package DC::UI::Base;
224 225
225use strict; 226use strict;
226 227
227use CFPlus::OpenGL; 228use DC::OpenGL;
228 229
229sub new { 230sub new {
230 my $class = shift; 231 my $class = shift;
231 232
232 my $self = bless { 233 my $self = bless {
237 h => undef, 238 h => undef,
238 can_events => 1, 239 can_events => 1,
239 @_ 240 @_
240 }, $class; 241 }, $class;
241 242
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 244
244 for (keys %$self) { 245 for (keys %$self) {
245 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
247 } 248 }
248 } 249 }
249 250
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 256
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 259
259 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
280 return if $self->{parent}; 281 return if $self->{parent};
281 282
282 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
283} 284}
284 285
285sub set_visible { 286sub set_visible {
286 my ($self) = @_; 287 my ($self) = @_;
287 288
292 293
293 $self->emit (visibility_change => 1); 294 $self->emit (visibility_change => 1);
294 295
295 $self->realloc if !exists $self->{req_w}; 296 $self->realloc if !exists $self->{req_w};
296 297
297 $_->set_visible for $self->children; 298 $_->set_visible for $self->visible_children;
298} 299}
299 300
300sub set_invisible { 301sub set_invisible {
301 my ($self) = @_; 302 my ($self) = @_;
302 303
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
320sub set_visibility { 321sub set_visibility {
321 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
322 323
323 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
324 325
325 $visible ? $self->hide 326 $visible ? $self->show
326 : $self->show; 327 : $self->hide;
327} 328}
328 329
329sub toggle_visibility { 330sub toggle_visibility {
330 my ($self) = @_; 331 my ($self) = @_;
331 332
337sub hide { 338sub hide {
338 my ($self) = @_; 339 my ($self) = @_;
339 340
340 $self->set_invisible; 341 $self->set_invisible;
341 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 346 $parent->remove ($self);
343 if $self->{parent}; 347 }
344} 348}
345 349
346sub move_abs { 350sub move_abs {
347 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
348 352
360 $self->{force_h} = $h; 364 $self->{force_h} = $h;
361 365
362 $self->realloc; 366 $self->realloc;
363} 367}
364 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
365sub size_request { 387sub size_request {
366 require Carp; 388 require Carp;
367 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
368} 390}
369 391
375 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
376 398
377 if ($self->{aspect}) { 399 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
379 401
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 404
383 # use alignment to adjust x, y 405 # use alignment to adjust x, y
384 406
385 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
427 449
428 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
429 451
430 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
431 453
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 457 }
436} 458}
437 459
438# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
439sub coord2local { 461sub coord2local {
440 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
441 463
442 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
443 465
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 467}
446 468
447# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
448sub coord2global { 470sub coord2global {
449 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
450 472
451 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
452 474
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 476}
455 477
456sub invoke_focus_in { 478sub invoke_focus_in {
505sub connect { 527sub connect {
506 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
507 529
508 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
509 531
510 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
513 } 535 }
514} 536}
515 537
547 569
548 # parent 570 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 572}
551 573
552sub find_widget { 574#sub find_widget {
553 my ($self, $x, $y) = @_; 575# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 576
564sub set_parent { 577sub set_parent {
565 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
566 579
567 CFPlus::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
569} 582}
570 583
571sub realloc { 584sub realloc {
572 my ($self) = @_; 585 my ($self) = @_;
598 611
599# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 613# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 615
603sub draw { 616#sub draw {
604 my ($self) = @_; 617#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 618
650sub _draw { 619sub _draw {
651 my ($self) = @_; 620 my ($self) = @_;
652 621
653 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
654} 623}
655 624
656my $cntx;#d#
657sub DESTROY { 625sub DESTROY {
658 my ($self) = @_; 626 my ($self) = @_;
659 627
660 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
661 629
630 local $@;
662 eval { $self->destroy }; 631 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 633
665 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
666} 635}
667 636
668############################################################################# 637#############################################################################
669 638
670package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
671 640
672our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
673 642
674use strict; 643use strict;
675use CFPlus::OpenGL; 644use DC::OpenGL;
676 645
677sub new { 646sub new {
678 my $class = shift; 647 my $class = shift;
679
680 # range [value, low, high, page]
681 648
682 $class->SUPER::new ( 649 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
685 @_ 652 @_
697 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
698 665
699 glEnable GL_BLEND; 666 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 668 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 670 glDisable GL_BLEND;
711 } 671 }
712} 672}
713 673
714############################################################################# 674#############################################################################
715 675
716package CFPlus::UI::Empty; 676package DC::UI::Empty;
717 677
718our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
719 679
720sub new { 680sub new {
721 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
723} 683}
730 690
731sub draw { } 691sub draw { }
732 692
733############################################################################# 693#############################################################################
734 694
735package CFPlus::UI::Container; 695package DC::UI::Container;
736 696
737our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
738 698
739sub new { 699sub new {
740 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
741 701
742 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
746 can_events => 0, 706 can_events => 0,
747 %arg, 707 %arg,
748 ); 708 );
749 709
750 $self->add (@$children) 710 $self->add (@$children)
751 if $children; 711 if $children && @$children;
752 712
753 $self 713 $self
754} 714}
755 715
756sub realloc { 716sub realloc {
765 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
766 726
767 $_->set_parent ($self) 727 $_->set_parent ($self)
768 for @widgets; 728 for @widgets;
769 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 731 use sort 'stable';
771 732
772 $self->{children} = [ 733 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
775 ]; 736 ];
776 737
777 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
778} 743}
779 744
780sub children { 745sub children {
781 @{ $_[0]{children} } 746 @{ $_[0]{children} }
782} 747}
783 748
784sub remove { 749sub remove {
785 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
786 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
787 delete $child->{parent}; 755 delete $child->{parent};
788 $child->hide; 756 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
791 759
792 $self->realloc; 760 $self->realloc;
793} 761}
794 762
795sub clear { 763sub clear {
796 my ($self) = @_; 764 my ($self) = @_;
797 765
798 my $children = delete $self->{children}; 766 my $children = $self->{children};
799 $self->{children} = []; 767 $self->{children} = [];
800 768
801 for (@$children) { 769 for (@$children) {
802 delete $_->{parent}; 770 delete $_->{parent};
803 $_->hide; 771 $_->hide;
823} 791}
824 792
825sub _draw { 793sub _draw {
826 my ($self) = @_; 794 my ($self) = @_;
827 795
828 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
829} 797}
830 798
831############################################################################# 799#############################################################################
832 800
833package CFPlus::UI::Bin; 801package DC::UI::Bin;
834 802
835our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
836 804
837sub new { 805sub new {
838 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
839 807
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 809
842 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
843} 811}
844 812
845sub add { 813sub add {
846 my ($self, $child) = @_; 814 my ($self, $child) = @_;
847 815
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
849 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
850} 818}
851 819
852sub remove { 820sub remove {
853 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
854 822
855 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
856 824
857 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 826 unless @{$self->{children}};
859} 827}
860 828
861sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
862 830
871 839
872 1 840 1
873} 841}
874 842
875############################################################################# 843#############################################################################
876
877# back-buffered drawing area 844# back-buffered drawing area
878 845
879package CFPlus::UI::Window; 846package DC::UI::Window;
880 847
881our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
882 849
883use CFPlus::OpenGL; 850use DC::OpenGL;
884 851
885sub new { 852sub new {
886 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
887 854
888 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
910} 877}
911 878
912sub render_child { 879sub render_child {
913 my ($self) = @_; 880 my ($self) = @_;
914 881
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
918 885
919 { 886 {
920 package CFPlus::UI::Base; 887 package DC::UI::Base;
921 888
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
924 891
925 $self->_render; 892 $self->_render;
942 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
943} 910}
944 911
945############################################################################# 912#############################################################################
946 913
947package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
948 915
916use List::Util qw(min max);
917
949our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
950 919
951sub new { 920sub new {
952 my $class = shift; 921 my $class = shift;
953 922
954 $class->SUPER::new ( 923 $class->SUPER::new (
961sub size_request { 930sub size_request {
962 my ($self) = @_; 931 my ($self) = @_;
963 932
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 934
966 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
968 937
969 ($w, $h) 938 ($w, $h)
970} 939}
971 940
972sub invoke_size_allocate { 941sub invoke_size_allocate {
984} 953}
985 954
986sub set_offset { 955sub set_offset {
987 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
988 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}) {
989 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
991 964
965 $self->emit (changed => $x, $y);
992 $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 }
993} 986}
994 987
995# 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
996sub coord2local { 989sub coord2local {
997 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
1012 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1013 1006
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1009 ) {
1017 $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})
1018 } else { 1011 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1020 } 1013 }
1021} 1014}
1022 1015
1023sub _render { 1016sub _render {
1024 my ($self) = @_; 1017 my ($self) = @_;
1025 1018
1026 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};
1027 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};
1028 1021
1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1030 1023
1031 $self->SUPER::_render; 1024 $self->SUPER::_render;
1032} 1025}
1033 1026
1034############################################################################# 1027#############################################################################
1035 1028
1036package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1037 1030
1038our @ISA = CFPlus::UI::HBox::; 1031our @ISA = DC::UI::Table::;
1039 1032
1040sub new { 1033sub new {
1041 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1042 1035
1043 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1044 1037
1045 my $self; 1038 my $self;
1046 1039
1047 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,
1048 vertical => 1, 1054 vertical => 1,
1049 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1056 on_changed => sub {
1051 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1059 },
1053 ; 1060 ;
1054 1061
1055 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
1056 vp => (new CFPlus::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1057 can_events => 1, 1065 can_events => 1,
1058 slider => $slider, 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
1059 %arg, 1070 %arg,
1060 ); 1071 );
1061 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
1062 $self->SUPER::add ($self->{vp}, $self->{slider}); 1094 $self->SUPER::add ($self->{vp});
1095
1063 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1064 1097
1065 $self 1098 $self
1066} 1099}
1067
1068#TODO# update range on size_allocate depending on child
1069 1100
1070sub add { 1101sub add {
1071 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1072 1103
1073 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1074} 1105}
1075 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
1076sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1078 1161
1079 return 0 unless $ev->{dy}; # only vertical movements
1080
1081 $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};
1082 1164
1083 1 1165 1
1084} 1166}
1085 1167
1086sub update_slider { 1168sub invoke_button_down {
1087 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1088 1170
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1171 if ($ev->{button} == 2) {
1090} 1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1091 1175
1092sub update { 1176 0
1093 my ($self) = @_; 1177}
1094 1178
1095 $self->SUPER::update; 1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1096 1181
1097 $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
1098} 1198}
1099 1199
1100sub invoke_size_allocate { 1200sub invoke_size_allocate {
1101 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1102 1202
1103 $self->update_slider; 1203 $self->update_slider;
1104
1105 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1106} 1205}
1107 1206
1108############################################################################# 1207#############################################################################
1109 1208
1110package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1111 1210
1112our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1113 1212
1114use CFPlus::OpenGL; 1213use DC::OpenGL;
1115 1214
1116sub new { 1215sub new {
1117 my $class = shift; 1216 my $class = shift;
1118 1217
1119 $class->SUPER::new ( 1218 $class->SUPER::new (
1129 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1130 1229
1131 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1132 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1133 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1134
1135 glBegin GL_QUADS;
1136 glVertex 0 , 0;
1137 glVertex 0 , $h;
1138 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1139 glVertex $w, 0;
1140 glEnd;
1141
1142 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1143 } 1235 }
1144 1236
1145 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1146} 1238}
1147 1239
1148############################################################################# 1240#############################################################################
1149 1241
1150package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1151 1243
1152our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1153 1245
1154use CFPlus::OpenGL; 1246use DC::OpenGL;
1155 1247
1156sub new { 1248sub new {
1157 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1158 1250
1159 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1160 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1161 align => 1, 1253 align => 1,
1162 valign => 0, 1254 valign => 0.5,
1163 text => $arg{label}, 1255 text => $arg{label},
1164 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1165 } 1257 }
1166 1258
1167 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
1168 # label => "", 1260 # label => "",
1169 fg => [0.6, 0.3, 0.1], 1261 fg => undef,
1170 border => 0.8, 1262 border => 0.8,
1171 style => 'single', 1263 style => 'single',
1172 %arg, 1264 %arg,
1173 ); 1265 );
1174 1266
1177 1269
1178sub add { 1270sub add {
1179 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1180 1272
1181 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1183} 1275}
1184 1276
1185sub border { 1277sub border {
1186 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1187} 1279}
1227 my $border = $self->border; 1319 my $border = $self->border;
1228 my ($w, $h) = ($self->{w}, $self->{h}); 1320 my ($w, $h) = ($self->{w}, $self->{h});
1229 1321
1230 $child->draw; 1322 $child->draw;
1231 1323
1232 glColor @{$self->{fg}}; 1324 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1233 glBegin GL_LINE_STRIP; 1325 glBegin GL_LINE_STRIP;
1234 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1326 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1235 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1236 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1237 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1329 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1245 } 1337 }
1246} 1338}
1247 1339
1248############################################################################# 1340#############################################################################
1249 1341
1250package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1251 1343
1252our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1253 1345
1254use CFPlus::OpenGL; 1346use DC::OpenGL;
1255 1347
1256my $bg = 1348my $bg =
1257 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_resource DC::Texture "d1_bg.png",
1258 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1259 1351
1260my @border = 1352my @border =
1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_resource DC::Texture $_, mipmap => 1 }
1262 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);
1263 1359
1264sub new { 1360sub new {
1265 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1266 1362
1267 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1268 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1269 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1270 border => 0.6, 1366 border => 0.8,
1271 can_events => 1, 1367 can_events => 1,
1272 min_w => 64, 1368 min_w => 64,
1273 min_h => 32, 1369 min_h => 32,
1274 %arg, 1370 %arg,
1275 ); 1371 );
1276 1372
1277 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1278 align => 0, 1374 align => 0.5,
1279 valign => 1, 1375 valign => 1,
1280 text => $self->{title}, 1376 text => $self->{title},
1281 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1282 if exists $self->{title}; 1378 if exists $self->{title};
1283 1379
1284 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1285 $self->{close_button} = 1381 $self->{close_button} =
1286 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1287 path => 'x1_close.png', 1383 path => 'x1_close.png',
1288 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1289 1385
1290 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1291 } 1387 }
1292 1388
1293 $self 1389 $self
1294} 1390}
1295 1391
1296sub add { 1392sub add {
1297 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1298 1394
1299 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1300 $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};
1301 $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};
1302} 1398}
1303 1399
1304sub border { 1400sub border {
1305 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
1306} 1411}
1307 1412
1308sub size_request { 1413sub size_request {
1309 my ($self) = @_; 1414 my ($self) = @_;
1310 1415
1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1437 1542
1438 my $border = $self->border; 1543 my $border = $self->border;
1439 1544
1440 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1441 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1442 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1443 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1444 $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);
1445 1564
1446 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1447 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1448 1567
1449 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
1468 if $self->{close_button}; 1587 if $self->{close_button};
1469} 1588}
1470 1589
1471############################################################################# 1590#############################################################################
1472 1591
1473package CFPlus::UI::Table; 1592package DC::UI::Table;
1474 1593
1475our @ISA = CFPlus::UI::Base::; 1594our @ISA = DC::UI::Container::;
1476 1595
1477use List::Util qw(max sum); 1596use List::Util qw(max sum);
1478 1597
1479use CFPlus::OpenGL; 1598use DC::OpenGL;
1480 1599
1481sub new { 1600sub new {
1482 my $class = shift; 1601 my $class = shift;
1483 1602
1484 $class->SUPER::new ( 1603 $class->SUPER::new (
1485 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
1486 @_, 1606 @_,
1487 ) 1607 )
1488} 1608}
1489 1609
1490sub children {
1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1492}
1493
1494sub 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 {
1495 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1496 1625
1497 while (@_) { 1626 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1499 $child->set_parent ($self);
1500 $self->{children}[$y][$x] = $child;
1501 }
1502 1628
1503 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1504 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1505 $self->realloc;
1506}
1507 1631
1508sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1509 my ($self, $child) = @_; 1639 my ($self) = @_;
1510 1640
1511 # TODO: not yet implemented 1641 my (@w, @h);
1512}
1513
1514# TODO: move to container class maybe? send children a signal on removal?
1515sub clear {
1516 my ($self) = @_;
1517 1642
1518 my @children = $self->children; 1643 my @children = $self->children;
1519 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 }
1520 1654 }
1521 for (@children) {
1522 delete $_->{parent};
1523 $_->hide;
1524 }
1525 1655
1526 $self->realloc; 1656 # second pass, rows
1527} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1528
1529sub get_wh {
1530 my ($self) = @_;
1531
1532 my (@w, @h);
1533
1534 for my $y (0 .. $#{$self->{children}}) {
1535 my $row = $self->{children}[$y]
1536 or next;
1537
1538 for my $x (0 .. $#$row) {
1539 my $widget = $row->[$x]
1540 or next;
1541 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1542 1659
1543 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1544 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1545 } 1664 }
1546 } 1665 }
1547 1666
1548 (\@w, \@h) 1667 (\@w, \@h)
1549} 1668}
1565 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1566 1685
1567 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1568 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1569 1688
1570 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
1571 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1572 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1573 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1574 1693
1575 # linearly scale sizes
1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1578 1695
1579 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
1580 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1581 1705
1582 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1583 1708
1584 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1585 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)};
1586 or next;
1587 1711
1588 my $x = 0; 1712 $widget->configure (
1589 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1590 1715 );
1591 for my $c (0 .. $#$row) { 1716 }
1592 my $col_w = $ws->[$c];
1593 1717
1594 if (my $widget = $row->[$c]) { 1718 1
1595 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1596 }
1597 1720
1598 $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};
1599 } 1748 }
1749 }
1600 1750
1601 $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});
1602 } 1782 }
1603 1783
1604 1 1784 1
1605} 1785}
1606 1786
1607sub find_widget {
1608 my ($self, $x, $y) = @_;
1609
1610 $x -= $self->{x};
1611 $y -= $self->{y};
1612
1613 my $res;
1614
1615 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1616 $res = $_->find_widget ($x, $y)
1617 and return $res;
1618 }
1619
1620 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1621}
1622
1623sub _draw {
1624 my ($self) = @_;
1625
1626 for (grep $_, @{$self->{children}}) {
1627 $_->draw for grep $_, @$_;
1628 }
1629}
1630
1631############################################################################# 1787#############################################################################
1632 1788
1633package CFPlus::UI::Box; 1789package DC::UI::Box;
1634 1790
1635our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1636 1792
1637sub size_request { 1793sub size_request {
1638 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1639 1797
1640 $self->{vertical} 1798 $self->{vertical}
1641 ? ( 1799 ? (
1642 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1643 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1644 ) 1802 )
1645 : ( 1803 : (
1646 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1647 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1648 ) 1806 )
1649} 1807}
1650 1808
1651sub invoke_size_allocate { 1809sub invoke_size_allocate {
1652 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
1673 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1674 for 0 .. $#children; 1832 for 0 .. $#children;
1675 } 1833 }
1676 } 1834 }
1677 1835
1678 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1679 1837
1680 my $pos = 0; 1838 my $pos = 0;
1681 for (0 .. $#children) { 1839 for (0 .. $#children) {
1682 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1683 $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));
1688 1 1846 1
1689} 1847}
1690 1848
1691############################################################################# 1849#############################################################################
1692 1850
1693package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1694 1852
1695our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1696 1854
1697sub new { 1855sub new {
1698 my $class = shift; 1856 my $class = shift;
1699 1857
1700 $class->SUPER::new ( 1858 $class->SUPER::new (
1703 ) 1861 )
1704} 1862}
1705 1863
1706############################################################################# 1864#############################################################################
1707 1865
1708package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1709 1867
1710our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1711 1869
1712sub new { 1870sub new {
1713 my $class = shift; 1871 my $class = shift;
1714 1872
1715 $class->SUPER::new ( 1873 $class->SUPER::new (
1718 ) 1876 )
1719} 1877}
1720 1878
1721############################################################################# 1879#############################################################################
1722 1880
1723package CFPlus::UI::Label; 1881package DC::UI::Label;
1724 1882
1725our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1726 1884
1727use CFPlus::OpenGL; 1885use DC::OpenGL;
1728 1886
1729sub new { 1887sub new {
1730 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1731 1889
1732 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
1737 #text => initial text 1895 #text => initial text
1738 #markup => initial narkup 1896 #markup => initial narkup
1739 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1740 #style => 0, # render flags 1898 #style => 0, # render flags
1741 ellipsise => 3, # end 1899 ellipsise => 3, # end
1742 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1743 fontsize => 1, 1901 fontsize => 1,
1744 align => -1, 1902 align => 0.5,
1745 valign => -1, 1903 valign => 0.5,
1746 padding_x => 2, 1904 padding_x => 4,
1747 padding_y => 2, 1905 padding_y => 2,
1748 can_events => 0, 1906 can_events => 0,
1749 %arg 1907 %arg
1750 ); 1908 );
1751 1909
1752 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1753 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1754 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1755 $self->{template} = $layout; 1913 $self->{template} = $layout;
1756 } 1914 }
1757 1915
1758 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
1776 1934
1777 delete $self->{ox}; 1935 delete $self->{ox};
1778 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1779} 1937}
1780 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1781sub set_text { 1945sub set_text {
1782 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1783 1947
1784 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1785 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1808 1972
1809sub size_request { 1973sub size_request {
1810 my ($self) = @_; 1974 my ($self) = @_;
1811 1975
1812 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1813 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1814 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1815 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1816 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1817 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1818 1984
1819 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1820 1986
1821 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1822 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1823 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1825 1991
1826 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1827 1993
1828 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
1884 2050
1885 [$self->{layout}->size] 2051 [$self->{layout}->size]
1886 }; 2052 };
1887 2053
1888 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1889 $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);
1890 : $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);
1891 : ($self->{w} - $size->[0]) * 0.5);
1892 2057
1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1895 : ($self->{h} - $size->[1]) * 0.5);
1896 }; 2059 };
1897 2060
1898 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
1899 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
1900 2063# DC::OpenGL::glNewList $self->{list};
1901 $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;
1902} 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#}
1903 2080
1904############################################################################# 2081#############################################################################
1905 2082
1906package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
1907 2084
1908our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
1909 2086
1910use CFPlus::OpenGL; 2087use DC::OpenGL;
1911 2088
1912sub new { 2089sub new {
1913 my $class = shift; 2090 my $class = shift;
1914 2091
1915 $class->SUPER::new ( 2092 $class->SUPER::new (
1916 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1917 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => undef,
1918 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1919 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1920 can_hover => 1, 2099 can_hover => 1,
1921 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1922 valign => 0, 2102 valign => 0.5,
1923 can_events => 1, 2103 can_events => 1,
1924 ellipsise => 0, 2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1925 #text => ... 2107 #text => ...
1926 #hidden => "*", 2108 #hidden => "*",
1927 @_ 2109 @_
1928 ) 2110 )
1929} 2111}
1976 2158
1977 my $text = $self->get_text; 2159 my $text = $self->get_text;
1978 2160
1979 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1980 2162
1981 if ($uni == 8) { 2163 if ($sym == DC::SDLK_BACKSPACE) {
1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1983 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
1984 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1985 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1986 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1987 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1988 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1989 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
1990 # what a hack 2172 # what a hack
1991 $self->{cursor} = 2173 $self->{cursor} =
1992 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1993 ? length $1 2175 ? length $1
1994 : 0; 2176 : 0;
1995 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
1996 # uh, again 2178 # uh, again
1997 $self->{cursor} = 2179 $self->{cursor} =
1998 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1999 ? $self->{cursor} + length $1 2181 ? $self->{cursor} + length $1
2000 : length $self->{text}; 2182 : length $self->{text};
2064 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2065 } 2247 }
2066 2248
2067 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2068 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glBegin GL_QUADS;
2070 glVertex 0 , 0;
2071 glVertex 0 , $self->{h};
2072 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2073 glVertex $self->{w}, 0;
2074 glEnd;
2075 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2076 2253
2077 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2078 2255
2079 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
2081 2258
2082 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2083 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2084 utf8::encode $text; 2261 utf8::encode $text;
2085 2262
2086 @$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);
2087 } 2264 }
2088 2265
2266 glColor_premultiply @{$self->{active_fg}};
2089 glBegin GL_LINES; 2267 glBegin GL_LINES;
2090 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};
2091 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};
2092 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} || $DC::THEME{entry_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;
2093 } 2285 }
2094} 2286}
2095 2287
2096############################################################################# 2288#############################################################################
2097 2289
2098package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2099 2291
2100our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2101 2293
2102use 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
2103 2305
2104sub invoke_key_down { 2306sub invoke_key_down {
2105 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
2106 2308
2107 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
2113 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
2114 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
2115 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
2116 $self->update; 2318 $self->update;
2117 2319
2118 } elsif ($sym == CFPlus::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
2119 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
2120 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
2121 } 2323 }
2122 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
2123 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
2125 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
2126 } 2328 }
2127 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2128 } 2330 }
2129 2331
2130 } elsif ($sym == CFPlus::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
2131 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2133 2335
2134 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2135 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2136 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2137 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2138 } 2343 }
2139 2344
2140 } else { 2345 } else {
2141 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2142 } 2347 }
2144 1 2349 1
2145} 2350}
2146 2351
2147############################################################################# 2352#############################################################################
2148 2353
2149package CFPlus::UI::TextEdit; 2354package DC::UI::TextEdit;
2150 2355
2151our @ISA = CFPlus::UI::EntryBase::; 2356our @ISA = DC::UI::EntryBase::;
2152 2357
2153use 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}
2154 2369
2155sub move_cursor_ver { 2370sub move_cursor_ver {
2156 my ($self, $dy) = @_; 2371 my ($self, $dy) = @_;
2157 2372
2158 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2159 2374
2160 $y += $dy; 2375 $line += $dy;
2161 2376
2162 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))) {
2163 $self->{cursor} = $index; 2378 $self->{cursor} = $index;
2164 delete $self->{cur_h}; 2379 delete $self->{cur_h};
2165 $self->update; 2380 $self->update;
2166 return; 2381 return;
2167 } 2382 }
2170sub invoke_key_down { 2385sub invoke_key_down {
2171 my ($self, $ev) = @_; 2386 my ($self, $ev) = @_;
2172 2387
2173 my $sym = $ev->{sym}; 2388 my $sym = $ev->{sym};
2174 2389
2175 if ($sym == CFPlus::SDLK_UP) { 2390 if ($sym == DC::SDLK_UP) {
2176 $self->move_cursor_ver (-1); 2391 $self->move_cursor_ver (-1);
2177 } elsif ($sym == CFPlus::SDLK_DOWN) { 2392 } elsif ($sym == DC::SDLK_DOWN) {
2178 $self->move_cursor_ver (+1); 2393 $self->move_cursor_ver (+1);
2179 } else { 2394 } else {
2180 return $self->SUPER::invoke_key_down ($ev) 2395 return $self->SUPER::invoke_key_down ($ev)
2181 } 2396 }
2182 2397
2183 1 2398 1
2184} 2399}
2185 2400
2186############################################################################# 2401#############################################################################
2187 2402
2188package CFPlus::UI::Button; 2403package DC::UI::ButtonBin;
2189 2404
2190our @ISA = CFPlus::UI::Label::; 2405our @ISA = DC::UI::Bin::;
2191 2406
2192use CFPlus::OpenGL; 2407use DC::OpenGL;
2193 2408
2194my @tex = 2409my @tex =
2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2410 map { new_from_resource DC::Texture $_, mipmap => 1 }
2196 qw(b1_button_active.png); 2411 qw(b1_button_inactive.png b1_button_active.png);
2197 2412
2198sub new { 2413sub new {
2199 my $class = shift; 2414 my $class = shift;
2200 2415
2201 $class->SUPER::new ( 2416 $class->SUPER::new (
2202 padding_x => 4,
2203 padding_y => 4,
2204 fg => [1, 1, 1],
2205 active_fg => [0, 0, 1],
2206 can_hover => 1, 2417 can_hover => 1,
2207 align => 0, 2418 align => 0.5,
2208 valign => 0, 2419 valign => 0.5,
2209 can_events => 1, 2420 can_events => 1,
2210 @_ 2421 @_
2211 ) 2422 )
2212} 2423}
2213 2424
2222} 2433}
2223 2434
2224sub _draw { 2435sub _draw {
2225 my ($self) = @_; 2436 my ($self) = @_;
2226 2437
2227 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2228
2229 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
2230 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2231 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
2232 2441
2442 my $tex = $tex[$GRAB == $self];
2233 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2234 2444
2235 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2236 2446
2237 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
2238} 2448}
2239 2449
2240############################################################################# 2450#############################################################################
2241 2451
2242package CFPlus::UI::CheckBox; 2452package DC::UI::Button;
2243 2453
2244our @ISA = CFPlus::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
2245 2457
2246my @tex = 2458my @tex =
2247 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 }
2248 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2249 2514
2250use CFPlus::OpenGL; 2515use DC::OpenGL;
2251 2516
2252sub new { 2517sub new {
2253 my $class = shift; 2518 my $class = shift;
2254 2519
2255 $class->SUPER::new ( 2520 $class->SUPER::new (
2295sub _draw { 2560sub _draw {
2296 my ($self) = @_; 2561 my ($self) = @_;
2297 2562
2298 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2299 2564
2300 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2301 2566
2302 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2303 2568
2304 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;
2305 2570
2312 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2313} 2578}
2314 2579
2315############################################################################# 2580#############################################################################
2316 2581
2317package CFPlus::UI::Image; 2582package DC::UI::Image;
2318 2583
2319our @ISA = CFPlus::UI::Base::; 2584our @ISA = DC::UI::Base::;
2320 2585
2321use CFPlus::OpenGL; 2586use DC::OpenGL;
2322 2587
2323our %texture_cache; 2588our %texture_cache;
2324 2589
2325sub new { 2590sub new {
2326 my $class = shift; 2591 my $class = shift;
2327 2592
2328 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2329 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2330 @_, 2596 @_,
2331 ); 2597 );
2332 2598
2333 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2334 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2335 2601
2336 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2337 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2338 2604
2339 CFPlus::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2340 2606
2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2342 2608
2343 $self 2609 $self
2344} 2610}
2345 2611
2346sub STORABLE_freeze { 2612sub STORABLE_freeze {
2347 my ($self, $cloning) = @_; 2613 my ($self, $cloning) = @_;
2348 2614
2349 $self->{path} 2615 $self->{path}
2350 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";
2351 2617
2352 $self->{path} 2618 $self->{path}
2353} 2619}
2354 2620
2355sub STORABLE_attach { 2621sub STORABLE_attach {
2359} 2625}
2360 2626
2361sub size_request { 2627sub size_request {
2362 my ($self) = @_; 2628 my ($self) = @_;
2363 2629
2364 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2365} 2631}
2366 2632
2367sub _draw { 2633sub _draw {
2368 my ($self) = @_; 2634 my ($self) = @_;
2369 2635
2379 } 2645 }
2380 2646
2381 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2383 2649
2384 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
2385 2651
2386 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2387} 2653}
2388 2654
2389############################################################################# 2655#############################################################################
2390 2656
2391package CFPlus::UI::ImageButton; 2657package DC::UI::ImageButton;
2392 2658
2393our @ISA = CFPlus::UI::Image::; 2659our @ISA = DC::UI::Image::;
2394 2660
2395use CFPlus::OpenGL; 2661use DC::OpenGL;
2396 2662
2397my %textures; 2663my %textures;
2398 2664
2399sub new { 2665sub new {
2400 my $class = shift; 2666 my $class = shift;
2403 padding_x => 4, 2669 padding_x => 4,
2404 padding_y => 4, 2670 padding_y => 4,
2405 fg => [1, 1, 1], 2671 fg => [1, 1, 1],
2406 active_fg => [0, 0, 1], 2672 active_fg => [0, 0, 1],
2407 can_hover => 1, 2673 can_hover => 1,
2408 align => 0, 2674 align => 0.5,
2409 valign => 0, 2675 valign => 0.5,
2410 can_events => 1, 2676 can_events => 1,
2411 @_ 2677 @_
2412 ); 2678 );
2413} 2679}
2414 2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2415sub invoke_button_up { 2687sub invoke_button_up {
2416 my ($self, $ev, $x, $y) = @_; 2688 my ($self, $ev, $x, $y) = @_;
2417 2689
2418 $self->emit ("activate") 2690 $self->emit ("activate")
2419 if $x >= 0 && $x < $self->{w} 2691 if $x >= 0 && $x < $self->{w}
2422 1 2694 1
2423} 2695}
2424 2696
2425############################################################################# 2697#############################################################################
2426 2698
2427package CFPlus::UI::VGauge; 2699package DC::UI::VGauge;
2428 2700
2429our @ISA = CFPlus::UI::Base::; 2701our @ISA = DC::UI::Base::;
2430 2702
2431use List::Util qw(min max); 2703use List::Util qw(min max);
2432 2704
2433use CFPlus::OpenGL; 2705use DC::OpenGL;
2434 2706
2435my %tex = ( 2707my %tex = (
2436 food => [ 2708 food => [
2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2439 ], 2711 ],
2440 grace => [ 2712 grace => [
2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
2442 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/
2443 ], 2715 ],
2444 hp => [ 2716 hp => [
2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2447 ], 2719 ],
2448 mana => [ 2720 mana => [
2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2450 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/
2451 ], 2723 ],
2452); 2724);
2453 2725
2454# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
2557 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2558} 2830}
2559 2831
2560############################################################################# 2832#############################################################################
2561 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
2562package CFPlus::UI::Gauge; 2972package DC::UI::Gauge;
2563 2973
2564our @ISA = CFPlus::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2565 2975
2566sub new { 2976sub new {
2567 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2568 2978
2569 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2571 can_hover => 1, 2981 can_hover => 1,
2572 can_events => 1, 2982 can_events => 1,
2573 %arg, 2983 %arg,
2574 ); 2984 );
2575 2985
2576 $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");
2577 $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);
2578 $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");
2579 2989
2580 $self 2990 $self
2581} 2991}
2582 2992
2583sub set_fontsize { 2993sub set_fontsize {
2604 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2605} 3015}
2606 3016
2607############################################################################# 3017#############################################################################
2608 3018
2609package CFPlus::UI::Slider; 3019package DC::UI::Slider;
2610 3020
2611use strict; 3021use strict;
2612 3022
2613use CFPlus::OpenGL; 3023use DC::OpenGL;
2614 3024
2615our @ISA = CFPlus::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2616 3026
2617my @tex = 3027my @tex =
2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
2619 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2620 3030
2621sub new { 3031sub new {
2622 my $class = shift; 3032 my $class = shift;
2623 3033
2660sub set_value { 3070sub set_value {
2661 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2662 3072
2663 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2664 3074
2665 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2666 3076
2667 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2668
2669 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2670 $value = $hi - $page if $value > $hi - $page;
2671 3079
2672 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2673 if $unit; 3081 if $unit;
2674 3082
2675 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2691 3099
2692 $self->SUPER::invoke_button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2693 3101
2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2695 3103
2696 $self->invoke_mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
3105
3106 1
2697} 3107}
2698 3108
2699sub invoke_mouse_motion { 3109sub invoke_mouse_motion {
2700 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2701 3111
2717sub invoke_mouse_wheel { 3127sub invoke_mouse_wheel {
2718 my ($self, $ev) = @_; 3128 my ($self, $ev) = @_;
2719 3129
2720 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2721 3131
2722 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2723 3133
2724 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725 3135
2726 ! ! $delta 3136 1
2727} 3137}
2728 3138
2729sub update { 3139sub update {
2730 my ($self) = @_; 3140 my ($self) = @_;
2731 3141
2737 my ($self) = @_; 3147 my ($self) = @_;
2738 3148
2739 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2740 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2741 3151
2742 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2743 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2744 3154
2745 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};
2746 3156
2747 $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;
2748 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2749 3159
2750 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
2780 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2781} 3191}
2782 3192
2783############################################################################# 3193#############################################################################
2784 3194
2785package CFPlus::UI::ValSlider; 3195package DC::UI::ValSlider;
2786 3196
2787our @ISA = CFPlus::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2788 3198
2789sub new { 3199sub new {
2790 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2791 3201
2792 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2793 3203
2794 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2795 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2796 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2797 to_value => sub { shift }, 3207 to_value => sub { shift },
2798 from_value => sub { shift }, 3208 from_value => sub { shift },
2799 %arg, 3209 %arg,
2800 ); 3210 );
2801 3211
2821sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2822sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2823 3233
2824############################################################################# 3234#############################################################################
2825 3235
2826package CFPlus::UI::TextScroller; 3236package DC::UI::TextScroller;
2827 3237
2828our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2829 3239
2830use CFPlus::OpenGL; 3240use DC::OpenGL;
2831 3241
2832sub new { 3242sub new {
2833 my $class = shift; 3243 my $class = shift;
2834 3244
2835 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2837 can_events => 1, 3247 can_events => 1,
2838 indent => 0, 3248 indent => 0,
2839 #font => default_font 3249 #font => default_font
2840 @_, 3250 @_,
2841 3251
2842 layout => (new CFPlus::Layout), 3252 layout => (new DC::Layout),
2843 par => [], 3253 par => [],
2844 max_par => 0, 3254 max_par => 0,
2845 height => 0, 3255 height => 0,
2846 children => [ 3256 children => [
2847 (new CFPlus::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2848 (new CFPlus::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2849 ], 3259 ],
2850 ); 3260 );
2851 3261
2852 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2853 3263
2862} 3272}
2863 3273
2864sub size_request { 3274sub size_request {
2865 my ($self) = @_; 3275 my ($self) = @_;
2866 3276
2867 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
2868 3278
2869 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
2870 $self->SUPER::size_request 3280 $self->SUPER::size_request
2871} 3281}
2872 3282
2909 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2910 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
2911 3321
2912 $layout->set_shapes ( 3322 $layout->set_shapes (
2913 map 3323 map
2914 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2915 @{$para->{widget}} 3325 @{$para->{widget}}
2916 ); 3326 );
2917 3327
2918 $layout 3328 $layout
2919} 3329}
3036 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3037 $self->force_uptodate; 3447 $self->force_uptodate;
3038 3448
3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3040 3450
3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3042 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
3043 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
3044 3454
3045 package CFPlus::UI::Base; 3455 package DC::UI::Base;
3046 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3047 (0, 0, $self->{w}, $self->{h}); 3457 (0, 0, $self->{w}, $self->{h});
3048 3458
3049 my $top = int $self->{children}[1]{range}[0]; 3459 my $top = int $self->{children}[1]{range}[0];
3050 3460
3061 3471
3062 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
3063 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
3064 3474
3065 $layout->render ($para->{indent}, $y - $y0); 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
3066 3477
3067 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
3068 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
3069 3480
3070 for (@w) { 3481 for (@w) {
3108 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
3109} 3520}
3110 3521
3111############################################################################# 3522#############################################################################
3112 3523
3113package CFPlus::UI::Animator; 3524package DC::UI::Animator;
3114 3525
3115use CFPlus::OpenGL; 3526use DC::OpenGL;
3116 3527
3117our @ISA = CFPlus::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
3118 3529
3119sub moveto { 3530sub moveto {
3120 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
3121 3532
3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3150 glPopMatrix; 3561 glPopMatrix;
3151} 3562}
3152 3563
3153############################################################################# 3564#############################################################################
3154 3565
3155package CFPlus::UI::Flopper; 3566package DC::UI::Flopper;
3156 3567
3157our @ISA = CFPlus::UI::Button::; 3568our @ISA = DC::UI::Button::;
3158 3569
3159sub new { 3570sub new {
3160 my $class = shift; 3571 my $class = shift;
3161 3572
3162 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3174 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
3175} 3586}
3176 3587
3177############################################################################# 3588#############################################################################
3178 3589
3179package CFPlus::UI::Tooltip; 3590package DC::UI::Tooltip;
3180 3591
3181our @ISA = CFPlus::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
3182 3593
3183use CFPlus::OpenGL; 3594use DC::OpenGL;
3184 3595
3185sub new { 3596sub new {
3186 my $class = shift; 3597 my $class = shift;
3187 3598
3188 $class->SUPER::new ( 3599 $class->SUPER::new (
3192} 3603}
3193 3604
3194sub set_tooltip_from { 3605sub set_tooltip_from {
3195 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
3196 3607
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
3199
3200 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 =~ /^#(.*)$/;
3201 3613
3202 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
3203 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
3204 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3205 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
3206 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
3207 } 3619 }
3208 3620
3209 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
3210 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
3211 3623
3212 $self->add (new CFPlus::UI::Label 3624 $self->add (new DC::UI::Label
3625 fg => $DC::THEME{tooltip_fg},
3213 markup => $tooltip, 3626 markup => $tip,
3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3627 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3628 align => 0,
3215 fontsize => 0.8, 3629 fontsize => 0.8,
3216 style => 1, # FLAG_INVERSE 3630 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3217 ellipsise => 0, 3631 ellipsise => 0,
3218 font => ($widget->{tooltip_font} || $::FONT_PROP), 3632 font => ($widget->{tooltip_font} || $::FONT_PROP),
3219 ); 3633 );
3220} 3634}
3221 3635
3256} 3670}
3257 3671
3258sub _draw { 3672sub _draw {
3259 my ($self) = @_; 3673 my ($self) = @_;
3260 3674
3261 glTranslate 0.375, 0.375;
3262
3263 my ($w, $h) = @$self{qw(w h)}; 3675 my ($w, $h) = @$self{qw(w h)};
3264 3676
3265 glColor 1, 0.8, 0.4; 3677 glColor @{ $DC::THEME{tooltip_bg} };
3266 glBegin GL_QUADS; 3678 glRect 0, 0, $w, $h;
3267 glVertex 0 , 0;
3268 glVertex 0 , $h;
3269 glVertex $w, $h;
3270 glVertex $w, 0;
3271 glEnd;
3272 3679
3273 glColor 0, 0, 0; 3680 glColor @{ $DC::THEME{tooltip_border} };
3274 glBegin GL_LINE_LOOP; 3681 glRect_lineloop .5, .5, $w + .5, $h + .5;
3275 glVertex 0 , 0;
3276 glVertex 0 , $h;
3277 glVertex $w, $h;
3278 glVertex $w, 0;
3279 glEnd;
3280 3682
3281 glTranslate 2 - 0.375, 2 - 0.375; 3683 glTranslate 2, 2;
3282 3684
3283 $self->SUPER::_draw; 3685 $self->SUPER::_draw;
3284} 3686}
3285 3687
3286############################################################################# 3688#############################################################################
3287 3689
3288package CFPlus::UI::Face; 3690package DC::UI::Face;
3289 3691
3290our @ISA = CFPlus::UI::DrawBG::; 3692our @ISA = DC::UI::DrawBG::;
3291 3693
3292use CFPlus::OpenGL; 3694use DC::OpenGL;
3293 3695
3294sub new { 3696sub new {
3295 my $class = shift; 3697 my $class = shift;
3296 3698
3297 my $self = $class->SUPER::new ( 3699 my $self = $class->SUPER::new (
3700 size_w => 32,
3701 size_h => 8,
3298 aspect => 1, 3702 aspect => 1,
3299 can_events => 0, 3703 can_events => 0,
3300 @_, 3704 @_,
3301 ); 3705 );
3302 3706
3303 if ($self->{anim} && $self->{animspeed}) { 3707 if ($self->{anim} && $self->{animspeed}) {
3304 CFPlus::weaken (my $widget = $self); 3708 DC::weaken (my $widget = $self);
3305 3709
3306 $self->{timer} = Event->timer ( 3710 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3711 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3308 hard => 1, 3712 return unless $::CONN;
3309 interval => $self->{animspeed}, 3713
3310 cb => sub { 3714 my $w = $widget
3715 or return;
3716
3311 ++$widget->{frame}; 3717 ++$w->{frame};
3718 $w->update_face;
3719
3720 # somehow, $widget can go away
3312 $widget->update; 3721 $w->update;
3313 }, 3722 $w->update_timer;
3314 ); 3723 };
3724
3725 $self->update_face;
3726 $self->update_timer;
3315 } 3727 }
3316 3728
3317 $self 3729 $self
3318} 3730}
3319 3731
3732sub update_timer {
3733 my ($self) = @_;
3734
3735 return unless $self->{timer};
3736
3737 if ($self->{visible}) {
3738 $self->{timer}->start;
3739 } else {
3740 $self->{timer}->stop;
3741 }
3742}
3743
3744sub update_face {
3745 my ($self) = @_;
3746
3747 if ($::CONN) {
3748 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3749 if ($anim && @$anim) {
3750 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3751 delete $self->{face_change_cb};
3752
3753 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3754 unless ($tex->{name} || $tex->{loading}) {
3755 $tex->upload (sub { $self->reconfigure });
3756 }
3757 }
3758 }
3759 }
3760 }
3761}
3762
3320sub size_request { 3763sub size_request {
3321 (32, 8) 3764 my ($self) = @_;
3765
3766 if ($::CONN) {
3767 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3768 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3769 if ($tex->{name}) {
3770 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3771 } elsif (!$tex->{loading}) {
3772 $tex->upload (sub { $self->reconfigure });
3773 }
3774 }
3775
3776 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3777 }
3778 }
3779
3780 ($self->{size_w} || 8, $self->{size_h} || 8)
3322} 3781}
3323 3782
3324sub update { 3783sub update {
3325 my ($self) = @_; 3784 my ($self) = @_;
3326 3785
3327 return unless $self->{visible}; 3786 return unless $self->{visible};
3328 3787
3329 $self->SUPER::update; 3788 $self->SUPER::update;
3330} 3789}
3331 3790
3791sub invoke_visibility_change {
3792 my ($self) = @_;
3793
3794 $self->update_timer;
3795
3796 0
3797}
3798
3332sub _draw { 3799sub _draw {
3333 my ($self) = @_; 3800 my ($self) = @_;
3334 3801
3335 return unless $::CONN;
3336
3337 $self->SUPER::_draw; 3802 $self->SUPER::_draw;
3338 3803
3339 my $face; 3804 if (my $tex = $self->{tex}) {
3340
3341 if ($self->{frame}) {
3342 my $anim = $::CONN->{anim}[$self->{anim}];
3343
3344 $face = $anim->[ $self->{frame} % @$anim ]
3345 if $anim && @$anim;
3346 }
3347
3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3349
3350 if ($tex) {
3351 glEnable GL_TEXTURE_2D; 3805 glEnable GL_TEXTURE_2D;
3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3806 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3353 glColor 0, 0, 0, 1; 3807 glColor 0, 0, 0, 1;
3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3808 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3355 glDisable GL_TEXTURE_2D; 3809 glDisable GL_TEXTURE_2D;
3357} 3811}
3358 3812
3359sub destroy { 3813sub destroy {
3360 my ($self) = @_; 3814 my ($self) = @_;
3361 3815
3362 $self->{timer}->cancel 3816 (delete $self->{timer})->cancel
3363 if $self->{timer}; 3817 if $self->{timer};
3364 3818
3365 $self->SUPER::destroy; 3819 $self->SUPER::destroy;
3366} 3820}
3367 3821
3368############################################################################# 3822#############################################################################
3369 3823
3370package CFPlus::UI::Buttonbar; 3824package DC::UI::Buttonbar;
3371 3825
3372our @ISA = CFPlus::UI::HBox::; 3826our @ISA = DC::UI::HBox::;
3373 3827
3374# TODO: should actually wrap buttons and other goodies. 3828# TODO: should actually wrap buttons and other goodies.
3375 3829
3376############################################################################# 3830#############################################################################
3377 3831
3378package CFPlus::UI::Menu; 3832package DC::UI::Menu;
3379 3833
3380our @ISA = CFPlus::UI::Toplevel::; 3834our @ISA = DC::UI::Toplevel::;
3381 3835
3382use CFPlus::OpenGL; 3836use DC::OpenGL;
3383 3837
3384sub new { 3838sub new {
3385 my $class = shift; 3839 my $class = shift;
3386 3840
3387 my $self = $class->SUPER::new ( 3841 my $self = $class->SUPER::new (
3388 items => [], 3842 items => [],
3389 z => 100, 3843 z => 100,
3390 @_, 3844 @_,
3391 ); 3845 );
3392 3846
3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3847 $self->add ($self->{vbox} = new DC::UI::VBox);
3394 3848
3395 for my $item (@{ $self->{items} }) { 3849 for my $item (@{ $self->{items} }) {
3396 my ($widget, $cb, $tooltip) = @$item; 3850 my ($widget, $cb, $tooltip) = @$item;
3397 3851
3398 # handle various types of items, only text for now 3852 # handle various types of items, only text for now
3399 if (!ref $widget) { 3853 if (!ref $widget) {
3400 if ($widget =~ /\t/) { 3854 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2; 3855 my ($left, $right) = split /\t/, $widget, 2;
3402 3856
3403 $widget = new CFPlus::UI::HBox 3857 $widget = new DC::UI::HBox
3404 can_hover => 1, 3858 can_hover => 1,
3405 can_events => 1, 3859 can_events => 1,
3406 tooltip => $tooltip, 3860 tooltip => $tooltip,
3407 children => [ 3861 children => [
3408 (new CFPlus::UI::Label markup => $left, expand => 1), 3862 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3409 (new CFPlus::UI::Label markup => $right, align => +1), 3863 (new DC::UI::Label markup => $right, align => 1),
3410 ], 3864 ],
3411 ; 3865 ;
3412 3866
3413 } else { 3867 } else {
3414 $widget = new CFPlus::UI::Label 3868 $widget = new DC::UI::Label
3415 can_hover => 1, 3869 can_hover => 1,
3416 can_events => 1, 3870 can_events => 1,
3871 align => 0,
3417 markup => $widget, 3872 markup => $widget,
3418 tooltip => $tooltip; 3873 tooltip => $tooltip;
3419 } 3874 }
3420 } 3875 }
3421 3876
3467 1 3922 1
3468} 3923}
3469 3924
3470############################################################################# 3925#############################################################################
3471 3926
3472package CFPlus::UI::Multiplexer; 3927package DC::UI::Multiplexer;
3473 3928
3474our @ISA = CFPlus::UI::Container::; 3929our @ISA = DC::UI::Container::;
3475 3930
3476sub new { 3931sub new {
3477 my $class = shift; 3932 my $class = shift;
3478 3933
3479 my $self = $class->SUPER::new ( 3934 my $self = $class->SUPER::new (
3480 @_, 3935 @_,
3481 ); 3936 );
3482 3937
3483 $self->{current} = $self->{children}[0] 3938 $self->set_current_page (0);
3484 if @{ $self->{children} };
3485 3939
3486 $self 3940 $self
3487} 3941}
3488 3942
3489sub add { 3943sub add {
3490 my ($self, @widgets) = @_; 3944 my ($self, @widgets) = @_;
3491 3945
3492 $self->SUPER::add (@widgets); 3946 $self->SUPER::add (@widgets);
3493 3947
3494 $self->{current} = $self->{children}[0] 3948 $self->set_current_page (0)
3495 if @{ $self->{children} }; 3949 unless @widgets == @{ $self->{children} };
3496} 3950}
3497 3951
3498sub get_current_page { 3952sub get_current_page {
3499 my ($self) = @_; 3953 my ($self) = @_;
3500 3954
3506 3960
3507 my $widget = ref $page_or_widget 3961 my $widget = ref $page_or_widget
3508 ? $page_or_widget 3962 ? $page_or_widget
3509 : $self->{children}[$page_or_widget]; 3963 : $self->{children}[$page_or_widget];
3510 3964
3965 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3966
3511 $self->{current} = $widget; 3967 if (($self->{current} = $widget)) {
3968 $self->{current}->set_visible if $self->{current} && $self->{visible};
3512 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3969 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3513 3970
3514 $self->emit (page_changed => $self->{current}); 3971 $self->emit (page_changed => $self->{current});
3972 }
3515 3973
3516 $self->realloc; 3974 $self->realloc;
3517} 3975}
3518 3976
3519sub visible_children { 3977sub visible_children {
3520 $_[0]{current} 3978 $_[0]{current} || ()
3521} 3979}
3522 3980
3523sub size_request { 3981sub size_request {
3524 my ($self) = @_; 3982 my ($self) = @_;
3525 3983
3984 $self->{current}
3526 $self->{current}->size_request 3985 ? $self->{current}->size_request
3986 : (0, 0)
3527} 3987}
3528 3988
3529sub invoke_size_allocate { 3989sub invoke_size_allocate {
3530 my ($self, $w, $h) = @_; 3990 my ($self, $w, $h) = @_;
3531 3991
3532 $self->{current}->configure (0, 0, $w, $h); 3992 $self->{current}->configure (0, 0, $w, $h)
3993 if $self->{current};
3533 3994
3534 1 3995 1
3535} 3996}
3536 3997
3537sub _draw { 3998sub _draw {
3538 my ($self) = @_; 3999 my ($self) = @_;
3539 4000
3540 $self->{current}->draw; 4001 $self->{current}->draw
4002 if $self->{current};
3541} 4003}
3542 4004
3543############################################################################# 4005#############################################################################
3544 4006
3545package CFPlus::UI::Notebook; 4007package DC::UI::Notebook;
3546 4008
4009use DC::OpenGL;
4010
3547our @ISA = CFPlus::UI::VBox::; 4011our @ISA = DC::UI::VBox::;
3548 4012
3549sub new { 4013sub new {
3550 my $class = shift; 4014 my $class = shift;
3551 4015
3552 my $self = $class->SUPER::new ( 4016 my $self = $class->SUPER::new (
3553 buttonbar => (new CFPlus::UI::Buttonbar), 4017 buttonbar => (new DC::UI::Buttonbar),
3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4018 multiplexer => (new DC::UI::Multiplexer expand => 1),
4019 active_outline => [.7, .7, 0.2],
3555 # filter => # will be put between multiplexer and $self 4020 # filter => # will be put between multiplexer and $self
3556 @_, 4021 @_,
3557 ); 4022 );
3558 4023
3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4024 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3560 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4025 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3561 4026
4027 {
4028 Scalar::Util::weaken (my $wself = $self);
4029
4030 $self->{multiplexer}->connect (c_add => sub {
4031 my ($mplex, $widgets) = @_;
4032
4033 for my $child (@$widgets) {
4034 Scalar::Util::weaken $child;
4035 $child->{c_tab_} ||= do {
4036 my $tab =
4037 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4038 ? $child->{c_tab}
4039 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4040
4041 $tab->connect (activate => sub {
4042 $wself->set_current_page ($child);
4043 });
4044
4045 $tab
4046 };
4047
4048 $self->{buttonbar}->add ($child->{c_tab_});
4049 }
4050 });
4051
4052 $self->{multiplexer}->connect (c_remove => sub {
4053 my ($mplex, $widgets) = @_;
4054
4055 for my $child (@$widgets) {
4056 $wself->{buttonbar}->remove ($child->{c_tab_});
4057 }
4058 });
4059 }
4060
3562 $self 4061 $self
3563} 4062}
3564 4063
3565sub add { 4064sub add {
4065 my ($self, @widgets) = @_;
4066
4067 $self->{multiplexer}->add (@widgets)
4068}
4069
4070sub remove {
4071 my ($self, @widgets) = @_;
4072
4073 $self->{multiplexer}->remove (@widgets)
4074}
4075
4076sub pages {
4077 my ($self) = @_;
4078 $self->{multiplexer}->children
4079}
4080
4081sub page_index {
4082 my ($self, $widget) = @_;
4083
4084 my $i = 0;
4085 for ($self->pages) {
4086 if ($_ eq $widget) { return $i };
4087 $i++;
4088 }
4089
4090 undef
4091}
4092
4093sub add_tab {
3566 my ($self, $title, $widget, $tooltip) = @_; 4094 my ($self, $title, $widget, $tooltip) = @_;
3567 4095
3568 CFPlus::weaken $self; 4096 $title = [$title, $tooltip] unless ref $title;
4097 $widget->{c_tab} = $title;
3569 4098
3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3571 markup => $title,
3572 tooltip => $tooltip,
3573 on_activate => sub { $self->set_current_page ($widget) },
3574 );
3575
3576 $self->{multiplexer}->add ($widget); 4099 $self->add ($widget);
3577} 4100}
3578 4101
3579sub get_current_page { 4102sub get_current_page {
3580 my ($self) = @_; 4103 my ($self) = @_;
3581 4104
3587 4110
3588 $self->{multiplexer}->set_current_page ($page); 4111 $self->{multiplexer}->set_current_page ($page);
3589 $self->emit (page_changed => $self->{multiplexer}{current}); 4112 $self->emit (page_changed => $self->{multiplexer}{current});
3590} 4113}
3591 4114
4115sub _draw {
4116 my ($self) = @_;
4117
4118 $self->SUPER::_draw ();
4119
4120 if (my $cur = $self->{multiplexer}{current}) {
4121 if ($cur = $cur->{c_tab_}) {
4122 glTranslate $self->{buttonbar}{x} + $cur->{x},
4123 $self->{buttonbar}{y} + $cur->{y};
4124 glLineWidth 3;
4125 #glEnable GL_BLEND;
4126 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4127 glColor @{$self->{active_outline}};
4128 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4129 glLineWidth 1;
4130 #glDisable GL_BLEND;
4131 }
4132 }
4133}
4134
3592############################################################################# 4135#############################################################################
3593 4136
3594package CFPlus::UI::Selector; 4137package DC::UI::Selector;
3595 4138
3596use utf8; 4139use utf8;
3597 4140
3598our @ISA = CFPlus::UI::Button::; 4141our @ISA = DC::UI::Button::;
3599 4142
3600sub new { 4143sub new {
3601 my $class = shift; 4144 my $class = shift;
3602 4145
3603 my $self = $class->SUPER::new ( 4146 my $self = $class->SUPER::new (
3620 my ($value, $title, $tooltip) = @$_; 4163 my ($value, $title, $tooltip) = @$_;
3621 4164
3622 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4165 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3623 } 4166 }
3624 4167
3625 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4168 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3626} 4169}
3627 4170
3628sub _set_value { 4171sub _set_value {
3629 my ($self, $value) = @_; 4172 my ($self, $value) = @_;
3630 4173
3631 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4174 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4175 $item ||= $self->{options}[0]
3632 or return; 4176 or return;
3633 4177
3634 $self->{value} = $item->[0]; 4178 $self->{value} = $item->[0];
3635 $self->set_markup ("$item->[1] ⇓"); 4179 $self->set_markup ("$item->[1] ⇓");
3636 $self->set_tooltip ($item->[2]); 4180# $self->set_tooltip ($item->[2]);
3637} 4181}
3638 4182
3639sub set_value { 4183sub set_value {
3640 my ($self, $value) = @_; 4184 my ($self, $value) = @_;
3641 4185
3643 4187
3644 $self->_set_value ($value); 4188 $self->_set_value ($value);
3645 $self->emit (changed => $value); 4189 $self->emit (changed => $value);
3646} 4190}
3647 4191
4192sub set_options {
4193 my ($self, $options) = @_;
4194
4195 $self->{options} = $options;
4196 $self->_set_value ($self->{value});
4197}
4198
3648############################################################################# 4199#############################################################################
3649 4200
3650package CFPlus::UI::Statusbox; 4201package DC::UI::Statusbox;
3651 4202
3652our @ISA = CFPlus::UI::VBox::; 4203our @ISA = DC::UI::VBox::;
3653 4204
3654sub new { 4205sub new {
3655 my $class = shift; 4206 my $class = shift;
3656 4207
3657 my $self = $class->SUPER::new ( 4208 my $self = $class->SUPER::new (
3658 fontsize => 0.8, 4209 fontsize => 0.8,
3659 @_, 4210 @_,
3660 ); 4211 );
3661 4212
3662 CFPlus::weaken (my $this = $self); 4213 DC::weaken (my $this = $self);
3663 4214
3664 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4215 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3665 4216
3666 $self 4217 $self
3667} 4218}
3668 4219
3669sub reorder { 4220sub reorder {
3670 my ($self) = @_; 4221 my ($self) = @_;
3671 my $NOW = Time::HiRes::time; 4222 my $NOW = EV::time;
3672 4223
3673 # freeze display when hovering over any label 4224 # freeze display when hovering over any label
3674 return if $CFPlus::UI::TOOLTIP->{owner} 4225 return if $DC::UI::TOOLTIP->{owner}
3675 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4226 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3676 values %{ $self->{item} }; 4227 values %{ $self->{item} };
3677 4228
3678 while (my ($k, $v) = each %{ $self->{item} }) { 4229 while (my ($k, $v) = each %{ $self->{item} }) {
3679 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4230 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3680 } 4231 }
4232
4233 $self->{timer}->set (1, 1);
3681 4234
3682 my @widgets; 4235 my @widgets;
3683 4236
3684 my @items = sort { 4237 my @items = sort {
3685 $a->{pri} <=> $b->{pri} 4238 $a->{pri} <=> $b->{pri}
3686 or $b->{id} <=> $a->{id} 4239 or $b->{id} <=> $a->{id}
3687 } values %{ $self->{item} }; 4240 } values %{ $self->{item} };
3688
3689 $self->{timer}->interval (1);
3690 4241
3691 my $count = 10 + 1; 4242 my $count = 10 + 1;
3692 for my $item (@items) { 4243 for my $item (@items) {
3693 last unless --$count; 4244 last unless --$count;
3694 4245
3701 for ($short) { 4252 for ($short) {
3702 s/^\s+//; 4253 s/^\s+//;
3703 s/\s+/ /g; 4254 s/\s+/ /g;
3704 } 4255 }
3705 4256
3706 new CFPlus::UI::Label 4257 new DC::UI::Label
3707 markup => $short, 4258 markup => $short,
3708 tooltip => $item->{tooltip}, 4259 tooltip => $item->{tooltip},
3709 tooltip_font => $::FONT_PROP, 4260 tooltip_font => $::FONT_PROP,
3710 tooltip_width => 0.67, 4261 tooltip_width => 0.67,
3711 fontsize => $item->{fontsize} || $self->{fontsize}, 4262 fontsize => $item->{fontsize} || $self->{fontsize},
3712 max_w => $::WIDTH * 0.44, 4263 max_w => $::WIDTH * 0.44,
4264 align => 0,
3713 fg => [@{ $item->{fg} }], 4265 fg => [@{ $item->{fg} }],
3714 can_events => 1, 4266 can_events => 1,
3715 can_hover => 1 4267 can_hover => 1
3716 }; 4268 };
3717 4269
3718 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4270 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3719 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4271 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3720 $label->update; 4272 $label->update;
3721 $label->set_max_size (undef, $label->{req_h} * $diff) 4273 $label->set_max_size (undef, $label->{req_h} * $diff)
3722 if $diff < 1; 4274 if $diff < 1;
3723 $self->{timer}->interval (1/30); 4275 $self->{timer}->set (1/30, 1/30);
3724 } else { 4276 } else {
3725 $label->{fg}[3] = $item->{fg}[3] || 1; 4277 $label->{fg}[3] = $item->{fg}[3] || 1;
3726 } 4278 }
3727 4279
3728 push @widgets, $label; 4280 push @widgets, $label;
3729 } 4281 }
4282
4283 my $hash = join ",", @widgets;
4284 return if $hash eq $self->{last_widget_hash};
4285 $self->{last_widget_hash} = $hash;
3730 4286
3731 $self->clear; 4287 $self->clear;
3732 $self->SUPER::add (reverse @widgets); 4288 $self->SUPER::add (reverse @widgets);
3733} 4289}
3734 4290
3790 $self->SUPER::destroy; 4346 $self->SUPER::destroy;
3791} 4347}
3792 4348
3793############################################################################# 4349#############################################################################
3794 4350
3795package CFPlus::UI::Root; 4351package DC::UI::Root;
3796 4352
3797our @ISA = CFPlus::UI::Container::; 4353our @ISA = DC::UI::Container::;
3798 4354
3799use List::Util qw(min max); 4355use List::Util qw(min max);
3800 4356
3801use CFPlus::OpenGL; 4357use DC::OpenGL;
3802 4358
3803sub new { 4359sub new {
3804 my $class = shift; 4360 my $class = shift;
3805 4361
3806 my $self = $class->SUPER::new ( 4362 my $self = $class->SUPER::new (
3807 visible => 1, 4363 visible => 1,
3808 @_, 4364 @_,
3809 ); 4365 );
3810 4366
3811 CFPlus::weaken ($self->{root} = $self); 4367 DC::weaken ($self->{root} = $self);
3812 4368
3813 $self 4369 $self
3814} 4370}
3815 4371
3816sub size_request { 4372sub size_request {
3864} 4420}
3865 4421
3866sub update { 4422sub update {
3867 my ($self) = @_; 4423 my ($self) = @_;
3868 4424
3869 $::WANT_REFRESH++; 4425 $::WANT_REFRESH = 1;
3870} 4426}
3871 4427
3872sub add { 4428sub add {
3873 my ($self, @children) = @_; 4429 my ($self, @children) = @_;
3874 4430
3911 while ($self->{refresh_hook}) { 4467 while ($self->{refresh_hook}) {
3912 $_->() 4468 $_->()
3913 for values %{delete $self->{refresh_hook}}; 4469 for values %{delete $self->{refresh_hook}};
3914 } 4470 }
3915 4471
3916 if ($self->{realloc}) { 4472 while ($self->{realloc}) {
3917 my %queue; 4473 my %queue;
3918 my @queue; 4474 my @queue;
3919 my $widget; 4475 my $widget;
3920 4476
3921 outer: 4477 outer:
3941 4497
3942 delete $queue{$widget+0}; 4498 delete $queue{$widget+0};
3943 4499
3944 my ($w, $h) = $widget->size_request; 4500 my ($w, $h) = $widget->size_request;
3945 4501
3946 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4502 $w += $widget->{padding_x} * 2;
3947 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4503 $h += $widget->{padding_y} * 2;
4504
4505 $w = max $widget->{min_w}, $w;
4506 $h = max $widget->{min_h}, $h;
3948 4507
3949 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4508 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3950 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4509 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3951 4510
3952 $w = $widget->{force_w} if exists $widget->{force_w}; 4511 $w = $widget->{force_w} if exists $widget->{force_w};
3968 } 4527 }
3969 } 4528 }
3970 4529
3971 delete $self->{realloc}{$widget+0}; 4530 delete $self->{realloc}{$widget+0};
3972 } 4531 }
3973 }
3974 4532
3975 while (my $size_alloc = delete $self->{size_alloc}) { 4533 while (my $size_alloc = delete $self->{size_alloc}) {
3976 my @queue = sort { $b->{visible} <=> $a->{visible} } 4534 my @queue = sort { $a->{visible} <=> $b->{visible} }
3977 values %$size_alloc; 4535 values %$size_alloc;
3978 4536
3979 while () { 4537 while () {
3980 my $widget = pop @queue || last; 4538 my $widget = pop @queue || last;
3981 4539
3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4540 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3983 4541
3984 $w = 0 if $w < 0;
3985 $h = 0 if $h < 0;
3986
3987 $w = max $widget->{min_w}, $w; 4542 $w = max $widget->{min_w}, $w;
3988 $h = max $widget->{min_h}, $h; 4543 $h = max $widget->{min_h}, $h;
3989 4544
3990# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4545# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4546# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992 4547
3993 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4548 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4549 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995 4550
3996 $w = int $w + 0.5; 4551 $w = int $w + 0.5;
3997 $h = int $h + 0.5; 4552 $h = int $h + 0.5;
3998 4553
3999 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4554 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4000 $widget->{old_w} = $widget->{w}; 4555 $widget->{old_w} = $widget->{w};
4001 $widget->{old_h} = $widget->{h}; 4556 $widget->{old_h} = $widget->{h};
4002 4557
4003 $widget->{w} = $w; 4558 $widget->{w} = $w;
4004 $widget->{h} = $h; 4559 $widget->{h} = $h;
4005 4560
4006 $widget->emit (size_allocate => $w, $h); 4561 $widget->emit (size_allocate => $w, $h);
4562 }
4007 } 4563 }
4008 } 4564 }
4009 } 4565 }
4010 4566
4011 while ($self->{post_alloc_hook}) { 4567 while ($self->{post_alloc_hook}) {
4012 $_->() 4568 $_->()
4013 for values %{delete $self->{post_alloc_hook}}; 4569 for values %{delete $self->{post_alloc_hook}};
4014 } 4570 }
4015
4016 4571
4017 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4572 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4018 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4573 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4019 glClear GL_COLOR_BUFFER_BIT; 4574 glClear GL_COLOR_BUFFER_BIT;
4020 4575
4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4578 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4024 glMatrixMode GL_MODELVIEW; 4579 glMatrixMode GL_MODELVIEW;
4025 glLoadIdentity; 4580 glLoadIdentity;
4026 4581
4027 { 4582 {
4028 package CFPlus::UI::Base; 4583 package DC::UI::Base;
4029 4584
4030 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4585 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4031 (0, 0, $self->{w}, $self->{h}); 4586 (0, 0, $self->{w}, $self->{h});
4032 4587
4033 $self->_draw; 4588 $self->_draw;
4034 } 4589 }
4035} 4590}
4036 4591
4037############################################################################# 4592#############################################################################
4038 4593
4039package CFPlus::UI; 4594package DC::UI;
4040 4595
4041$ROOT = new CFPlus::UI::Root; 4596$ROOT = new DC::UI::Root;
4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4597$TOOLTIP = new DC::UI::Tooltip z => 900;
4043 4598
40441 45991
4045 4600

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines