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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 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
288 return if $self->{visible}; 289 return if $self->{visible};
290
291 $self->{parent} && $self->{parent}{root}#d#
292 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
289 293
290 $self->{root} = $self->{parent}{root}; 294 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1; 295 $self->{visible} = $self->{parent}{visible} + 1;
292 296
293 $self->emit (visibility_change => 1); 297 $self->emit (visibility_change => 1);
294 298
295 $self->realloc if !exists $self->{req_w}; 299 $self->realloc if !exists $self->{req_w};
296 300
297 $_->set_visible for $self->children; 301 $_->set_visible for $self->visible_children;
298} 302}
299 303
300sub set_invisible { 304sub set_invisible {
301 my ($self) = @_; 305 my ($self) = @_;
302 306
… …
308 delete $self->{root}; 312 delete $self->{root};
309 313
310 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
312 316
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 317 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
315 319
316 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
318} 322}
… …
337sub hide { 341sub hide {
338 my ($self) = @_; 342 my ($self) = @_;
339 343
340 $self->set_invisible; 344 $self->set_invisible;
341 345
346 # extra $parent copy for 5.8.8+ bug workaround
347 # (otherwise $_[0] in remove gets freed
348 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 349 $parent->remove ($self);
343 if $self->{parent}; 350 }
344} 351}
345 352
346sub move_abs { 353sub move_abs {
347 my ($self, $x, $y, $z) = @_; 354 my ($self, $x, $y, $z) = @_;
348 355
… …
360 $self->{force_h} = $h; 367 $self->{force_h} = $h;
361 368
362 $self->realloc; 369 $self->realloc;
363} 370}
364 371
372# traverse the widget chain up to find the maximum "physical" size constraints
373sub get_max_wh {
374 my ($self) = @_;
375
376 my ($w, $h) = @$self{qw(max_w max_h)};
377
378 if ($w <= 0 || $h <= 0) {
379 my ($mw, $mh) = $self->{parent}
380 ? $self->{parent}->get_max_wh
381 : ($::WIDTH, $::HEIGHT);
382
383 $w = $mw if $w <= 0;
384 $h = $mh if $h <= 0;
385 }
386
387 ($w, $h)
388}
389
365sub size_request { 390sub size_request {
366 require Carp; 391 require Carp;
367 Carp::confess "size_request is abstract"; 392 Carp::confess "size_request is abstract";
368} 393}
369 394
… …
375 my ($self, $x, $y, $w, $h) = @_; 400 my ($self, $x, $y, $w, $h) = @_;
376 401
377 if ($self->{aspect}) { 402 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 403 my ($ow, $oh) = ($w, $h);
379 404
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 405 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 406 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 407
383 # use alignment to adjust x, y 408 # use alignment to adjust x, y
384 409
385 $x += int 0.5 * ($ow - $w); 410 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 411 $y += int 0.5 * ($oh - $h);
… …
427 452
428 return if $self->{tooltip} eq $tooltip; 453 return if $self->{tooltip} eq $tooltip;
429 454
430 $self->{tooltip} = $tooltip; 455 $self->{tooltip} = $tooltip;
431 456
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 457 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 458 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 459 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 460 }
436} 461}
437 462
438# translate global coordinates to local coordinate system 463# translate global coordinates to local coordinate system
439sub coord2local { 464sub coord2local {
440 my ($self, $x, $y) = @_; 465 my ($self, $x, $y) = @_;
441 466
442 Carp::confess unless $self->{parent};#d# 467 return (undef, undef) unless $self->{parent};
443 468
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 469 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 470}
446 471
447# translate local coordinates to global coordinate system 472# translate local coordinates to global coordinate system
448sub coord2global { 473sub coord2global {
449 my ($self, $x, $y) = @_; 474 my ($self, $x, $y) = @_;
450 475
451 Carp::confess unless $self->{parent};#d# 476 return (undef, undef) unless $self->{parent};
452 477
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 478 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 479}
455 480
456sub invoke_focus_in { 481sub invoke_focus_in {
… …
505sub connect { 530sub connect {
506 my ($self, $signal, $cb) = @_; 531 my ($self, $signal, $cb) = @_;
507 532
508 push @{ $self->{signal_cb}{$signal} }, $cb; 533 push @{ $self->{signal_cb}{$signal} }, $cb;
509 534
510 defined wantarray and CFPlus::guard { 535 defined wantarray and DC::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 536 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 537 @{ $self->{signal_cb}{$signal} };
513 } 538 }
514} 539}
515 540
… …
547 572
548 # parent 573 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 574 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 575}
551 576
552sub find_widget { 577#sub find_widget {
553 my ($self, $x, $y) = @_; 578# 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 579
564sub set_parent { 580sub set_parent {
565 my ($self, $parent) = @_; 581 my ($self, $parent) = @_;
566 582
567 CFPlus::weaken ($self->{parent} = $parent); 583 DC::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 584 $self->set_visible if $parent->{visible};
569} 585}
570 586
571sub realloc { 587sub realloc {
572 my ($self) = @_; 588 my ($self) = @_;
… …
598 614
599# using global variables seems a bit hacky, but passing through all drawing 615# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 616# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 617our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 618
603sub draw { 619#sub draw {
604 my ($self) = @_; 620#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 621
650sub _draw { 622sub _draw {
651 my ($self) = @_; 623 my ($self) = @_;
652 624
653 warn "no draw defined for $self\n"; 625 warn "no draw defined for $self\n";
654} 626}
655 627
656my $cntx;#d#
657sub DESTROY { 628sub DESTROY {
658 my ($self) = @_; 629 my ($self) = @_;
659 630
660 return if CFPlus::in_destruct; 631 return if DC::in_destruct;
661 632
633 local $@;
662 eval { $self->destroy }; 634 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 635 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 636
665 delete $WIDGET{$self+0}; 637 delete $WIDGET{$self+0};
666} 638}
667 639
668############################################################################# 640#############################################################################
669 641
670package CFPlus::UI::DrawBG; 642package DC::UI::DrawBG;
671 643
672our @ISA = CFPlus::UI::Base::; 644our @ISA = DC::UI::Base::;
673 645
674use strict; 646use strict;
675use CFPlus::OpenGL; 647use DC::OpenGL;
676 648
677sub new { 649sub new {
678 my $class = shift; 650 my $class = shift;
679
680 # range [value, low, high, page]
681 651
682 $class->SUPER::new ( 652 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 653 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 654 #active_bg => [1, 1, 1, 0.5],
685 @_ 655 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 667 my ($w, $h) = @$self{qw(w h)};
698 668
699 glEnable GL_BLEND; 669 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 670 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 671 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 672 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 673 glDisable GL_BLEND;
711 } 674 }
712} 675}
713 676
714############################################################################# 677#############################################################################
715 678
716package CFPlus::UI::Empty; 679package DC::UI::Empty;
717 680
718our @ISA = CFPlus::UI::Base::; 681our @ISA = DC::UI::Base::;
719 682
720sub new { 683sub new {
721 my ($class, %arg) = @_; 684 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 685 $class->SUPER::new (can_events => 0, %arg);
723} 686}
… …
730 693
731sub draw { } 694sub draw { }
732 695
733############################################################################# 696#############################################################################
734 697
735package CFPlus::UI::Container; 698package DC::UI::Container;
736 699
737our @ISA = CFPlus::UI::Base::; 700our @ISA = DC::UI::Base::;
738 701
739sub new { 702sub new {
740 my ($class, %arg) = @_; 703 my ($class, %arg) = @_;
741 704
742 my $children = delete $arg{children}; 705 my $children = delete $arg{children};
… …
746 can_events => 0, 709 can_events => 0,
747 %arg, 710 %arg,
748 ); 711 );
749 712
750 $self->add (@$children) 713 $self->add (@$children)
751 if $children; 714 if $children && @$children;
752 715
753 $self 716 $self
754} 717}
755 718
756sub realloc { 719sub realloc {
… …
765 my ($self, @widgets) = @_; 728 my ($self, @widgets) = @_;
766 729
767 $_->set_parent ($self) 730 $_->set_parent ($self)
768 for @widgets; 731 for @widgets;
769 732
733 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 734 use sort 'stable';
771 735
772 $self->{children} = [ 736 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 737 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 738 @{$self->{children}}, @widgets
775 ]; 739 ];
776 740
777 $self->realloc; 741 $self->realloc;
742
743 $self->emit (c_add => \@widgets);
744
745 map $_+0, @widgets
778} 746}
779 747
780sub children { 748sub children {
781 @{ $_[0]{children} } 749 @{ $_[0]{children} }
782} 750}
783 751
784sub remove { 752sub remove {
785 my ($self, $child) = @_; 753 my ($self, @widgets) = @_;
786 754
755 $self->emit (c_remove => \@widgets);
756
757 for my $child (@widgets) {
787 delete $child->{parent}; 758 delete $child->{parent};
788 $child->hide; 759 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 760 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
761 }
791 762
792 $self->realloc; 763 $self->realloc;
793} 764}
794 765
795sub clear { 766sub clear {
796 my ($self) = @_; 767 my ($self) = @_;
797 768
798 my $children = delete $self->{children}; 769 my $children = $self->{children};
799 $self->{children} = []; 770 $self->{children} = [];
800 771
801 for (@$children) { 772 for (@$children) {
802 delete $_->{parent}; 773 delete $_->{parent};
803 $_->hide; 774 $_->hide;
… …
823} 794}
824 795
825sub _draw { 796sub _draw {
826 my ($self) = @_; 797 my ($self) = @_;
827 798
828 $_->draw for @{$self->{children}}; 799 $_->draw for $self->visible_children;
829} 800}
830 801
831############################################################################# 802#############################################################################
832 803
833package CFPlus::UI::Bin; 804package DC::UI::Bin;
834 805
835our @ISA = CFPlus::UI::Container::; 806our @ISA = DC::UI::Container::;
836 807
837sub new { 808sub new {
838 my ($class, %arg) = @_; 809 my ($class, %arg) = @_;
839 810
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 811 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 812
842 $class->SUPER::new (children => [$child], %arg) 813 $class->SUPER::new (children => [$child], %arg)
843} 814}
844 815
845sub add { 816sub add {
846 my ($self, $child) = @_; 817 my ($self, $child) = @_;
847 818
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 819 $self->clear;
849 $self->SUPER::add ($child); 820 $self->SUPER::add ($child);
850} 821}
851 822
852sub remove { 823sub remove {
853 my ($self, $widget) = @_; 824 my ($self, $widget) = @_;
854 825
855 $self->SUPER::remove ($widget); 826 $self->SUPER::remove ($widget);
856 827
857 $self->{children} = [new CFPlus::UI::Empty] 828 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 829 unless @{$self->{children}};
859} 830}
860 831
861sub child { $_[0]->{children}[0] } 832sub child { $_[0]->{children}[0] }
862 833
… …
871 842
872 1 843 1
873} 844}
874 845
875############################################################################# 846#############################################################################
876
877# back-buffered drawing area 847# back-buffered drawing area
878 848
879package CFPlus::UI::Window; 849package DC::UI::Window;
880 850
881our @ISA = CFPlus::UI::Bin::; 851our @ISA = DC::UI::Bin::;
882 852
883use CFPlus::OpenGL; 853use DC::OpenGL;
884 854
885sub new { 855sub new {
886 my ($class, %arg) = @_; 856 my ($class, %arg) = @_;
887 857
888 my $self = $class->SUPER::new (%arg); 858 my $self = $class->SUPER::new (%arg);
… …
910} 880}
911 881
912sub render_child { 882sub render_child {
913 my ($self) = @_; 883 my ($self) = @_;
914 884
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 885 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 886 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 887 glClear GL_COLOR_BUFFER_BIT;
918 888
919 { 889 {
920 package CFPlus::UI::Base; 890 package DC::UI::Base;
921 891
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 892 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 893 (0, 0, $self->{w}, $self->{h});
924 894
925 $self->_render; 895 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 912 glDisable GL_TEXTURE_2D;
943} 913}
944 914
945############################################################################# 915#############################################################################
946 916
947package CFPlus::UI::ViewPort; 917package DC::UI::ViewPort;
948 918
919use List::Util qw(min max);
920
949our @ISA = CFPlus::UI::Window::; 921our @ISA = DC::UI::Window::;
950 922
951sub new { 923sub new {
952 my $class = shift; 924 my $class = shift;
953 925
954 $class->SUPER::new ( 926 $class->SUPER::new (
… …
961sub size_request { 933sub size_request {
962 my ($self) = @_; 934 my ($self) = @_;
963 935
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 936 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 937
966 $w = 10 if $self->{scroll_x}; 938 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 939 $h = 1 if $self->{scroll_y};
968 940
969 ($w, $h) 941 ($w, $h)
970} 942}
971 943
972sub invoke_size_allocate { 944sub invoke_size_allocate {
… …
984} 956}
985 957
986sub set_offset { 958sub set_offset {
987 my ($self, $x, $y) = @_; 959 my ($self, $x, $y) = @_;
988 960
961 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
962 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
963
964 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 965 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 966 $self->{view_y} = $y;
991 967
968 $self->emit (changed => $x, $y);
992 $self->update; 969 $self->update;
970 }
971}
972
973sub set_center {
974 my ($self, $x, $y) = @_;
975
976 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
977}
978
979sub make_visible {
980 my ($self, $x, $y, $border) = @_;
981
982 if ( $x < $self->{view_x} + $self->{w} * $border
983 || $x > $self->{view_x} + $self->{w} * (1 - $border)
984 || $y < $self->{view_y} + $self->{h} * $border
985 || $y > $self->{view_y} + $self->{h} * (1 - $border)
986 ) {
987 $self->set_center ($x, $y);
988 }
993} 989}
994 990
995# hmm, this does not work for topleft of $self... but we should not ask for that 991# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 992sub coord2local {
997 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 1008 my ($self, $x, $y) = @_;
1013 1009
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1012 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 1014 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1015 $self->DC::UI::Base::find_widget ($x, $y)
1020 } 1016 }
1021} 1017}
1022 1018
1023sub _render { 1019sub _render {
1024 my ($self) = @_; 1020 my ($self) = @_;
1025 1021
1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1022 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}; 1023 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1028 1024
1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1025 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1030 1026
1031 $self->SUPER::_render; 1027 $self->SUPER::_render;
1032} 1028}
1033 1029
1034############################################################################# 1030#############################################################################
1035 1031
1036package CFPlus::UI::ScrolledWindow; 1032package DC::UI::ScrolledWindow;
1037 1033
1038our @ISA = CFPlus::UI::Table::; 1034our @ISA = DC::UI::Table::;
1039 1035
1040sub new { 1036sub new {
1041 my ($class, %arg) = @_; 1037 my ($class, %arg) = @_;
1042 1038
1043 my $child = delete $arg{child}; 1039 my $child = delete $arg{child};
1044 1040
1045 my $self; 1041 my $self;
1046 1042
1047 my $hslider = new CFPlus::UI::Slider 1043 my $hslider = new DC::UI::Slider
1044 c_col => 0,
1045 c_row => 1,
1048 vertical => 0, 1046 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1048 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1049 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1051 },
1054 ; 1052 ;
1055 1053
1056 my $vslider = new CFPlus::UI::Slider 1054 my $vslider = new DC::UI::Slider
1055 c_col => 1,
1056 c_row => 0,
1057 vertical => 1, 1057 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1059 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1062 },
1063 ; 1063 ;
1064 1064
1065 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1067 can_events => 1, 1068 can_events => 1,
1068 hslider => $hslider, 1069 hslider => $hslider,
1069 vslider => $vslider, 1070 vslider => $vslider,
1070 col_expand => [1, 0], 1071 col_expand => [1, 0],
1071 row_expand => [1, 0], 1072 row_expand => [1, 0],
1072 %arg, 1073 %arg,
1073 ); 1074 );
1074 1075
1076 $self->{vp} = new DC::UI::ViewPort
1077 c_col => 0,
1078 c_row => 0,
1079 expand => 1,
1080 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y},
1082 on_changed => sub {
1083 my ($vp, $x, $y) = @_;
1084
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 on_size_allocate => sub {
1091 my ($vp, $w, $h) = @_;
1092 $vp->{parent}->update_slider;
1093 0
1094 },
1095 ;
1096
1075 $self->SUPER::add (0, 0, $self->{vp}); 1097 $self->SUPER::add ($self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1098
1079 $self->add ($child) if $child; 1099 $self->add ($child) if $child;
1080 1100
1081 $self 1101 $self
1082} 1102}
1083
1084#TODO# update range on size_allocate depending on child
1085 1103
1086sub add { 1104sub add {
1087 my ($self, $widget) = @_; 1105 my ($self, $widget) = @_;
1088 1106
1089 $self->{vp}->add ($self->{child} = $widget); 1107 $self->{vp}->add ($self->{child} = $widget);
1090} 1108}
1091 1109
1110sub set_offset { shift->{vp}->set_offset (@_) }
1111sub set_center { shift->{vp}->set_center (@_) }
1112sub make_visible { shift->{vp}->make_visible (@_) }
1113
1114sub update_slider {
1115 my ($self) = @_;
1116
1117 my $child = ($self->{vp} or return)->child;
1118
1119 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129 }
1130
1131 if ($self->{scroll_y}) {
1132 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1133 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1134
1135 my $visible = $h1 > $h2;
1136 if ($visible != $self->{vslider_visible}) {
1137 $self->{vslider_visible} = $visible;
1138 $visible ? $self->SUPER::add ($self->{vslider})
1139 : $self->SUPER::remove ($self->{vslider});
1140 }
1141 }
1142}
1143
1144sub start_dragging {
1145 my ($self, $ev) = @_;
1146
1147 $self->grab_focus;
1148
1149 my $ox = $self->{vp}{view_x};
1150 my $oy = $self->{vp}{view_y};
1151
1152 $self->{motion} = sub {
1153 my ($ev, $x, $y) = @_;
1154
1155 $ox -= $ev->{xrel};
1156 $oy -= $ev->{yrel};
1157
1158 $self->{vp}->set_offset ($ox, $oy);
1159 };
1160}
1161
1092sub invoke_mouse_wheel { 1162sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1163 my ($self, $ev) = @_;
1094 1164
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev); 1165 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1166 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1098 1167
1099 1 1168 1
1100} 1169}
1101 1170
1102sub update_slider { 1171sub invoke_button_down {
1103 my ($self) = @_; 1172 my ($self, $ev, $x, $y) = @_;
1104 1173
1105 my $child = ($self->{vp} or return)->child; 1174 if ($ev->{button} == 2) {
1175 $self->start_dragging ($ev);
1176 return 1;
1177 }
1106 1178
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1179 0
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114} 1180}
1115 1181
1116sub update { 1182sub invoke_button_up {
1117 my ($self) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1118 1184
1119 $self->SUPER::update; 1185 if (delete $self->{motion}) {
1120 $self->update_slider; 1186 return 1;
1187 }
1188
1189 0
1190}
1191
1192sub invoke_mouse_motion {
1193 my ($self, $ev, $x, $y) = @_;
1194
1195 if ($self->{motion}) {
1196 $self->{motion}->($ev, $x, $y);
1197 return 1;
1198 }
1199
1200 0
1121} 1201}
1122 1202
1123sub invoke_size_allocate { 1203sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1125 1205
… …
1127 $self->SUPER::invoke_size_allocate ($w, $h) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1128} 1208}
1129 1209
1130############################################################################# 1210#############################################################################
1131 1211
1132package CFPlus::UI::Frame; 1212package DC::UI::Frame;
1133 1213
1134our @ISA = CFPlus::UI::Bin::; 1214our @ISA = DC::UI::Bin::;
1135 1215
1136use CFPlus::OpenGL; 1216use DC::OpenGL;
1137 1217
1138sub new { 1218sub new {
1139 my $class = shift; 1219 my $class = shift;
1140 1220
1141 $class->SUPER::new ( 1221 $class->SUPER::new (
… …
1151 my ($w, $h) = @$self{qw(w h)}; 1231 my ($w, $h) = @$self{qw(w h)};
1152 1232
1153 glEnable GL_BLEND; 1233 glEnable GL_BLEND;
1154 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1155 glColor_premultiply @{ $self->{bg} }; 1235 glColor_premultiply @{ $self->{bg} };
1156
1157 glBegin GL_QUADS;
1158 glVertex 0 , 0;
1159 glVertex 0 , $h;
1160 glVertex $w, $h; 1236 glRect 0, 0, $w, $h;
1161 glVertex $w, 0;
1162 glEnd;
1163
1164 glDisable GL_BLEND; 1237 glDisable GL_BLEND;
1165 } 1238 }
1166 1239
1167 $self->SUPER::_draw; 1240 $self->SUPER::_draw;
1168} 1241}
1169 1242
1170############################################################################# 1243#############################################################################
1171 1244
1172package CFPlus::UI::FancyFrame; 1245package DC::UI::FancyFrame;
1173 1246
1174our @ISA = CFPlus::UI::Bin::; 1247our @ISA = DC::UI::Bin::;
1175 1248
1176use CFPlus::OpenGL; 1249use DC::OpenGL;
1177 1250
1178sub new { 1251sub new {
1179 my ($class, %arg) = @_; 1252 my ($class, %arg) = @_;
1180 1253
1181 if ((exists $arg{label}) && !ref $arg{label}) { 1254 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label 1255 $arg{label} = new DC::UI::Label
1183 align => 1, 1256 align => 1,
1184 valign => 0, 1257 valign => 0.5,
1185 text => $arg{label}, 1258 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75; 1259 fontsize => ($arg{border} || 0.8) * 0.75;
1187 } 1260 }
1188 1261
1189 my $self = $class->SUPER::new ( 1262 my $self = $class->SUPER::new (
1190 # label => "", 1263 # label => "",
1191 fg => [0.6, 0.3, 0.1], 1264 fg => undef,
1192 border => 0.8, 1265 border => 0.8,
1193 style => 'single', 1266 style => 'single',
1194 %arg, 1267 %arg,
1195 ); 1268 );
1196 1269
… …
1199 1272
1200sub add { 1273sub add {
1201 my ($self, @widgets) = @_; 1274 my ($self, @widgets) = @_;
1202 1275
1203 $self->SUPER::add (@widgets); 1276 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1277 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1205} 1278}
1206 1279
1207sub border { 1280sub border {
1208 int $_[0]{border} * $::FONTSIZE 1281 int $_[0]{border} * $::FONTSIZE
1209} 1282}
… …
1249 my $border = $self->border; 1322 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h}); 1323 my ($w, $h) = ($self->{w}, $self->{h});
1251 1324
1252 $child->draw; 1325 $child->draw;
1253 1326
1254 glColor @{$self->{fg}}; 1327 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1255 glBegin GL_LINE_STRIP; 1328 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1329 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1330 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1331 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1332 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1267 } 1340 }
1268} 1341}
1269 1342
1270############################################################################# 1343#############################################################################
1271 1344
1272package CFPlus::UI::Toplevel; 1345package DC::UI::Toplevel;
1273 1346
1274our @ISA = CFPlus::UI::Bin::; 1347our @ISA = DC::UI::Bin::;
1275 1348
1276use CFPlus::OpenGL; 1349use DC::OpenGL;
1277 1350
1278my $bg = 1351my $bg =
1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1352 new_from_resource DC::Texture "d1_bg.png",
1280 mipmap => 1, wrap => 1; 1353 mipmap => 1, wrap => 1;
1281 1354
1282my @border = 1355my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1356 map { new_from_resource DC::Texture $_, mipmap => 1 }
1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1357 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1358
1359my @icon =
1360 map { new_from_resource DC::Texture $_, mipmap => 1 }
1361 qw(x1_move.png x1_resize.png);
1285 1362
1286sub new { 1363sub new {
1287 my ($class, %arg) = @_; 1364 my ($class, %arg) = @_;
1288 1365
1289 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
1290 bg => [1, 1, 1, 1], 1367 bg => [1, 1, 1, 1],
1291 border_bg => [1, 1, 1, 1], 1368 border_bg => [1, 1, 1, 1],
1292 border => 0.6, 1369 border => 0.8,
1293 can_events => 1, 1370 can_events => 1,
1294 min_w => 64, 1371 min_w => 64,
1295 min_h => 32, 1372 min_h => 32,
1296 %arg, 1373 %arg,
1297 ); 1374 );
1298 1375
1299 $self->{title_widget} = new CFPlus::UI::Label 1376 $self->{title_widget} = new DC::UI::Label
1300 align => 0, 1377 align => 0.5,
1301 valign => 1, 1378 valign => 1,
1302 text => $self->{title}, 1379 text => $self->{title},
1303 fontsize => $self->{border}, 1380 fontsize => $self->{border},
1304 if exists $self->{title}; 1381 if exists $self->{title};
1305 1382
1306 if ($self->{has_close_button}) { 1383 if ($self->{has_close_button}) {
1307 $self->{close_button} = 1384 $self->{close_button} =
1308 new CFPlus::UI::ImageButton 1385 new DC::UI::ImageButton
1309 path => 'x1_close.png', 1386 path => 'x1_close.png',
1310 on_activate => sub { $self->emit ("delete") }; 1387 on_activate => sub { $self->emit ("delete") };
1311 1388
1312 $self->CFPlus::UI::Container::add ($self->{close_button}); 1389 $self->DC::UI::Container::add ($self->{close_button});
1313 } 1390 }
1314 1391
1315 $self 1392 $self
1316} 1393}
1317 1394
1318sub add { 1395sub add {
1319 my ($self, @widgets) = @_; 1396 my ($self, @widgets) = @_;
1320 1397
1321 $self->SUPER::add (@widgets); 1398 $self->SUPER::add (@widgets);
1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1399 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1400 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1324} 1401}
1325 1402
1326sub border { 1403sub border {
1327 int $_[0]{border} * $::FONTSIZE 1404 int $_[0]{border} * $::FONTSIZE
1405}
1406
1407sub get_max_wh {
1408 my ($self) = @_;
1409
1410 return ($self->{w}, $self->{h})
1411 if $self->{visible} && $self->{w};
1412
1413 $self->SUPER::get_max_wh
1328} 1414}
1329 1415
1330sub size_request { 1416sub size_request {
1331 my ($self) = @_; 1417 my ($self) = @_;
1332 1418
… …
1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459 1545
1460 my $border = $self->border; 1546 my $border = $self->border;
1461 1547
1462 glColor @{ $self->{border_bg} }; 1548 glColor @{ $self->{border_bg} };
1463 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1549 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1550 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1551 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1552 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1553
1554 # move
1555 my $w2 = ($w - $border) * .5;
1556 my $h2 = ($h - $border) * .5;
1557 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1558 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1559 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1560
1561 # resize
1562 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1564 unless $self->{has_close_button};
1565 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467 1567
1468 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1568 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469 glColor @{ $self->{bg} }; 1569 glColor @{ $self->{bg} };
1470 1570
1471 # TODO: repeat texture not scale 1571 # TODO: repeat texture not scale
… …
1490 if $self->{close_button}; 1590 if $self->{close_button};
1491} 1591}
1492 1592
1493############################################################################# 1593#############################################################################
1494 1594
1495package CFPlus::UI::Table; 1595package DC::UI::Table;
1496 1596
1497our @ISA = CFPlus::UI::Base::; 1597our @ISA = DC::UI::Container::;
1498 1598
1499use List::Util qw(max sum); 1599use List::Util qw(max sum);
1500 1600
1501use CFPlus::OpenGL; 1601use DC::OpenGL;
1502 1602
1503sub new { 1603sub new {
1504 my $class = shift; 1604 my $class = shift;
1505 1605
1506 $class->SUPER::new ( 1606 $class->SUPER::new (
… …
1508 row_expand => [], 1608 row_expand => [],
1509 @_, 1609 @_,
1510 ) 1610 )
1511} 1611}
1512 1612
1513sub children {
1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515}
1516
1517sub add { 1613sub add {
1614 my ($self, @widgets) = @_;
1615
1616 for my $child (@widgets) {
1617 $child->{c_rowspan} ||= 1;
1618 $child->{c_colspan} ||= 1;
1619 }
1620
1621 $self->SUPER::add (@widgets);
1622}
1623
1624sub add_at {
1518 my ($self) = shift; 1625 my $self = shift;
1626
1627 my @widgets;
1519 1628
1520 while (@_) { 1629 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, (); 1630 my ($col, $row, $child) = splice @_, 0, 3, ();
1522 $child->set_parent ($self);
1523 $self->{children}[$y][$x] = $child;
1524 }
1525 1631
1526 $self->{force_realloc} = 1; 1632 $child->{c_row} = $row;
1527 $self->{force_size_alloc} = 1; 1633 $child->{c_col} = $col;
1528 $self->realloc;
1529}
1530 1634
1531sub remove { 1635 push @widgets, $child;
1636 }
1637
1638 $self->add (@widgets);
1639}
1640
1641sub get_wh {
1532 my ($self, $child) = @_; 1642 my ($self) = @_;
1533 1643
1534 # TODO: not yet implemented 1644 my (@w, @h);
1535}
1536
1537# TODO: move to container class maybe? send children a signal on removal?
1538sub clear {
1539 my ($self) = @_;
1540 1645
1541 my @children = $self->children; 1646 my @children = $self->children;
1542 delete $self->{children}; 1647
1648 # first pass, columns
1649 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1650 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1651
1652 my $sw = sum @w[$c .. $c + $cs - 1];
1653
1654 if ($w > $sw) {
1655 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1656 }
1543 1657 }
1544 for (@children) {
1545 delete $_->{parent};
1546 $_->hide;
1547 }
1548 1658
1549 $self->realloc; 1659 # second pass, rows
1550} 1660 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1551
1552sub get_wh {
1553 my ($self) = @_;
1554
1555 my (@w, @h);
1556
1557 for my $y (0 .. $#{$self->{children}}) {
1558 my $row = $self->{children}[$y]
1559 or next;
1560
1561 for my $x (0 .. $#$row) {
1562 my $widget = $row->[$x]
1563 or next;
1564 my ($w, $h) = @$widget{qw(req_w req_h)}; 1661 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1565 1662
1566 $w[$x] = max $w[$x], $w; 1663 my $sh = sum @h[$r .. $r + $rs - 1];
1567 $h[$y] = max $h[$y], $h; 1664
1665 if ($h > $sh) {
1666 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568 } 1667 }
1569 } 1668 }
1570 1669
1571 (\@w, \@h) 1670 (\@w, \@h)
1572} 1671}
… …
1588 my ($ws, $hs) = $self->get_wh; 1687 my ($ws, $hs) = $self->get_wh;
1589 1688
1590 my $req_w = (sum @$ws) || 1; 1689 my $req_w = (sum @$ws) || 1;
1591 my $req_h = (sum @$hs) || 1; 1690 my $req_h = (sum @$hs) || 1;
1592 1691
1593 # TODO: nicer code 1692 # now linearly scale the rows/columns to the allocated size
1594 my @col_expand = @{$self->{col_expand}}; 1693 my @col_expand = @{$self->{col_expand}};
1595 @col_expand = (1) x @$ws unless @col_expand; 1694 @col_expand = (1) x @$ws unless @col_expand;
1596 my $col_expand = (sum @col_expand) || 1; 1695 my $col_expand = (sum @col_expand) || 1;
1597 1696
1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1697 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1599 1698
1600 CFPlus::UI::harmonize $ws; 1699 DC::UI::harmonize $ws;
1601 1700
1602 my @row_expand = @{$self->{row_expand}}; 1701 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand; 1702 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1; 1703 my $row_expand = (sum @row_expand) || 1;
1605 1704
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1705 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607 1706
1608 CFPlus::UI::harmonize $hs; 1707 DC::UI::harmonize $hs;
1609 1708
1610 my $y; 1709 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1710 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611 1711
1612 for my $r (0 .. $#{$self->{children}}) { 1712 for my $widget ($self->children) {
1613 my $row = $self->{children}[$r] 1713 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1614 or next;
1615 1714
1616 my $x = 0; 1715 $widget->configure (
1617 my $row_h = $hs->[$r]; 1716 $x[$c], $y[$r],
1717 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618 1718 );
1619 for my $c (0 .. $#$row) { 1719 }
1620 my $col_w = $ws->[$c];
1621 1720
1622 if (my $widget = $row->[$c]) { 1721 1
1623 $widget->configure ($x, $y, $col_w, $row_h); 1722}
1624 }
1625 1723
1626 $x += $col_w; 1724#############################################################################
1725
1726package DC::UI::Fixed;
1727
1728use List::Util qw(min max);
1729
1730our @ISA = DC::UI::Container::;
1731
1732sub _scale($$$) {
1733 my ($rel, $val, $max) = @_;
1734
1735 $rel ? $val * $max : $val
1736}
1737
1738sub size_request {
1739 my ($self) = @_;
1740
1741 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1742
1743 # determine overall size by querying abs widgets
1744 for my $child ($self->visible_children) {
1745 unless ($child->{c_rel}) {
1746 my $x = $child->{c_x};
1747 my $y = $child->{c_y};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1627 } 1751 }
1752 }
1628 1753
1629 $y += $row_h; 1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 # now layout remaining widgets
1758 for my $child ($self->visible_children) {
1759 if ($child->{c_rel}) {
1760 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1761 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 }
1766 }
1767
1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 ($W, $H)
1772}
1773
1774sub invoke_size_allocate {
1775 my ($self, $W, $H) = @_;
1776
1777 for my $child ($self->visible_children) {
1778 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1779 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1780
1781 $x += $child->{c_halign} * $child->{req_w};
1782 $y += $child->{c_valign} * $child->{req_h};
1783
1784 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1630 } 1785 }
1631 1786
1632 1 1787 1
1633} 1788}
1634 1789
1635sub find_widget {
1636 my ($self, $x, $y) = @_;
1637
1638 $x -= $self->{x};
1639 $y -= $self->{y};
1640
1641 my $res;
1642
1643 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1644 $res = $_->find_widget ($x, $y)
1645 and return $res;
1646 }
1647
1648 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1649}
1650
1651sub _draw {
1652 my ($self) = @_;
1653
1654 for (grep $_, @{$self->{children}}) {
1655 $_->draw for grep $_, @$_;
1656 }
1657}
1658
1659############################################################################# 1790#############################################################################
1660 1791
1661package CFPlus::UI::Box; 1792package DC::UI::Box;
1662 1793
1663our @ISA = CFPlus::UI::Container::; 1794our @ISA = DC::UI::Container::;
1664 1795
1665sub size_request { 1796sub size_request {
1666 my ($self) = @_; 1797 my ($self) = @_;
1798
1799 my @children = $self->visible_children;
1667 1800
1668 $self->{vertical} 1801 $self->{vertical}
1669 ? ( 1802 ? (
1670 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1803 (List::Util::max map $_->{req_w}, @children),
1671 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_h}, @children),
1672 ) 1805 )
1673 : ( 1806 : (
1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1807 (List::Util::sum map $_->{req_w}, @children),
1675 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1808 (List::Util::max map $_->{req_h}, @children),
1676 ) 1809 )
1677} 1810}
1678 1811
1679sub invoke_size_allocate { 1812sub invoke_size_allocate {
1680 my ($self, $w, $h) = @_; 1813 my ($self, $w, $h) = @_;
… …
1701 $req[$_] += $space * $children[$_]{expand} 1834 $req[$_] += $space * $children[$_]{expand}
1702 for 0 .. $#children; 1835 for 0 .. $#children;
1703 } 1836 }
1704 } 1837 }
1705 1838
1706 CFPlus::UI::harmonize \@req; 1839 DC::UI::harmonize \@req;
1707 1840
1708 my $pos = 0; 1841 my $pos = 0;
1709 for (0 .. $#children) { 1842 for (0 .. $#children) {
1710 my $alloc = $req[$_]; 1843 my $alloc = $req[$_];
1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1844 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1716 1 1849 1
1717} 1850}
1718 1851
1719############################################################################# 1852#############################################################################
1720 1853
1721package CFPlus::UI::HBox; 1854package DC::UI::HBox;
1722 1855
1723our @ISA = CFPlus::UI::Box::; 1856our @ISA = DC::UI::Box::;
1724 1857
1725sub new { 1858sub new {
1726 my $class = shift; 1859 my $class = shift;
1727 1860
1728 $class->SUPER::new ( 1861 $class->SUPER::new (
… …
1731 ) 1864 )
1732} 1865}
1733 1866
1734############################################################################# 1867#############################################################################
1735 1868
1736package CFPlus::UI::VBox; 1869package DC::UI::VBox;
1737 1870
1738our @ISA = CFPlus::UI::Box::; 1871our @ISA = DC::UI::Box::;
1739 1872
1740sub new { 1873sub new {
1741 my $class = shift; 1874 my $class = shift;
1742 1875
1743 $class->SUPER::new ( 1876 $class->SUPER::new (
… …
1746 ) 1879 )
1747} 1880}
1748 1881
1749############################################################################# 1882#############################################################################
1750 1883
1751package CFPlus::UI::Label; 1884package DC::UI::Label;
1752 1885
1753our @ISA = CFPlus::UI::DrawBG::; 1886our @ISA = DC::UI::DrawBG::;
1754 1887
1755use CFPlus::OpenGL; 1888use DC::OpenGL;
1756 1889
1757sub new { 1890sub new {
1758 my ($class, %arg) = @_; 1891 my ($class, %arg) = @_;
1759 1892
1760 my $self = $class->SUPER::new ( 1893 my $self = $class->SUPER::new (
… …
1765 #text => initial text 1898 #text => initial text
1766 #markup => initial narkup 1899 #markup => initial narkup
1767 #max_w => maximum pixel width 1900 #max_w => maximum pixel width
1768 #style => 0, # render flags 1901 #style => 0, # render flags
1769 ellipsise => 3, # end 1902 ellipsise => 3, # end
1770 layout => (new CFPlus::Layout), 1903 layout => (new DC::Layout),
1771 fontsize => 1, 1904 fontsize => 1,
1772 align => -1, 1905 align => 0.5,
1773 valign => -1, 1906 valign => 0.5,
1774 padding_x => 2, 1907 padding_x => 4,
1775 padding_y => 2, 1908 padding_y => 2,
1776 can_events => 0, 1909 can_events => 0,
1777 %arg 1910 %arg
1778 ); 1911 );
1779 1912
1780 if (exists $self->{template}) { 1913 if (exists $self->{template}) {
1781 my $layout = new CFPlus::Layout; 1914 my $layout = new DC::Layout;
1782 $layout->set_text (delete $self->{template}); 1915 $layout->set_text (delete $self->{template});
1783 $self->{template} = $layout; 1916 $self->{template} = $layout;
1784 } 1917 }
1785 1918
1786 if (exists $self->{markup}) { 1919 if (exists $self->{markup}) {
… …
1804 1937
1805 delete $self->{ox}; 1938 delete $self->{ox};
1806 $self->SUPER::realloc; 1939 $self->SUPER::realloc;
1807} 1940}
1808 1941
1942sub clear {
1943 my ($self) = @_;
1944
1945 $self->set_text ("");
1946}
1947
1809sub set_text { 1948sub set_text {
1810 my ($self, $text) = @_; 1949 my ($self, $text) = @_;
1811 1950
1812 return if $self->{text} eq "T$text"; 1951 return if $self->{text} eq "T$text";
1813 $self->{text} = "T$text"; 1952 $self->{text} = "T$text";
… …
1836 1975
1837sub size_request { 1976sub size_request {
1838 my ($self) = @_; 1977 my ($self) = @_;
1839 1978
1840 $self->{size_req} ||= do { 1979 $self->{size_req} ||= do {
1980 my ($max_w, $max_h) = $self->get_max_wh;
1981
1841 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1982 $self->{layout}->set_font ($self->{font}) if $self->{font};
1842 $self->{layout}->set_width ($self->{max_w} || -1); 1983 $self->{layout}->set_width ($max_w);
1843 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1984 $self->{layout}->set_ellipsise ($self->{ellipsise});
1844 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1985 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1986 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1846 1987
1847 my ($w, $h) = $self->{layout}->size; 1988 my ($w, $h) = $self->{layout}->size;
1848 1989
1849 if (exists $self->{template}) { 1990 if (exists $self->{template}) {
1850 $self->{template}->set_font ($self->{font}) if $self->{font}; 1991 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1); 1992 $self->{template}->set_width ($max_w);
1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1993 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1853 1994
1854 my ($w2, $h2) = $self->{template}->size; 1995 my ($w2, $h2) = $self->{template}->size;
1855 1996
1856 $w = List::Util::max $w, $w2; 1997 $w = List::Util::max $w, $w2;
… …
1912 2053
1913 [$self->{layout}->size] 2054 [$self->{layout}->size]
1914 }; 2055 };
1915 2056
1916 unless (exists $self->{ox}) { 2057 unless (exists $self->{ox}) {
1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2058 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2059 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1919 : ($self->{w} - $size->[0]) * 0.5);
1920 2060
1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2061 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1923 : ($self->{h} - $size->[1]) * 0.5);
1924 }; 2062 };
1925 2063
1926 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2064# unless ($self->{list}) {
1927 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2065# $self->{list} = DC::OpenGL::glGenList;
1928 2066# DC::OpenGL::glNewList $self->{list};
1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2067# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2068# DC::OpenGL::glEndList;
2069# }
2070#
2071# DC::OpenGL::glCallList $self->{list};
2072
2073 $self->{layout}->draw;
1930} 2074}
2075
2076#sub destroy {
2077# my ($self) = @_;
2078#
2079# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2080#
2081# $self->SUPER::destroy;
2082#}
1931 2083
1932############################################################################# 2084#############################################################################
1933 2085
1934package CFPlus::UI::EntryBase; 2086package DC::UI::EntryBase;
1935 2087
1936our @ISA = CFPlus::UI::Label::; 2088our @ISA = DC::UI::Label::;
1937 2089
1938use CFPlus::OpenGL; 2090use DC::OpenGL;
1939 2091
1940sub new { 2092sub new {
1941 my $class = shift; 2093 my $class = shift;
1942 2094
1943 $class->SUPER::new ( 2095 $class->SUPER::new (
1944 fg => [1, 1, 1], 2096 fg => [1, 1, 1],
1945 bg => [0, 0, 0, 0.2], 2097 bg => [0, 0, 0, 0.2],
2098 outline => undef,
1946 active_bg => [1, 1, 1, 0.5], 2099 active_bg => [0, 0, 1, .2],
1947 active_fg => [0, 0, 0], 2100 active_fg => [1, 1, 1],
2101 active_outline => [1, 1, 0],
1948 can_hover => 1, 2102 can_hover => 1,
1949 can_focus => 1, 2103 can_focus => 1,
2104 align => 0,
1950 valign => 0, 2105 valign => 0.5,
1951 can_events => 1, 2106 can_events => 1,
1952 ellipsise => 0, 2107 ellipsise => 0,
2108 padding_x => 4,
2109 padding_y => 2,
1953 #text => ... 2110 #text => ...
1954 #hidden => "*", 2111 #hidden => "*",
1955 @_ 2112 @_
1956 ) 2113 )
1957} 2114}
… …
2004 2161
2005 my $text = $self->get_text; 2162 my $text = $self->get_text;
2006 2163
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008 2165
2009 if ($uni == 8) { 2166 if ($sym == DC::SDLK_BACKSPACE) {
2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2011 } elsif ($uni == 127) { 2168 } elsif ($sym == DC::SDLK_DELETE) {
2012 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
2013 } elsif ($sym == CFPlus::SDLK_LEFT) { 2170 } elsif ($sym == DC::SDLK_LEFT) {
2014 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
2015 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2172 } elsif ($sym == DC::SDLK_RIGHT) {
2016 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2017 } elsif ($sym == CFPlus::SDLK_HOME) { 2174 } elsif ($sym == DC::SDLK_HOME) {
2018 # what a hack 2175 # what a hack
2019 $self->{cursor} = 2176 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2177 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1 2178 ? length $1
2022 : 0; 2179 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) { 2180 } elsif ($sym == DC::SDLK_END) {
2024 # uh, again 2181 # uh, again
2025 $self->{cursor} = 2182 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2183 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1 2184 ? $self->{cursor} + length $1
2028 : length $self->{text}; 2185 : length $self->{text};
… …
2092 glColor_premultiply @{$self->{bg}}; 2249 glColor_premultiply @{$self->{bg}};
2093 } 2250 }
2094 2251
2095 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2096 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2097 glBegin GL_QUADS;
2098 glVertex 0 , 0;
2099 glVertex 0 , $self->{h};
2100 glVertex $self->{w}, $self->{h}; 2254 glRect 0, 0, $self->{w}, $self->{h};
2101 glVertex $self->{w}, 0;
2102 glEnd;
2103 glDisable GL_BLEND; 2255 glDisable GL_BLEND;
2104 2256
2105 $self->SUPER::_draw; 2257 $self->SUPER::_draw;
2106 2258
2107 #TODO: force update every cursor change :( 2259 #TODO: force update every cursor change :(
… …
2109 2261
2110 unless (exists $self->{cur_h}) { 2262 unless (exists $self->{cur_h}) {
2111 my $text = substr $self->{text}, 0, $self->{cursor}; 2263 my $text = substr $self->{text}, 0, $self->{cursor};
2112 utf8::encode $text; 2264 utf8::encode $text;
2113 2265
2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2266 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2115 } 2267 }
2116 2268
2269 glColor_premultiply @{$self->{active_fg}};
2117 glBegin GL_LINES; 2270 glBegin GL_LINES;
2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2271 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2272 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2120 glEnd; 2273 glEnd;
2274
2275 glLineWidth 3;
2276 glColor @{$self->{active_outline}};
2277 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2278 glLineWidth 1;
2279
2280 } else {
2281 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2282 glBegin GL_LINE_STRIP;
2283 glVertex .5, $self->{h} * .5;
2284 glVertex .5, $self->{h} - 2.5;
2285 glVertex $self->{w} - .5, $self->{h} - 2.5;
2286 glVertex $self->{w} - .5, $self->{h} * .5;
2287 glEnd;
2121 } 2288 }
2122} 2289}
2123 2290
2124############################################################################# 2291#############################################################################
2125 2292
2126package CFPlus::UI::Entry; 2293package DC::UI::Entry;
2127 2294
2128our @ISA = CFPlus::UI::EntryBase::; 2295our @ISA = DC::UI::EntryBase::;
2129 2296
2130use CFPlus::OpenGL; 2297use DC::OpenGL;
2298
2299sub new {
2300 my $class = shift;
2301
2302 $class->SUPER::new (
2303 history_pointer => -1,
2304 @_
2305 )
2306}
2307
2131 2308
2132sub invoke_key_down { 2309sub invoke_key_down {
2133 my ($self, $ev) = @_; 2310 my ($self, $ev) = @_;
2134 2311
2135 my $sym = $ev->{sym}; 2312 my $sym = $ev->{sym};
… …
2141 $self->{history_pointer} = -1; 2318 $self->{history_pointer} = -1;
2142 $self->{history_saveback} = ''; 2319 $self->{history_saveback} = '';
2143 $self->emit (activate => $txt); 2320 $self->emit (activate => $txt);
2144 $self->update; 2321 $self->update;
2145 2322
2146 } elsif ($sym == CFPlus::SDLK_UP) { 2323 } elsif ($sym == DC::SDLK_UP) {
2147 if ($self->{history_pointer} < 0) { 2324 if ($self->{history_pointer} < 0) {
2148 $self->{history_saveback} = $self->get_text; 2325 $self->{history_saveback} = $self->get_text;
2149 } 2326 }
2150 if (@{$self->{history} || []} > 0) { 2327 if (@{$self->{history} || []} > 0) {
2151 $self->{history_pointer}++; 2328 $self->{history_pointer}++;
… …
2153 $self->{history_pointer} = @{$self->{history} || []} - 1; 2330 $self->{history_pointer} = @{$self->{history} || []} - 1;
2154 } 2331 }
2155 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2332 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2156 } 2333 }
2157 2334
2158 } elsif ($sym == CFPlus::SDLK_DOWN) { 2335 } elsif ($sym == DC::SDLK_DOWN) {
2159 $self->{history_pointer}--; 2336 $self->{history_pointer}--;
2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2337 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2161 2338
2162 if ($self->{history_pointer} >= 0) { 2339 if ($self->{history_pointer} >= 0) {
2163 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2340 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2164 } else { 2341 } else {
2342 if (defined $self->{history_saveback}) {
2165 $self->set_text ($self->{history_saveback}); 2343 $self->set_text ($self->{history_saveback});
2344 $self->{history_saveback} = undef;
2345 }
2166 } 2346 }
2167 2347
2168 } else { 2348 } else {
2169 return $self->SUPER::invoke_key_down ($ev) 2349 return $self->SUPER::invoke_key_down ($ev)
2170 } 2350 }
… …
2172 1 2352 1
2173} 2353}
2174 2354
2175############################################################################# 2355#############################################################################
2176 2356
2177package CFPlus::UI::TextEdit; 2357package DC::UI::TextEdit;
2178 2358
2179our @ISA = CFPlus::UI::EntryBase::; 2359our @ISA = DC::UI::EntryBase::;
2180 2360
2181use CFPlus::OpenGL; 2361use DC::OpenGL;
2362
2363sub new {
2364 my $class = shift;
2365
2366 $class->SUPER::new (
2367 padding_y => 4,
2368
2369 @_
2370 )
2371}
2182 2372
2183sub move_cursor_ver { 2373sub move_cursor_ver {
2184 my ($self, $dy) = @_; 2374 my ($self, $dy) = @_;
2185 2375
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2376 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187 2377
2188 $y += $dy; 2378 $line += $dy;
2189 2379
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2380 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2191 $self->{cursor} = $index; 2381 $self->{cursor} = $index;
2192 delete $self->{cur_h}; 2382 delete $self->{cur_h};
2193 $self->update; 2383 $self->update;
2194 return; 2384 return;
2195 } 2385 }
… …
2198sub invoke_key_down { 2388sub invoke_key_down {
2199 my ($self, $ev) = @_; 2389 my ($self, $ev) = @_;
2200 2390
2201 my $sym = $ev->{sym}; 2391 my $sym = $ev->{sym};
2202 2392
2203 if ($sym == CFPlus::SDLK_UP) { 2393 if ($sym == DC::SDLK_UP) {
2204 $self->move_cursor_ver (-1); 2394 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) { 2395 } elsif ($sym == DC::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1); 2396 $self->move_cursor_ver (+1);
2207 } else { 2397 } else {
2208 return $self->SUPER::invoke_key_down ($ev) 2398 return $self->SUPER::invoke_key_down ($ev)
2209 } 2399 }
2210 2400
2211 1 2401 1
2212} 2402}
2213 2403
2214############################################################################# 2404#############################################################################
2215 2405
2216package CFPlus::UI::Button; 2406package DC::UI::ButtonBin;
2217 2407
2218our @ISA = CFPlus::UI::Label::; 2408our @ISA = DC::UI::Bin::;
2219 2409
2220use CFPlus::OpenGL; 2410use DC::OpenGL;
2221 2411
2222my @tex = 2412my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2413 map { new_from_resource DC::Texture $_, mipmap => 1 }
2224 qw(b1_button_active.png); 2414 qw(b1_button_inactive.png b1_button_active.png);
2225 2415
2226sub new { 2416sub new {
2227 my $class = shift; 2417 my $class = shift;
2228 2418
2229 $class->SUPER::new ( 2419 $class->SUPER::new (
2230 padding_x => 4,
2231 padding_y => 4,
2232 fg => [1, 1, 1],
2233 active_fg => [0, 0, 1],
2234 can_hover => 1, 2420 can_hover => 1,
2235 align => 0, 2421 align => 0.5,
2236 valign => 0, 2422 valign => 0.5,
2237 can_events => 1, 2423 can_events => 1,
2238 @_ 2424 @_
2239 ) 2425 )
2240} 2426}
2241 2427
… …
2250} 2436}
2251 2437
2252sub _draw { 2438sub _draw {
2253 my ($self) = @_; 2439 my ($self) = @_;
2254 2440
2255 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2256
2257 glEnable GL_TEXTURE_2D; 2441 glEnable GL_TEXTURE_2D;
2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2442 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259 glColor 0, 0, 0, 1; 2443 glColor 0, 0, 0, 1;
2260 2444
2445 my $tex = $tex[$GRAB == $self];
2261 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2446 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262 2447
2263 glDisable GL_TEXTURE_2D; 2448 glDisable GL_TEXTURE_2D;
2264 2449
2265 $self->SUPER::_draw; 2450 $self->SUPER::_draw;
2266} 2451}
2267 2452
2268############################################################################# 2453#############################################################################
2269 2454
2270package CFPlus::UI::CheckBox; 2455package DC::UI::Button;
2271 2456
2272our @ISA = CFPlus::UI::DrawBG::; 2457our @ISA = DC::UI::Label::;
2458
2459use DC::OpenGL;
2273 2460
2274my @tex = 2461my @tex =
2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2462 map { new_from_resource DC::Texture $_, mipmap => 1 }
2463 qw(b1_button_inactive.png b1_button_active.png);
2464
2465sub new {
2466 my $class = shift;
2467
2468 $class->SUPER::new (
2469 padding_x => 8,
2470 padding_y => 4,
2471 fg => [1.0, 1.0, 1.0],
2472 active_fg => [0.8, 0.8, 0.8],
2473 can_hover => 1,
2474 align => 0.5,
2475 valign => 0.5,
2476 can_events => 1,
2477 @_
2478 )
2479}
2480
2481sub invoke_button_up {
2482 my ($self, $ev, $x, $y) = @_;
2483
2484 $self->emit ("activate")
2485 if $x >= 0 && $x < $self->{w}
2486 && $y >= 0 && $y < $self->{h};
2487
2488 1
2489}
2490
2491sub _draw {
2492 my ($self) = @_;
2493
2494 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2495
2496 glEnable GL_TEXTURE_2D;
2497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2498 glColor 0, 0, 0, 1;
2499
2500 my $tex = $tex[$GRAB == $self];
2501 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2502
2503 glDisable GL_TEXTURE_2D;
2504
2505 $self->SUPER::_draw;
2506}
2507
2508#############################################################################
2509
2510package DC::UI::CheckBox;
2511
2512our @ISA = DC::UI::DrawBG::;
2513
2514my @tex =
2515 map { new_from_resource DC::Texture $_, mipmap => 1 }
2276 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2516 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2277 2517
2278use CFPlus::OpenGL; 2518use DC::OpenGL;
2279 2519
2280sub new { 2520sub new {
2281 my $class = shift; 2521 my $class = shift;
2282 2522
2283 $class->SUPER::new ( 2523 $class->SUPER::new (
… …
2323sub _draw { 2563sub _draw {
2324 my ($self) = @_; 2564 my ($self) = @_;
2325 2565
2326 $self->SUPER::_draw; 2566 $self->SUPER::_draw;
2327 2567
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2568 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2329 2569
2330 my ($w, $h) = @$self{qw(w h)}; 2570 my ($w, $h) = @$self{qw(w h)};
2331 2571
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2572 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333 2573
… …
2340 glDisable GL_TEXTURE_2D; 2580 glDisable GL_TEXTURE_2D;
2341} 2581}
2342 2582
2343############################################################################# 2583#############################################################################
2344 2584
2345package CFPlus::UI::Image; 2585package DC::UI::Image;
2346 2586
2347our @ISA = CFPlus::UI::Base::; 2587our @ISA = DC::UI::Base::;
2348 2588
2349use CFPlus::OpenGL; 2589use DC::OpenGL;
2350 2590
2351our %texture_cache; 2591our %texture_cache;
2352 2592
2353sub new { 2593sub new {
2354 my $class = shift; 2594 my $class = shift;
2355 2595
2356 my $self = $class->SUPER::new ( 2596 my $self = $class->SUPER::new (
2357 can_events => 0, 2597 can_events => 0,
2598 scale => 1,
2358 @_, 2599 @_,
2359 ); 2600 );
2360 2601
2361 $self->{path} || $self->{tex} 2602 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required"; 2603 or Carp::croak "'path' or 'tex' attributes required";
2363 2604
2364 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2605 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2606 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2366 2607
2367 CFPlus::weaken $texture_cache{$self->{path}}; 2608 DC::weaken $texture_cache{$self->{path}};
2368 2609
2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2610 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2370 2611
2371 $self 2612 $self
2372} 2613}
2373 2614
2374sub STORABLE_freeze { 2615sub STORABLE_freeze {
2375 my ($self, $cloning) = @_; 2616 my ($self, $cloning) = @_;
2376 2617
2377 $self->{path} 2618 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2619 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2379 2620
2380 $self->{path} 2621 $self->{path}
2381} 2622}
2382 2623
2383sub STORABLE_attach { 2624sub STORABLE_attach {
… …
2387} 2628}
2388 2629
2389sub size_request { 2630sub size_request {
2390 my ($self) = @_; 2631 my ($self) = @_;
2391 2632
2392 ($self->{tex}{w}, $self->{tex}{h}) 2633 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2393} 2634}
2394 2635
2395sub _draw { 2636sub _draw {
2396 my ($self) = @_; 2637 my ($self) = @_;
2397 2638
… …
2407 } 2648 }
2408 2649
2409 glEnable GL_TEXTURE_2D; 2650 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411 2652
2412 $tex->draw_quad (0, 0, $w, $h); 2653 $tex->draw_quad_alpha (0, 0, $w, $h);
2413 2654
2414 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2415} 2656}
2416 2657
2417############################################################################# 2658#############################################################################
2418 2659
2419package CFPlus::UI::ImageButton; 2660package DC::UI::ImageButton;
2420 2661
2421our @ISA = CFPlus::UI::Image::; 2662our @ISA = DC::UI::Image::;
2422 2663
2423use CFPlus::OpenGL; 2664use DC::OpenGL;
2424 2665
2425my %textures; 2666my %textures;
2426 2667
2427sub new { 2668sub new {
2428 my $class = shift; 2669 my $class = shift;
… …
2431 padding_x => 4, 2672 padding_x => 4,
2432 padding_y => 4, 2673 padding_y => 4,
2433 fg => [1, 1, 1], 2674 fg => [1, 1, 1],
2434 active_fg => [0, 0, 1], 2675 active_fg => [0, 0, 1],
2435 can_hover => 1, 2676 can_hover => 1,
2436 align => 0, 2677 align => 0.5,
2437 valign => 0, 2678 valign => 0.5,
2438 can_events => 1, 2679 can_events => 1,
2439 @_ 2680 @_
2440 ); 2681 );
2441} 2682}
2442 2683
2684sub invoke_button_down {
2685 my ($self, $ev, $x, $y) = @_;
2686
2687 1
2688}
2689
2443sub invoke_button_up { 2690sub invoke_button_up {
2444 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2445 2692
2446 $self->emit ("activate") 2693 $self->emit ("activate")
2447 if $x >= 0 && $x < $self->{w} 2694 if $x >= 0 && $x < $self->{w}
… …
2450 1 2697 1
2451} 2698}
2452 2699
2453############################################################################# 2700#############################################################################
2454 2701
2455package CFPlus::UI::VGauge; 2702package DC::UI::VGauge;
2456 2703
2457our @ISA = CFPlus::UI::Base::; 2704our @ISA = DC::UI::Base::;
2458 2705
2459use List::Util qw(min max); 2706use List::Util qw(min max);
2460 2707
2461use CFPlus::OpenGL; 2708use DC::OpenGL;
2462 2709
2463my %tex = ( 2710my %tex = (
2464 food => [ 2711 food => [
2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2712 map { new_from_resource DC::Texture $_, mipmap => 1 }
2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2713 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2467 ], 2714 ],
2468 grace => [ 2715 grace => [
2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2716 map { new_from_resource DC::Texture $_, mipmap => 1 }
2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2717 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2471 ], 2718 ],
2472 hp => [ 2719 hp => [
2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2720 map { new_from_resource DC::Texture $_, mipmap => 1 }
2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2721 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2475 ], 2722 ],
2476 mana => [ 2723 mana => [
2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2725 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2479 ], 2726 ],
2480); 2727);
2481 2728
2482# eg. VGauge->new (gauge => 'food'), default gauge: food 2729# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2585 glDisable GL_TEXTURE_2D; 2832 glDisable GL_TEXTURE_2D;
2586} 2833}
2587 2834
2588############################################################################# 2835#############################################################################
2589 2836
2837package DC::UI::Progress;
2838
2839our @ISA = DC::UI::Label::;
2840
2841use DC::OpenGL;
2842
2843sub new {
2844 my ($class, %arg) = @_;
2845
2846 my $self = $class->SUPER::new (
2847 fg => [1, 1, 1],
2848 bg => [0, 0, 1, 0.2],
2849 bar => [0.7, 0.5, 0.1, 0.8],
2850 outline => [0.4, 0.3, 0],
2851 fontsize => 0.9,
2852 valign => 0.5,
2853 align => 0.5,
2854 can_events => 1,
2855 ellipsise => 1,
2856 label => "%d%%",
2857 %arg,
2858 );
2859
2860 $self->set_value ($arg{value} || -1);
2861
2862 $self
2863}
2864
2865sub set_label {
2866 my ($self, $label) = @_;
2867
2868 return if $self->{label} eq $label;
2869 $self->{label} = $label;
2870
2871 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2872}
2873
2874sub set_value {
2875 my ($self, $value) = @_;
2876
2877 if ($self->{value} ne $value) {
2878 $self->{value} = $value;
2879
2880 if ($value < 0) {
2881 $self->set_text ("-");
2882 } else {
2883 $self->set_text (sprintf $self->{label}, $value * 100);
2884 }
2885
2886 $self->update;
2887 }
2888}
2889
2890sub _draw {
2891 my ($self) = @_;
2892
2893 glEnable GL_BLEND;
2894 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2895
2896 if ($self->{value} >= 0) {
2897 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2898
2899 glColor_premultiply @{$self->{bar}};
2900 glRect 2, 2, $s, $self->{h} - 2;
2901 glColor_premultiply @{$self->{bg}};
2902 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2903 }
2904
2905 glColor_premultiply @{$self->{outline}};
2906 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2907
2908 glDisable GL_BLEND;
2909
2910 {
2911 local $self->{bg}; # do not draw background
2912 $self->SUPER::_draw;
2913 }
2914}
2915
2916#############################################################################
2917
2918package DC::UI::ExperienceProgress;
2919
2920our @ISA = DC::UI::Progress::;
2921
2922sub new {
2923 my ($class, %arg) = @_;
2924
2925 my $self = $class->SUPER::new (
2926 tooltip => sub {
2927 my ($self) = @_;
2928
2929 sprintf "level %d\n%s points\n%s next level\n%s to go",
2930 $self->{lvl},
2931 ::formsep ($self->{exp}),
2932 ::formsep ($self->{nxt}),
2933 ::formsep ($self->{nxt} - $self->{exp}),
2934 },
2935 %arg
2936 );
2937
2938 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2939 if $::CONN;
2940
2941 $self
2942}
2943
2944sub DESTROY {
2945 my ($self) = @_;
2946
2947 delete $::CONN->{on_exp_update}{$self+0}
2948 if $::CONN;
2949
2950 $self->SUPER::DESTROY;
2951}
2952
2953sub set_value {
2954 my ($self, $lvl, $exp) = @_;
2955
2956 $self->{lvl} = $lvl;
2957 $self->{exp} = $exp;
2958
2959 my $v = -1;
2960
2961 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2962 my $l0 = $table->[$lvl - 1];
2963 my $l1 = $table->[$lvl];
2964
2965 $self->{nxt} = $l1;
2966
2967 $v = ($exp - $l0) / ($l1 - $l0);
2968 }
2969
2970 $self->SUPER::set_value ($v);
2971}
2972
2973#############################################################################
2974
2590package CFPlus::UI::Gauge; 2975package DC::UI::Gauge;
2591 2976
2592our @ISA = CFPlus::UI::VBox::; 2977our @ISA = DC::UI::VBox::;
2593 2978
2594sub new { 2979sub new {
2595 my ($class, %arg) = @_; 2980 my ($class, %arg) = @_;
2596 2981
2597 my $self = $class->SUPER::new ( 2982 my $self = $class->SUPER::new (
… …
2599 can_hover => 1, 2984 can_hover => 1,
2600 can_events => 1, 2985 can_events => 1,
2601 %arg, 2986 %arg,
2602 ); 2987 );
2603 2988
2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2989 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2990 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2991 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2607 2992
2608 $self 2993 $self
2609} 2994}
2610 2995
2611sub set_fontsize { 2996sub set_fontsize {
… …
2632 $self->{value}->set_text ($val); 3017 $self->{value}->set_text ($val);
2633} 3018}
2634 3019
2635############################################################################# 3020#############################################################################
2636 3021
2637package CFPlus::UI::Slider; 3022package DC::UI::Slider;
2638 3023
2639use strict; 3024use strict;
2640 3025
2641use CFPlus::OpenGL; 3026use DC::OpenGL;
2642 3027
2643our @ISA = CFPlus::UI::DrawBG::; 3028our @ISA = DC::UI::DrawBG::;
2644 3029
2645my @tex = 3030my @tex =
2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3031 map { new_from_resource DC::Texture $_ }
2647 qw(s1_slider.png s1_slider_bg.png); 3032 qw(s1_slider.png s1_slider_bg.png);
2648 3033
2649sub new { 3034sub new {
2650 my $class = shift; 3035 my $class = shift;
2651 3036
… …
2688sub set_value { 3073sub set_value {
2689 my ($self, $value) = @_; 3074 my ($self, $value) = @_;
2690 3075
2691 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2692 3077
2693 $hi = $lo + 1 if $hi <= $lo; 3078 $hi = $lo if $hi < $lo;
2694 3079
2695 $page = $hi - $lo if $page > $hi - $lo; 3080 $value = $hi - $page if $value > $hi - $page;
2696
2697 $value = $lo if $value < $lo; 3081 $value = $lo if $value < $lo;
2698 $value = $hi - $page if $value > $hi - $page;
2699 3082
2700 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2701 if $unit; 3084 if $unit;
2702 3085
2703 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3086 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2719 3102
2720 $self->SUPER::invoke_button_down ($ev, $x, $y); 3103 $self->SUPER::invoke_button_down ($ev, $x, $y);
2721 3104
2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3105 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2723 3106
2724 $self->invoke_mouse_motion ($ev, $x, $y) 3107 $self->invoke_mouse_motion ($ev, $x, $y);
3108
3109 1
2725} 3110}
2726 3111
2727sub invoke_mouse_motion { 3112sub invoke_mouse_motion {
2728 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2729 3114
… …
2745sub invoke_mouse_wheel { 3130sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_; 3131 my ($self, $ev) = @_;
2747 3132
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3133 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749 3134
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3135 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2751 3136
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3137 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753 3138
2754 ! ! $delta 3139 1
2755} 3140}
2756 3141
2757sub update { 3142sub update {
2758 my ($self) = @_; 3143 my ($self) = @_;
2759 3144
… …
2765 my ($self) = @_; 3150 my ($self) = @_;
2766 3151
2767 unless ($self->{knob_w}) { 3152 unless ($self->{knob_w}) {
2768 $self->set_value ($self->{range}[0]); 3153 $self->set_value ($self->{range}[0]);
2769 3154
2770 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3155 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2771 my $range = ($hi - $page - $lo) || 1e-100; 3156 my $range = ($hi - $page - $lo) || 1e-10;
2772 3157
2773 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3158 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2774 3159
2775 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3160 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2776 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3161 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2777 3162
2778 $value = ($value - $lo) / $range; 3163 $value = ($value - $lo) / $range;
… …
2808 glDisable GL_TEXTURE_2D; 3193 glDisable GL_TEXTURE_2D;
2809} 3194}
2810 3195
2811############################################################################# 3196#############################################################################
2812 3197
2813package CFPlus::UI::ValSlider; 3198package DC::UI::ValSlider;
2814 3199
2815our @ISA = CFPlus::UI::HBox::; 3200our @ISA = DC::UI::HBox::;
2816 3201
2817sub new { 3202sub new {
2818 my ($class, %arg) = @_; 3203 my ($class, %arg) = @_;
2819 3204
2820 my $range = delete $arg{range}; 3205 my $range = delete $arg{range};
2821 3206
2822 my $self = $class->SUPER::new ( 3207 my $self = $class->SUPER::new (
2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3208 slider => (new DC::UI::Slider expand => 1, range => $range),
2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3209 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2825 to_value => sub { shift }, 3210 to_value => sub { shift },
2826 from_value => sub { shift }, 3211 from_value => sub { shift },
2827 %arg, 3212 %arg,
2828 ); 3213 );
2829 3214
… …
2849sub set_range { shift->{slider}->set_range (@_) } 3234sub set_range { shift->{slider}->set_range (@_) }
2850sub set_value { shift->{slider}->set_value (@_) } 3235sub set_value { shift->{slider}->set_value (@_) }
2851 3236
2852############################################################################# 3237#############################################################################
2853 3238
2854package CFPlus::UI::TextScroller; 3239package DC::UI::TextScroller;
2855 3240
2856our @ISA = CFPlus::UI::HBox::; 3241our @ISA = DC::UI::HBox::;
2857 3242
2858use CFPlus::OpenGL; 3243use DC::OpenGL;
2859 3244
2860sub new { 3245sub new {
2861 my $class = shift; 3246 my $class = shift;
2862 3247
2863 my $self = $class->SUPER::new ( 3248 my $self = $class->SUPER::new (
… …
2865 can_events => 1, 3250 can_events => 1,
2866 indent => 0, 3251 indent => 0,
2867 #font => default_font 3252 #font => default_font
2868 @_, 3253 @_,
2869 3254
2870 layout => (new CFPlus::Layout), 3255 layout => (new DC::Layout),
2871 par => [], 3256 par => [],
2872 max_par => 0, 3257 max_par => 0,
2873 height => 0, 3258 height => 0,
2874 children => [ 3259 children => [
2875 (new CFPlus::UI::Empty expand => 1), 3260 (new DC::UI::Empty expand => 1),
2876 (new CFPlus::UI::Slider vertical => 1), 3261 (new DC::UI::Slider vertical => 1),
2877 ], 3262 ],
2878 ); 3263 );
2879 3264
2880 $self->{children}[1]->connect (changed => sub { $self->update }); 3265 $self->{children}[1]->connect (changed => sub { $self->update });
2881 3266
… …
2890} 3275}
2891 3276
2892sub size_request { 3277sub size_request {
2893 my ($self) = @_; 3278 my ($self) = @_;
2894 3279
2895 my ($empty, $slider) = @{ $self->{children} }; 3280 my ($empty, $slider) = $self->visible_children;
2896 3281
2897 local $self->{children} = [$empty, $slider]; 3282 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request 3283 $self->SUPER::size_request
2899} 3284}
2900 3285
… …
2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3322 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2938 $layout->set_markup ($para->{markup}); 3323 $layout->set_markup ($para->{markup});
2939 3324
2940 $layout->set_shapes ( 3325 $layout->set_shapes (
2941 map 3326 map
2942 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3327 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2943 @{$para->{widget}} 3328 @{$para->{widget}}
2944 ); 3329 );
2945 3330
2946 $layout 3331 $layout
2947} 3332}
… …
3064 $ROOT->on_post_alloc ($self => sub { 3449 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate; 3450 $self->force_uptodate;
3066 3451
3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3068 3453
3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3454 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3070 glClearColor 0, 0, 0, 0; 3455 glClearColor 0, 0, 0, 0;
3071 glClear GL_COLOR_BUFFER_BIT; 3456 glClear GL_COLOR_BUFFER_BIT;
3072 3457
3073 package CFPlus::UI::Base; 3458 package DC::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3459 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h}); 3460 (0, 0, $self->{w}, $self->{h});
3076 3461
3077 my $top = int $self->{children}[1]{range}[0]; 3462 my $top = int $self->{children}[1]{range}[0];
3078 3463
… …
3089 3474
3090 if ($y0 < $y + $h && $y < $y1) { 3475 if ($y0 < $y + $h && $y < $y1) {
3091 my $layout = $self->get_layout ($para); 3476 my $layout = $self->get_layout ($para);
3092 3477
3093 $layout->render ($para->{indent}, $y - $y0); 3478 $layout->render ($para->{indent}, $y - $y0);
3479 $layout->draw;
3094 3480
3095 if (my @w = @{ $para->{widget} }) { 3481 if (my @w = @{ $para->{widget} }) {
3096 my @s = $layout->get_shapes; 3482 my @s = $layout->get_shapes;
3097 3483
3098 for (@w) { 3484 for (@w) {
… …
3136 $self->{children}[1]->draw; 3522 $self->{children}[1]->draw;
3137} 3523}
3138 3524
3139############################################################################# 3525#############################################################################
3140 3526
3141package CFPlus::UI::Animator; 3527package DC::UI::Animator;
3142 3528
3143use CFPlus::OpenGL; 3529use DC::OpenGL;
3144 3530
3145our @ISA = CFPlus::UI::Bin::; 3531our @ISA = DC::UI::Bin::;
3146 3532
3147sub moveto { 3533sub moveto {
3148 my ($self, $x, $y) = @_; 3534 my ($self, $x, $y) = @_;
3149 3535
3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3536 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3178 glPopMatrix; 3564 glPopMatrix;
3179} 3565}
3180 3566
3181############################################################################# 3567#############################################################################
3182 3568
3183package CFPlus::UI::Flopper; 3569package DC::UI::Flopper;
3184 3570
3185our @ISA = CFPlus::UI::Button::; 3571our @ISA = DC::UI::Button::;
3186 3572
3187sub new { 3573sub new {
3188 my $class = shift; 3574 my $class = shift;
3189 3575
3190 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
… …
3202 $self->{other}->toggle_visibility; 3588 $self->{other}->toggle_visibility;
3203} 3589}
3204 3590
3205############################################################################# 3591#############################################################################
3206 3592
3207package CFPlus::UI::Tooltip; 3593package DC::UI::Tooltip;
3208 3594
3209our @ISA = CFPlus::UI::Bin::; 3595our @ISA = DC::UI::Bin::;
3210 3596
3211use CFPlus::OpenGL; 3597use DC::OpenGL;
3212 3598
3213sub new { 3599sub new {
3214 my $class = shift; 3600 my $class = shift;
3215 3601
3216 $class->SUPER::new ( 3602 $class->SUPER::new (
… …
3220} 3606}
3221 3607
3222sub set_tooltip_from { 3608sub set_tooltip_from {
3223 my ($self, $widget) = @_; 3609 my ($self, $widget) = @_;
3224 3610
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
3227
3228 my $tooltip = $widget->{tooltip}; 3611 my $tip = $widget->{tooltip};
3612 $tip = $tip->($widget) if "CODE" eq ref $tip;
3613
3614 $tip = DC::Pod::section_label tooltip => $1
3615 if $tip =~ /^#(.*)$/;
3229 3616
3230 if ($ENV{CFPLUS_DEBUG} & 2) { 3617 if ($ENV{CFPLUS_DEBUG} & 2) {
3231 $tooltip .= "\n\n" . (ref $widget) . "\n" 3618 $tip .= "\n\n" . (ref $widget) . "\n"
3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3619 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3233 . "req $widget->{req_w} $widget->{req_h}\n" 3620 . "req $widget->{req_w} $widget->{req_h}\n"
3234 . "visible $widget->{visible}"; 3621 . "visible $widget->{visible}";
3235 } 3622 }
3236 3623
3237 $tooltip =~ s/^\n+//; 3624 $tip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//; 3625 $tip =~ s/\n+$//;
3239 3626
3240 $self->add (new CFPlus::UI::Label 3627 $self->add (new DC::UI::Label
3628 fg => $DC::THEME{tooltip_fg},
3241 markup => $tooltip, 3629 markup => $tip,
3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3631 align => 0,
3243 fontsize => 0.8, 3632 fontsize => 0.8,
3244 style => 1, # FLAG_INVERSE 3633 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3245 ellipsise => 0, 3634 ellipsise => 0,
3246 font => ($widget->{tooltip_font} || $::FONT_PROP), 3635 font => ($widget->{tooltip_font} || $::FONT_PROP),
3247 ); 3636 );
3248} 3637}
3249 3638
… …
3284} 3673}
3285 3674
3286sub _draw { 3675sub _draw {
3287 my ($self) = @_; 3676 my ($self) = @_;
3288 3677
3289 glTranslate 0.375, 0.375;
3290
3291 my ($w, $h) = @$self{qw(w h)}; 3678 my ($w, $h) = @$self{qw(w h)};
3292 3679
3293 glColor 1, 0.8, 0.4; 3680 glColor @{ $DC::THEME{tooltip_bg} };
3294 glBegin GL_QUADS; 3681 glRect 0, 0, $w, $h;
3295 glVertex 0 , 0;
3296 glVertex 0 , $h;
3297 glVertex $w, $h;
3298 glVertex $w, 0;
3299 glEnd;
3300 3682
3301 glColor 0, 0, 0; 3683 glColor @{ $DC::THEME{tooltip_border} };
3302 glBegin GL_LINE_LOOP; 3684 glRect_lineloop .5, .5, $w + .5, $h + .5;
3303 glVertex 0 , 0;
3304 glVertex 0 , $h;
3305 glVertex $w, $h;
3306 glVertex $w, 0;
3307 glEnd;
3308 3685
3309 glTranslate 2 - 0.375, 2 - 0.375; 3686 glTranslate 2, 2;
3310 3687
3311 $self->SUPER::_draw; 3688 $self->SUPER::_draw;
3312} 3689}
3313 3690
3314############################################################################# 3691#############################################################################
3315 3692
3316package CFPlus::UI::Face; 3693package DC::UI::Face;
3317 3694
3318our @ISA = CFPlus::UI::DrawBG::; 3695our @ISA = DC::UI::DrawBG::;
3319 3696
3320use CFPlus::OpenGL; 3697use DC::OpenGL;
3321 3698
3322sub new { 3699sub new {
3323 my $class = shift; 3700 my $class = shift;
3324 3701
3325 my $self = $class->SUPER::new ( 3702 my $self = $class->SUPER::new (
3703 size_w => 32,
3704 size_h => 8,
3326 aspect => 1, 3705 aspect => 1,
3327 can_events => 0, 3706 can_events => 0,
3328 @_, 3707 @_,
3329 ); 3708 );
3330 3709
3331 if ($self->{anim} && $self->{animspeed}) { 3710 if ($self->{anim} && $self->{animspeed}) {
3332 CFPlus::weaken (my $widget = $self); 3711 DC::weaken (my $widget = $self);
3333 3712
3334 $self->{timer} = Event->timer ( 3713 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3714 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3336 hard => 1, 3715 return unless $::CONN;
3337 interval => $self->{animspeed}, 3716
3338 cb => sub { 3717 my $w = $widget
3339 delete $self->{wait_face}; 3718 or return;
3719
3340 ++$widget->{frame}; 3720 ++$w->{frame};
3721 $w->update_face;
3722
3723 # somehow, $widget can go away
3341 $widget->update; 3724 $w->update;
3342 }, 3725 $w->update_timer;
3343 ); 3726 };
3727
3728 $self->update_face;
3729 $self->update_timer;
3344 } 3730 }
3345 3731
3346 $self 3732 $self
3347} 3733}
3348 3734
3735sub update_timer {
3736 my ($self) = @_;
3737
3738 return unless $self->{timer};
3739
3740 if ($self->{visible}) {
3741 $self->{timer}->start;
3742 } else {
3743 $self->{timer}->stop;
3744 }
3745}
3746
3747sub update_face {
3748 my ($self) = @_;
3749
3750 if ($::CONN) {
3751 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3752 if ($anim && @$anim) {
3753 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3754 delete $self->{face_change_cb};
3755
3756 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3757 unless ($tex->{name} || $tex->{loading}) {
3758 $tex->upload (sub { $self->reconfigure });
3759 }
3760 }
3761 }
3762 }
3763 }
3764}
3765
3349sub size_request { 3766sub size_request {
3350 (32, 8) 3767 my ($self) = @_;
3768
3769 if ($::CONN) {
3770 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3771 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3772 if ($tex->{name}) {
3773 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3774 } elsif (!$tex->{loading}) {
3775 $tex->upload (sub { $self->reconfigure });
3776 }
3777 }
3778
3779 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3780 }
3781 }
3782
3783 ($self->{size_w} || 8, $self->{size_h} || 8)
3351} 3784}
3352 3785
3353sub update { 3786sub update {
3354 my ($self) = @_; 3787 my ($self) = @_;
3355 3788
3356 return unless $self->{visible}; 3789 return unless $self->{visible};
3357 3790
3358 $self->SUPER::update; 3791 $self->SUPER::update;
3359} 3792}
3360 3793
3794sub invoke_visibility_change {
3795 my ($self) = @_;
3796
3797 $self->update_timer;
3798
3799 0
3800}
3801
3361sub _draw { 3802sub _draw {
3362 my ($self) = @_; 3803 my ($self) = @_;
3363 3804
3364 return unless $::CONN;
3365
3366 $self->SUPER::_draw; 3805 $self->SUPER::_draw;
3367 3806
3368 my $face; 3807 if (my $tex = $self->{tex}) {
3369
3370 if ($self->{frame}) {
3371 my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373 $face = $anim->[ $self->{frame} % @$anim ]
3374 if $anim && @$anim;
3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3379
3380 my $tex = $::CONN->{texture}[$faceid];
3381
3382 if ($tex) {
3383 glEnable GL_TEXTURE_2D; 3808 glEnable GL_TEXTURE_2D;
3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385 glColor 0, 0, 0, 1; 3810 glColor 0, 0, 0, 1;
3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3811 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387 glDisable GL_TEXTURE_2D; 3812 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3392 } 3813 }
3393} 3814}
3394 3815
3395sub destroy { 3816sub destroy {
3396 my ($self) = @_; 3817 my ($self) = @_;
3397 3818
3398 $self->{timer}->cancel 3819 (delete $self->{timer})->cancel
3399 if $self->{timer}; 3820 if $self->{timer};
3400 3821
3401 $self->SUPER::destroy; 3822 $self->SUPER::destroy;
3402} 3823}
3403 3824
3404############################################################################# 3825#############################################################################
3405 3826
3406package CFPlus::UI::Buttonbar; 3827package DC::UI::Buttonbar;
3407 3828
3408our @ISA = CFPlus::UI::HBox::; 3829our @ISA = DC::UI::HBox::;
3409 3830
3410# TODO: should actually wrap buttons and other goodies. 3831# TODO: should actually wrap buttons and other goodies.
3411 3832
3412############################################################################# 3833#############################################################################
3413 3834
3414package CFPlus::UI::Menu; 3835package DC::UI::Menu;
3415 3836
3416our @ISA = CFPlus::UI::Toplevel::; 3837our @ISA = DC::UI::Toplevel::;
3417 3838
3418use CFPlus::OpenGL; 3839use DC::OpenGL;
3419 3840
3420sub new { 3841sub new {
3421 my $class = shift; 3842 my $class = shift;
3422 3843
3423 my $self = $class->SUPER::new ( 3844 my $self = $class->SUPER::new (
3424 items => [], 3845 items => [],
3425 z => 100, 3846 z => 100,
3426 @_, 3847 @_,
3427 ); 3848 );
3428 3849
3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3850 $self->add ($self->{vbox} = new DC::UI::VBox);
3430 3851
3431 for my $item (@{ $self->{items} }) { 3852 for my $item (@{ $self->{items} }) {
3432 my ($widget, $cb, $tooltip) = @$item; 3853 my ($widget, $cb, $tooltip) = @$item;
3433 3854
3434 # handle various types of items, only text for now 3855 # handle various types of items, only text for now
3435 if (!ref $widget) { 3856 if (!ref $widget) {
3436 if ($widget =~ /\t/) { 3857 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2; 3858 my ($left, $right) = split /\t/, $widget, 2;
3438 3859
3439 $widget = new CFPlus::UI::HBox 3860 $widget = new DC::UI::HBox
3440 can_hover => 1, 3861 can_hover => 1,
3441 can_events => 1, 3862 can_events => 1,
3442 tooltip => $tooltip, 3863 tooltip => $tooltip,
3443 children => [ 3864 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1), 3865 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1), 3866 (new DC::UI::Label markup => $right, align => 1),
3446 ], 3867 ],
3447 ; 3868 ;
3448 3869
3449 } else { 3870 } else {
3450 $widget = new CFPlus::UI::Label 3871 $widget = new DC::UI::Label
3451 can_hover => 1, 3872 can_hover => 1,
3452 can_events => 1, 3873 can_events => 1,
3874 align => 0,
3453 markup => $widget, 3875 markup => $widget,
3454 tooltip => $tooltip; 3876 tooltip => $tooltip;
3455 } 3877 }
3456 } 3878 }
3457 3879
… …
3503 1 3925 1
3504} 3926}
3505 3927
3506############################################################################# 3928#############################################################################
3507 3929
3508package CFPlus::UI::Multiplexer; 3930package DC::UI::Multiplexer;
3509 3931
3510our @ISA = CFPlus::UI::Container::; 3932our @ISA = DC::UI::Container::;
3511 3933
3512sub new { 3934sub new {
3513 my $class = shift; 3935 my $class = shift;
3514 3936
3515 my $self = $class->SUPER::new ( 3937 my $self = $class->SUPER::new (
3516 @_, 3938 @_,
3517 ); 3939 );
3518 3940
3519 $self->{current} = $self->{children}[0] 3941 $self->set_current_page (0);
3520 if @{ $self->{children} };
3521 3942
3522 $self 3943 $self
3523} 3944}
3524 3945
3525sub add { 3946sub add {
3526 my ($self, @widgets) = @_; 3947 my ($self, @widgets) = @_;
3527 3948
3528 $self->SUPER::add (@widgets); 3949 $self->SUPER::add (@widgets);
3529 3950
3530 $self->{current} = $self->{children}[0] 3951 $self->set_current_page (0)
3531 if @{ $self->{children} }; 3952 if @widgets == @{ $self->{children} };
3532} 3953}
3533 3954
3534sub get_current_page { 3955sub get_current_page {
3535 my ($self) = @_; 3956 my ($self) = @_;
3536 3957
… …
3542 3963
3543 my $widget = ref $page_or_widget 3964 my $widget = ref $page_or_widget
3544 ? $page_or_widget 3965 ? $page_or_widget
3545 : $self->{children}[$page_or_widget]; 3966 : $self->{children}[$page_or_widget];
3546 3967
3968 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3969
3547 $self->{current} = $widget; 3970 if (($self->{current} = $widget)) {
3971 $self->{current}->set_visible if $self->{current} && $self->{visible};
3548 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3972 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3549 3973
3550 $self->emit (page_changed => $self->{current}); 3974 $self->emit (page_changed => $self->{current});
3975 }
3551 3976
3552 $self->realloc; 3977 $self->realloc;
3553} 3978}
3554 3979
3555sub visible_children { 3980sub visible_children {
3556 $_[0]{current} 3981 $_[0]{current} || ()
3557} 3982}
3558 3983
3559sub size_request { 3984sub size_request {
3560 my ($self) = @_; 3985 my ($self) = @_;
3561 3986
3987 $self->{current}
3562 $self->{current}->size_request 3988 ? $self->{current}->size_request
3989 : (0, 0)
3563} 3990}
3564 3991
3565sub invoke_size_allocate { 3992sub invoke_size_allocate {
3566 my ($self, $w, $h) = @_; 3993 my ($self, $w, $h) = @_;
3567 3994
3568 $self->{current}->configure (0, 0, $w, $h); 3995 $self->{current}->configure (0, 0, $w, $h)
3996 if $self->{current};
3569 3997
3570 1 3998 1
3571} 3999}
3572 4000
3573sub _draw { 4001sub _draw {
3574 my ($self) = @_; 4002 my ($self) = @_;
3575 4003
3576 $self->{current}->draw; 4004 $self->{current}->draw
4005 if $self->{current};
3577} 4006}
3578 4007
3579############################################################################# 4008#############################################################################
3580 4009
3581package CFPlus::UI::Notebook; 4010package DC::UI::Notebook;
3582 4011
4012use DC::OpenGL;
4013
3583our @ISA = CFPlus::UI::VBox::; 4014our @ISA = DC::UI::VBox::;
3584 4015
3585sub new { 4016sub new {
3586 my $class = shift; 4017 my $class = shift;
3587 4018
3588 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3589 buttonbar => (new CFPlus::UI::Buttonbar), 4020 buttonbar => (new DC::UI::Buttonbar),
3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4021 multiplexer => (new DC::UI::Multiplexer expand => 1),
4022 active_outline => [.7, .7, 0.2],
3591 # filter => # will be put between multiplexer and $self 4023 # filter => # will be put between multiplexer and $self
3592 @_, 4024 @_,
3593 ); 4025 );
3594 4026
3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4027 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3596 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4028 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3597 4029
4030 {
4031 Scalar::Util::weaken (my $wself = $self);
4032
4033 $self->{multiplexer}->connect (c_add => sub {
4034 my ($mplex, $widgets) = @_;
4035
4036 for my $child (@$widgets) {
4037 Scalar::Util::weaken $child;
4038 $child->{c_tab_} ||= do {
4039 my $tab =
4040 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4041 ? $child->{c_tab}
4042 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4043
4044 $tab->connect (activate => sub {
4045 $wself->set_current_page ($child);
4046 });
4047
4048 $tab
4049 };
4050
4051 $self->{buttonbar}->add ($child->{c_tab_});
4052 }
4053 });
4054
4055 $self->{multiplexer}->connect (c_remove => sub {
4056 my ($mplex, $widgets) = @_;
4057
4058 for my $child (@$widgets) {
4059 $wself->{buttonbar}->remove ($child->{c_tab_});
4060 }
4061 });
4062 }
4063
3598 $self 4064 $self
3599} 4065}
3600 4066
3601sub add { 4067sub add {
4068 my ($self, @widgets) = @_;
4069
4070 $self->{multiplexer}->add (@widgets)
4071}
4072
4073sub remove {
4074 my ($self, @widgets) = @_;
4075
4076 $self->{multiplexer}->remove (@widgets)
4077}
4078
4079sub pages {
4080 my ($self) = @_;
4081 $self->{multiplexer}->children
4082}
4083
4084sub page_index {
4085 my ($self, $widget) = @_;
4086
4087 my $i = 0;
4088 for ($self->pages) {
4089 if ($_ eq $widget) { return $i };
4090 $i++;
4091 }
4092
4093 undef
4094}
4095
4096sub add_tab {
3602 my ($self, $title, $widget, $tooltip) = @_; 4097 my ($self, $title, $widget, $tooltip) = @_;
3603 4098
3604 CFPlus::weaken $self; 4099 $title = [$title, $tooltip] unless ref $title;
4100 $widget->{c_tab} = $title;
3605 4101
3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3607 markup => $title,
3608 tooltip => $tooltip,
3609 on_activate => sub { $self->set_current_page ($widget) },
3610 );
3611
3612 $self->{multiplexer}->add ($widget); 4102 $self->add ($widget);
3613} 4103}
3614 4104
3615sub get_current_page { 4105sub get_current_page {
3616 my ($self) = @_; 4106 my ($self) = @_;
3617 4107
… …
3623 4113
3624 $self->{multiplexer}->set_current_page ($page); 4114 $self->{multiplexer}->set_current_page ($page);
3625 $self->emit (page_changed => $self->{multiplexer}{current}); 4115 $self->emit (page_changed => $self->{multiplexer}{current});
3626} 4116}
3627 4117
4118sub _draw {
4119 my ($self) = @_;
4120
4121 $self->SUPER::_draw ();
4122
4123 if (my $cur = $self->{multiplexer}{current}) {
4124 if ($cur = $cur->{c_tab_}) {
4125 glTranslate $self->{buttonbar}{x} + $cur->{x},
4126 $self->{buttonbar}{y} + $cur->{y};
4127 glLineWidth 3;
4128 #glEnable GL_BLEND;
4129 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4130 glColor @{$self->{active_outline}};
4131 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4132 glLineWidth 1;
4133 #glDisable GL_BLEND;
4134 }
4135 }
4136}
4137
3628############################################################################# 4138#############################################################################
3629 4139
3630package CFPlus::UI::Selector; 4140package DC::UI::Selector;
3631 4141
3632use utf8; 4142use utf8;
3633 4143
3634our @ISA = CFPlus::UI::Button::; 4144our @ISA = DC::UI::Button::;
3635 4145
3636sub new { 4146sub new {
3637 my $class = shift; 4147 my $class = shift;
3638 4148
3639 my $self = $class->SUPER::new ( 4149 my $self = $class->SUPER::new (
… …
3656 my ($value, $title, $tooltip) = @$_; 4166 my ($value, $title, $tooltip) = @$_;
3657 4167
3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4168 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3659 } 4169 }
3660 4170
3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4171 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3662} 4172}
3663 4173
3664sub _set_value { 4174sub _set_value {
3665 my ($self, $value) = @_; 4175 my ($self, $value) = @_;
3666 4176
3667 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4177 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4178 $item ||= $self->{options}[0]
3668 or return; 4179 or return;
3669 4180
3670 $self->{value} = $item->[0]; 4181 $self->{value} = $item->[0];
3671 $self->set_markup ("$item->[1] ⇓"); 4182 $self->set_markup ("$item->[1] ⇓");
3672 $self->set_tooltip ($item->[2]); 4183# $self->set_tooltip ($item->[2]);
3673} 4184}
3674 4185
3675sub set_value { 4186sub set_value {
3676 my ($self, $value) = @_; 4187 my ($self, $value) = @_;
3677 4188
… …
3679 4190
3680 $self->_set_value ($value); 4191 $self->_set_value ($value);
3681 $self->emit (changed => $value); 4192 $self->emit (changed => $value);
3682} 4193}
3683 4194
4195sub set_options {
4196 my ($self, $options) = @_;
4197
4198 $self->{options} = $options;
4199 $self->_set_value ($self->{value});
4200}
4201
3684############################################################################# 4202#############################################################################
3685 4203
3686package CFPlus::UI::Statusbox; 4204package DC::UI::Statusbox;
3687 4205
3688our @ISA = CFPlus::UI::VBox::; 4206our @ISA = DC::UI::VBox::;
3689 4207
3690sub new { 4208sub new {
3691 my $class = shift; 4209 my $class = shift;
3692 4210
3693 my $self = $class->SUPER::new ( 4211 my $self = $class->SUPER::new (
3694 fontsize => 0.8, 4212 fontsize => 0.8,
3695 @_, 4213 @_,
3696 ); 4214 );
3697 4215
3698 CFPlus::weaken (my $this = $self); 4216 DC::weaken (my $this = $self);
3699 4217
3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4218 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3701 4219
3702 $self 4220 $self
3703} 4221}
3704 4222
3705sub reorder { 4223sub reorder {
3706 my ($self) = @_; 4224 my ($self) = @_;
3707 my $NOW = Time::HiRes::time; 4225 my $NOW = EV::time;
3708 4226
3709 # freeze display when hovering over any label 4227 # freeze display when hovering over any label
3710 return if $CFPlus::UI::TOOLTIP->{owner} 4228 return if $DC::UI::TOOLTIP->{owner}
3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4229 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3712 values %{ $self->{item} }; 4230 values %{ $self->{item} };
3713 4231
3714 while (my ($k, $v) = each %{ $self->{item} }) { 4232 while (my ($k, $v) = each %{ $self->{item} }) {
3715 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4233 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3716 } 4234 }
4235
4236 $self->{timer}->set (1, 1);
3717 4237
3718 my @widgets; 4238 my @widgets;
3719 4239
3720 my @items = sort { 4240 my @items = sort {
3721 $a->{pri} <=> $b->{pri} 4241 $a->{pri} <=> $b->{pri}
3722 or $b->{id} <=> $a->{id} 4242 or $b->{id} <=> $a->{id}
3723 } values %{ $self->{item} }; 4243 } values %{ $self->{item} };
3724
3725 $self->{timer}->interval (1);
3726 4244
3727 my $count = 10 + 1; 4245 my $count = 10 + 1;
3728 for my $item (@items) { 4246 for my $item (@items) {
3729 last unless --$count; 4247 last unless --$count;
3730 4248
… …
3737 for ($short) { 4255 for ($short) {
3738 s/^\s+//; 4256 s/^\s+//;
3739 s/\s+/ /g; 4257 s/\s+/ /g;
3740 } 4258 }
3741 4259
3742 new CFPlus::UI::Label 4260 new DC::UI::Label
3743 markup => $short, 4261 markup => $short,
3744 tooltip => $item->{tooltip}, 4262 tooltip => $item->{tooltip},
3745 tooltip_font => $::FONT_PROP, 4263 tooltip_font => $::FONT_PROP,
3746 tooltip_width => 0.67, 4264 tooltip_width => 0.67,
3747 fontsize => $item->{fontsize} || $self->{fontsize}, 4265 fontsize => $item->{fontsize} || $self->{fontsize},
3748 max_w => $::WIDTH * 0.44, 4266 max_w => $::WIDTH * 0.44,
4267 align => 0,
3749 fg => [@{ $item->{fg} }], 4268 fg => [@{ $item->{fg} }],
3750 can_events => 1, 4269 can_events => 1,
3751 can_hover => 1 4270 can_hover => 1
3752 }; 4271 };
3753 4272
3754 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4273 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3755 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4274 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3756 $label->update; 4275 $label->update;
3757 $label->set_max_size (undef, $label->{req_h} * $diff) 4276 $label->set_max_size (undef, $label->{req_h} * $diff)
3758 if $diff < 1; 4277 if $diff < 1;
3759 $self->{timer}->interval (1/30); 4278 $self->{timer}->set (1/30, 1/30);
3760 } else { 4279 } else {
3761 $label->{fg}[3] = $item->{fg}[3] || 1; 4280 $label->{fg}[3] = $item->{fg}[3] || 1;
3762 } 4281 }
3763 4282
3764 push @widgets, $label; 4283 push @widgets, $label;
3765 } 4284 }
4285
4286 my $hash = join ",", @widgets;
4287 return if $hash eq $self->{last_widget_hash};
4288 $self->{last_widget_hash} = $hash;
3766 4289
3767 $self->clear; 4290 $self->clear;
3768 $self->SUPER::add (reverse @widgets); 4291 $self->SUPER::add (reverse @widgets);
3769} 4292}
3770 4293
… …
3826 $self->SUPER::destroy; 4349 $self->SUPER::destroy;
3827} 4350}
3828 4351
3829############################################################################# 4352#############################################################################
3830 4353
3831package CFPlus::UI::Root; 4354package DC::UI::Root;
3832 4355
3833our @ISA = CFPlus::UI::Container::; 4356our @ISA = DC::UI::Container::;
3834 4357
3835use List::Util qw(min max); 4358use List::Util qw(min max);
3836 4359
3837use CFPlus::OpenGL; 4360use DC::OpenGL;
3838 4361
3839sub new { 4362sub new {
3840 my $class = shift; 4363 my $class = shift;
3841 4364
3842 my $self = $class->SUPER::new ( 4365 my $self = $class->SUPER::new (
3843 visible => 1, 4366 visible => 1,
3844 @_, 4367 @_,
3845 ); 4368 );
3846 4369
3847 CFPlus::weaken ($self->{root} = $self); 4370 DC::weaken ($self->{root} = $self);
3848 4371
3849 $self 4372 $self
3850} 4373}
3851 4374
3852sub size_request { 4375sub size_request {
… …
3900} 4423}
3901 4424
3902sub update { 4425sub update {
3903 my ($self) = @_; 4426 my ($self) = @_;
3904 4427
3905 $::WANT_REFRESH++; 4428 $::WANT_REFRESH = 1;
3906} 4429}
3907 4430
3908sub add { 4431sub add {
3909 my ($self, @children) = @_; 4432 my ($self, @children) = @_;
3910 4433
… …
3947 while ($self->{refresh_hook}) { 4470 while ($self->{refresh_hook}) {
3948 $_->() 4471 $_->()
3949 for values %{delete $self->{refresh_hook}}; 4472 for values %{delete $self->{refresh_hook}};
3950 } 4473 }
3951 4474
3952 if ($self->{realloc}) { 4475 while ($self->{realloc}) {
3953 my %queue; 4476 my %queue;
3954 my @queue; 4477 my @queue;
3955 my $widget; 4478 my $widget;
3956 4479
3957 outer: 4480 outer:
… …
3977 4500
3978 delete $queue{$widget+0}; 4501 delete $queue{$widget+0};
3979 4502
3980 my ($w, $h) = $widget->size_request; 4503 my ($w, $h) = $widget->size_request;
3981 4504
3982 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4505 $w += $widget->{padding_x} * 2;
3983 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4506 $h += $widget->{padding_y} * 2;
4507
4508 $w = max $widget->{min_w}, $w;
4509 $h = max $widget->{min_h}, $h;
3984 4510
3985 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4511 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3986 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4512 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3987 4513
3988 $w = $widget->{force_w} if exists $widget->{force_w}; 4514 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4004 } 4530 }
4005 } 4531 }
4006 4532
4007 delete $self->{realloc}{$widget+0}; 4533 delete $self->{realloc}{$widget+0};
4008 } 4534 }
4009 }
4010 4535
4011 while (my $size_alloc = delete $self->{size_alloc}) { 4536 while (my $size_alloc = delete $self->{size_alloc}) {
4012 my @queue = sort { $b->{visible} <=> $a->{visible} } 4537 my @queue = sort { $a->{visible} <=> $b->{visible} }
4013 values %$size_alloc; 4538 values %$size_alloc;
4014 4539
4015 while () { 4540 while () {
4016 my $widget = pop @queue || last; 4541 my $widget = pop @queue || last;
4017 4542
4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4543 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019 4544
4020 $w = 0 if $w < 0;
4021 $h = 0 if $h < 0;
4022
4023 $w = max $widget->{min_w}, $w; 4545 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h; 4546 $h = max $widget->{min_h}, $h;
4025 4547
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4548# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4549# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028 4550
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4551 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4552 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031 4553
4032 $w = int $w + 0.5; 4554 $w = int $w + 0.5;
4033 $h = int $h + 0.5; 4555 $h = int $h + 0.5;
4034 4556
4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4557 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4036 $widget->{old_w} = $widget->{w}; 4558 $widget->{old_w} = $widget->{w};
4037 $widget->{old_h} = $widget->{h}; 4559 $widget->{old_h} = $widget->{h};
4038 4560
4039 $widget->{w} = $w; 4561 $widget->{w} = $w;
4040 $widget->{h} = $h; 4562 $widget->{h} = $h;
4041 4563
4042 $widget->emit (size_allocate => $w, $h); 4564 $widget->emit (size_allocate => $w, $h);
4565 }
4043 } 4566 }
4044 } 4567 }
4045 } 4568 }
4046 4569
4047 while ($self->{post_alloc_hook}) { 4570 while ($self->{post_alloc_hook}) {
4048 $_->() 4571 $_->()
4049 for values %{delete $self->{post_alloc_hook}}; 4572 for values %{delete $self->{post_alloc_hook}};
4050 } 4573 }
4051
4052 4574
4053 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4575 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4576 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055 glClear GL_COLOR_BUFFER_BIT; 4577 glClear GL_COLOR_BUFFER_BIT;
4056 4578
… …
4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4581 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4060 glMatrixMode GL_MODELVIEW; 4582 glMatrixMode GL_MODELVIEW;
4061 glLoadIdentity; 4583 glLoadIdentity;
4062 4584
4063 { 4585 {
4064 package CFPlus::UI::Base; 4586 package DC::UI::Base;
4065 4587
4066 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4588 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4067 (0, 0, $self->{w}, $self->{h}); 4589 (0, 0, $self->{w}, $self->{h});
4068 4590
4069 $self->_draw; 4591 $self->_draw;
4070 } 4592 }
4071} 4593}
4072 4594
4073############################################################################# 4595#############################################################################
4074 4596
4075package CFPlus::UI; 4597package DC::UI;
4076 4598
4077$ROOT = new CFPlus::UI::Root; 4599$ROOT = new DC::UI::Root;
4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4600$TOOLTIP = new DC::UI::Tooltip z => 900;
4079 4601
40801 46021
4081 4603

Diff Legend

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