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.440 by root, Sun Sep 16 18:27:48 2007 UTC vs.
Revision 1.482 by root, Sat Aug 13 23:18:19 2011 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Event; 7use AnyEvent ();
8use Guard ();
8 9
9use CFPlus; 10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
42 } 45 }
43 46
44 $TOOLTIP->hide; 47 $TOOLTIP->hide;
45 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
46 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
47}); 50};
48 51
49sub get_layout { 52sub get_layout {
50 my $layout; 53 my $layout;
51 54
52 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
87 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
88 91
89 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
90 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
91 94
92 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
93 } 96 }
94} 97}
95 98
96sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
97 my ($ev) = @_; 100 my ($ev) = @_;
… …
103 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
104 107
105 $GRAB = $widget; 108 $GRAB = $widget;
106 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
107 110
108 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
109 } 112 }
110 113
111 if ($GRAB) { 114 if ($GRAB) {
112 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
113 # mousewheel 116 # mousewheel
114 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
116 119
117 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
118 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
119 122
120 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
… …
138 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 142 $grab->update if $grab;
140 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
141 144
142 check_hover $widget; 145 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
144 } 147 }
145} 148}
146 149
147sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
148 my ($ev) = @_; 151 my ($ev) = @_;
… …
188# call when resolution changes etc. 191# call when resolution changes etc.
189sub rescale_widgets { 192sub rescale_widgets {
190 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
191 194
192 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
193 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196 199
197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
210 reconfigure_widgets; 213 reconfigure_widgets;
211} 214}
212 215
213############################################################################# 216#############################################################################
214 217
215package CFPlus::UI::Event; 218package DC::UI::Event;
216 219
217sub xy { 220sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 222}
220 223
221############################################################################# 224#############################################################################
222 225
223package CFPlus::UI::Base; 226package DC::UI::Base;
224 227
225use strict; 228use common::sense;
226 229
227use CFPlus::OpenGL; 230use DC::OpenGL;
228 231
229sub new { 232sub new {
230 my $class = shift; 233 my $class = shift;
231 234
232 my $self = bless { 235 my $self = bless {
… …
237 h => undef, 240 h => undef,
238 can_events => 1, 241 can_events => 1,
239 @_ 242 @_
240 }, $class; 243 }, $class;
241 244
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 246
244 for (keys %$self) { 247 for (keys %$self) {
245 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
247 } 250 }
248 } 251 }
249 252
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 258
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 261
259 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
277sub show { 280sub show {
278 my ($self) = @_; 281 my ($self) = @_;
279 282
280 return if $self->{parent}; 283 return if $self->{parent};
281 284
282 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
283} 286}
284 287
285sub set_visible { 288sub set_visible {
286 my ($self) = @_; 289 my ($self) = @_;
287 290
288 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
289 295
290 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
292 298
293 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
294 300
295 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
296 302
297 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
298} 304}
299 305
300sub set_invisible { 306sub set_invisible {
301 my ($self) = @_; 307 my ($self) = @_;
302 308
… …
308 delete $self->{root}; 314 delete $self->{root};
309 315
310 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
312 318
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
315 321
316 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
318} 324}
… …
337sub hide { 343sub hide {
338 my ($self) = @_; 344 my ($self) = @_;
339 345
340 $self->set_invisible; 346 $self->set_invisible;
341 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 351 $parent->remove ($self);
343 if $self->{parent}; 352 }
344} 353}
345 354
346sub move_abs { 355sub move_abs {
347 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
348 357
… …
364 373
365# traverse the widget chain up to find the maximum "physical" size constraints 374# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh { 375sub get_max_wh {
367 my ($self) = @_; 376 my ($self) = @_;
368 377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
369 return $self->{parent}->get_max_wh 382 ? $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT) 383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
373} 390}
374 391
375sub size_request { 392sub size_request {
376 require Carp; 393 require Carp;
377 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
… …
385 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
386 403
387 if ($self->{aspect}) { 404 if ($self->{aspect}) {
388 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
389 406
390 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
391 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
392 409
393 # use alignment to adjust x, y 410 # use alignment to adjust x, y
394 411
395 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
396 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
437 454
438 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
439 456
440 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
441 458
442 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
443 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
444 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
445 } 462 }
446} 463}
447 464
448# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
449sub coord2local { 466sub coord2local {
450 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
451 468
452 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
453 470
454 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
455} 472}
456 473
457# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
458sub coord2global { 475sub coord2global {
459 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
460 477
461 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
462 479
463 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
464} 481}
465 482
466sub invoke_focus_in { 483sub invoke_focus_in {
… …
515sub connect { 532sub connect {
516 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
517 534
518 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
519 536
520 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
521 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
522 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
523 } 540 }
524} 541}
525 542
… …
563# in .xs 580# in .xs
564 581
565sub set_parent { 582sub set_parent {
566 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
567 584
568 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
569 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
570} 587}
571 588
572sub realloc { 589sub realloc {
573 my ($self) = @_; 590 my ($self) = @_;
… …
611} 628}
612 629
613sub DESTROY { 630sub DESTROY {
614 my ($self) = @_; 631 my ($self) = @_;
615 632
616 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
617 634
618 local $@; 635 local $@;
619 eval { $self->destroy }; 636 eval { $self->destroy };
620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
621 638
622 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
623} 640}
624 641
625############################################################################# 642#############################################################################
626 643
627package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
628 645
629our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
630 647
631use strict; 648use common::sense;
649
632use CFPlus::OpenGL; 650use DC::OpenGL;
633 651
634sub new { 652sub new {
635 my $class = shift; 653 my $class = shift;
636 654
637 $class->SUPER::new ( 655 $class->SUPER::new (
… …
639 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
640 @_ 658 @_
641 ) 659 )
642} 660}
643 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
644sub _draw { 669sub _draw {
645 my ($self) = @_; 670 my ($self) = @_;
646 671
647 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
648 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
649 : $self->{bg}; 674 : $self->{bg};
650 675
651 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
652 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
653 678
… …
659 } 684 }
660} 685}
661 686
662############################################################################# 687#############################################################################
663 688
664package CFPlus::UI::Empty; 689package DC::UI::Empty;
665 690
666our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
667 692
668sub new { 693sub new {
669 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
670 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
671} 696}
… …
678 703
679sub draw { } 704sub draw { }
680 705
681############################################################################# 706#############################################################################
682 707
683package CFPlus::UI::Container; 708package DC::UI::Container;
684 709
685our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
686 711
687sub new { 712sub new {
688 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
689 714
690 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
… …
784 $_->draw for $self->visible_children; 809 $_->draw for $self->visible_children;
785} 810}
786 811
787############################################################################# 812#############################################################################
788 813
789package CFPlus::UI::Bin; 814package DC::UI::Bin;
790 815
791our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
792 817
793sub new { 818sub new {
794 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
795 820
796 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
797 822
798 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
799} 824}
800 825
801sub add { 826sub add {
… …
808sub remove { 833sub remove {
809 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
810 835
811 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
812 837
813 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
814 unless @{$self->{children}}; 839 unless @{$self->{children}};
815} 840}
816 841
817sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
818 843
… …
829} 854}
830 855
831############################################################################# 856#############################################################################
832# back-buffered drawing area 857# back-buffered drawing area
833 858
834package CFPlus::UI::Window; 859package DC::UI::Window;
835 860
836our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
837 862
838use CFPlus::OpenGL; 863use DC::OpenGL;
839 864
840sub new { 865sub new {
841 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
842 867
843 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
865} 890}
866 891
867sub render_child { 892sub render_child {
868 my ($self) = @_; 893 my ($self) = @_;
869 894
870 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
871 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
872 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
873 898
874 { 899 {
875 package CFPlus::UI::Base; 900 package DC::UI::Base;
876 901
877 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
878 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
879 904
880 $self->_render; 905 $self->_render;
… …
897 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
898} 923}
899 924
900############################################################################# 925#############################################################################
901 926
902package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
903 928
904use List::Util qw(min max); 929use List::Util qw(min max);
905 930
906our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
907 932
908sub new { 933sub new {
909 my $class = shift; 934 my $class = shift;
910 935
911 $class->SUPER::new ( 936 $class->SUPER::new (
… …
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1022 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1024 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
1001 } 1026 }
1002} 1027}
1003 1028
1004sub _render { 1029sub _render {
1005 my ($self) = @_; 1030 my ($self) = @_;
1006 1031
1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1009 1034
1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1011 1036
1012 $self->SUPER::_render; 1037 $self->SUPER::_render;
1013} 1038}
1014 1039
1015############################################################################# 1040#############################################################################
1016 1041
1017package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
1018 1043
1019our @ISA = CFPlus::UI::Table::; 1044our @ISA = DC::UI::Table::;
1020 1045
1021sub new { 1046sub new {
1022 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1023 1048
1024 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1025 1050
1026 my $self; 1051 my $self;
1027 1052
1028 my $hslider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1029 c_col => 0, 1054 c_col => 0,
1030 c_row => 1, 1055 c_row => 1,
1031 vertical => 0, 1056 vertical => 0,
1032 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1058 on_changed => sub {
1034 $self->{hpos} = $_[1]; 1059 $self->{hpos} = $_[1];
1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 }, 1061 },
1037 ; 1062 ;
1038 1063
1039 my $vslider = new CFPlus::UI::Slider 1064 my $vslider = new DC::UI::Slider
1040 c_col => 1, 1065 c_col => 1,
1041 c_row => 0, 1066 c_row => 0,
1042 vertical => 1, 1067 vertical => 1,
1043 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1044 on_changed => sub { 1069 on_changed => sub {
… …
1056 col_expand => [1, 0], 1081 col_expand => [1, 0],
1057 row_expand => [1, 0], 1082 row_expand => [1, 0],
1058 %arg, 1083 %arg,
1059 ); 1084 );
1060 1085
1061 $self->{vp} = new CFPlus::UI::ViewPort 1086 $self->{vp} = new DC::UI::ViewPort
1062 c_col => 0, 1087 c_col => 0,
1063 c_row => 0, 1088 c_row => 0,
1064 expand => 1, 1089 expand => 1,
1065 scroll_x => $self->{scroll_x}, 1090 scroll_x => $self->{scroll_x},
1066 scroll_y => $self->{scroll_y}, 1091 scroll_y => $self->{scroll_y},
… …
1192 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1193} 1218}
1194 1219
1195############################################################################# 1220#############################################################################
1196 1221
1197package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1198 1223
1199our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1200 1225
1201use CFPlus::OpenGL; 1226use DC::OpenGL;
1202 1227
1203sub new { 1228sub new {
1204 my $class = shift; 1229 my $class = shift;
1205 1230
1206 $class->SUPER::new ( 1231 $class->SUPER::new (
… …
1225 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1226} 1251}
1227 1252
1228############################################################################# 1253#############################################################################
1229 1254
1230package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1231 1256
1232our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1233 1258
1234use CFPlus::OpenGL; 1259use DC::OpenGL;
1235 1260
1236sub new { 1261sub new {
1237 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1238 1263
1239 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1240 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1241 align => 1, 1266 align => 1,
1242 valign => 0, 1267 valign => 0.5,
1243 text => $arg{label}, 1268 text => $arg{label},
1244 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1245 } 1270 }
1246 1271
1247 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1248 # label => "", 1273 # label => "",
1249 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1250 border => 0.8, 1275 border => 0.8,
1251 style => 'single', 1276 style => 'single',
1252 %arg, 1277 %arg,
1253 ); 1278 );
1254 1279
… …
1257 1282
1258sub add { 1283sub add {
1259 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1260 1285
1261 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1262 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1263} 1288}
1264 1289
1265sub border { 1290sub border {
1266 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1267} 1292}
… …
1307 my $border = $self->border; 1332 my $border = $self->border;
1308 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1309 1334
1310 $child->draw; 1335 $child->draw;
1311 1336
1312 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1313 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1314 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1315 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1317 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1325 } 1350 }
1326} 1351}
1327 1352
1328############################################################################# 1353#############################################################################
1329 1354
1330package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1331 1356
1332our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1333 1358
1334use CFPlus::OpenGL; 1359use DC::OpenGL;
1335 1360
1336my $bg = 1361my $bg =
1337 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1338 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1339 1364
1340my @border = 1365my @border =
1341 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 map { new_from_resource DC::Texture $_, mipmap => 1 }
1342 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1343 1368
1344my @icon = 1369my @icon =
1345 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1346 qw(x1_move.png x1_resize.png); 1371 qw(x1_move.png x1_resize.png);
1347 1372
1348sub new { 1373sub new {
1349 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1350 1375
1351 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1352 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1353 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1354 border => 0.6, 1379 border => 0.8,
1355 can_events => 1, 1380 can_events => 1,
1356 min_w => 64, 1381 min_w => 64,
1357 min_h => 32, 1382 min_h => 32,
1358 %arg, 1383 %arg,
1359 ); 1384 );
1360 1385
1361 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1362 align => 0, 1387 align => 0.5,
1363 valign => 1, 1388 valign => 1,
1364 text => $self->{title}, 1389 text => $self->{title},
1365 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1366 if exists $self->{title}; 1391 if exists $self->{title};
1367 1392
1368 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1369 $self->{close_button} = 1394 $self->{close_button} =
1370 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1371 path => 'x1_close.png', 1396 path => 'x1_close.png',
1372 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1373 1398
1374 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1375 } 1400 }
1376 1401
1377 $self 1402 $self
1378} 1403}
1379 1404
1380sub add { 1405sub add {
1381 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1382 1407
1383 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1384 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1385 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1386} 1411}
1387 1412
1388sub border { 1413sub border {
1389 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1390} 1415}
… …
1528 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1530 1555
1531 my $border = $self->border; 1556 my $border = $self->border;
1532 1557
1558 if ($border) {
1533 glColor @{ $self->{border_bg} }; 1559 glColor @{ $self->{border_bg} };
1534 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1560 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1535 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1561 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1536 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1562 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1537 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1563 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1538 1564
1539 # move 1565 # move
1540 my $w2 = ($w - $border) * .5; 1566 my $w2 = ($w - $border) * .5;
1541 my $h2 = ($h - $border) * .5; 1567 my $h2 = ($h - $border) * .5;
1542 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1543 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1570 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1545 1571
1546 # resize 1572 # resize
1547 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1573 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1548 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1574 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1549 unless $self->{has_close_button}; 1575 unless $self->{has_close_button};
1550 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1551 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1577 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1578 }
1552 1579
1553 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1580 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1554 glColor @{ $self->{bg} }; 1581 glColor @{ $self->{bg} };
1555 1582
1556 # TODO: repeat texture not scale 1583 # TODO: repeat texture not scale
… …
1575 if $self->{close_button}; 1602 if $self->{close_button};
1576} 1603}
1577 1604
1578############################################################################# 1605#############################################################################
1579 1606
1580package CFPlus::UI::Table; 1607package DC::UI::Table;
1581 1608
1582our @ISA = CFPlus::UI::Container::; 1609our @ISA = DC::UI::Container::;
1583 1610
1584use List::Util qw(max sum); 1611use List::Util qw(max sum);
1585 1612
1586use CFPlus::OpenGL; 1613use DC::OpenGL;
1587 1614
1588sub new { 1615sub new {
1589 my $class = shift; 1616 my $class = shift;
1590 1617
1591 $class->SUPER::new ( 1618 $class->SUPER::new (
… …
1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)}; 1662 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1636 1663
1637 my $sw = sum @w[$c .. $c + $cs - 1]; 1664 my $sw = sum @w[$c .. $c + $cs - 1];
1638 1665
1639 if ($w > $sw) { 1666 if ($w > $sw) {
1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1667 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1641 } 1668 }
1642 } 1669 }
1643 1670
1644 # second pass, rows 1671 # second pass, rows
1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { 1672 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)}; 1673 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1647 1674
1648 my $sh = sum @h[$r .. $r + $rs - 1]; 1675 my $sh = sum @h[$r .. $r + $rs - 1];
1649 1676
1650 if ($h > $sh) { 1677 if ($h > $sh) {
1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1678 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1652 } 1679 }
1653 } 1680 }
1654 1681
1655 (\@w, \@h) 1682 (\@w, \@h)
1656} 1683}
… …
1679 @col_expand = (1) x @$ws unless @col_expand; 1706 @col_expand = (1) x @$ws unless @col_expand;
1680 my $col_expand = (sum @col_expand) || 1; 1707 my $col_expand = (sum @col_expand) || 1;
1681 1708
1682 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1709 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1683 1710
1684 CFPlus::UI::harmonize $ws; 1711 DC::UI::harmonize $ws;
1685 1712
1686 my @row_expand = @{$self->{row_expand}}; 1713 my @row_expand = @{$self->{row_expand}};
1687 @row_expand = (1) x @$ws unless @row_expand; 1714 @row_expand = (1) x @$ws unless @row_expand;
1688 my $row_expand = (sum @row_expand) || 1; 1715 my $row_expand = (sum @row_expand) || 1;
1689 1716
1690 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1717 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1691 1718
1692 CFPlus::UI::harmonize $hs; 1719 DC::UI::harmonize $hs;
1693 1720
1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1721 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1722 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1696 1723
1697 for my $widget ($self->children) { 1724 for my $widget ($self->children) {
… …
1706 1 1733 1
1707} 1734}
1708 1735
1709############################################################################# 1736#############################################################################
1710 1737
1711package CFPlus::UI::Fixed; 1738package DC::UI::Fixed;
1712 1739
1713use List::Util qw(min max); 1740use List::Util qw(min max);
1714 1741
1715our @ISA = CFPlus::UI::Container::; 1742our @ISA = DC::UI::Container::;
1716 1743
1717sub _scale($$$) { 1744sub _scale($$$) {
1718 my ($rel, $val, $max) = @_; 1745 my ($rel, $val, $max) = @_;
1719 1746
1720 $rel ? $val * $max : $val 1747 $rel ? $val * $max : $val
… …
1772 1 1799 1
1773} 1800}
1774 1801
1775############################################################################# 1802#############################################################################
1776 1803
1777package CFPlus::UI::Box; 1804package DC::UI::Box;
1778 1805
1779our @ISA = CFPlus::UI::Container::; 1806our @ISA = DC::UI::Container::;
1780 1807
1781sub size_request { 1808sub size_request {
1782 my ($self) = @_; 1809 my ($self) = @_;
1783 1810
1784 my @children = $self->visible_children; 1811 my @children = $self->visible_children;
… …
1819 $req[$_] += $space * $children[$_]{expand} 1846 $req[$_] += $space * $children[$_]{expand}
1820 for 0 .. $#children; 1847 for 0 .. $#children;
1821 } 1848 }
1822 } 1849 }
1823 1850
1824 CFPlus::UI::harmonize \@req; 1851 DC::UI::harmonize \@req;
1825 1852
1826 my $pos = 0; 1853 my $pos = 0;
1827 for (0 .. $#children) { 1854 for (0 .. $#children) {
1828 my $alloc = $req[$_]; 1855 my $alloc = $req[$_];
1829 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1856 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1834 1 1861 1
1835} 1862}
1836 1863
1837############################################################################# 1864#############################################################################
1838 1865
1839package CFPlus::UI::HBox; 1866package DC::UI::HBox;
1840 1867
1841our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1842 1869
1843sub new { 1870sub new {
1844 my $class = shift; 1871 my $class = shift;
1845 1872
1846 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1849 ) 1876 )
1850} 1877}
1851 1878
1852############################################################################# 1879#############################################################################
1853 1880
1854package CFPlus::UI::VBox; 1881package DC::UI::VBox;
1855 1882
1856our @ISA = CFPlus::UI::Box::; 1883our @ISA = DC::UI::Box::;
1857 1884
1858sub new { 1885sub new {
1859 my $class = shift; 1886 my $class = shift;
1860 1887
1861 $class->SUPER::new ( 1888 $class->SUPER::new (
… …
1864 ) 1891 )
1865} 1892}
1866 1893
1867############################################################################# 1894#############################################################################
1868 1895
1869package CFPlus::UI::Label; 1896package DC::UI::Label;
1870 1897
1871our @ISA = CFPlus::UI::DrawBG::; 1898our @ISA = DC::UI::DrawBG::;
1872 1899
1873use CFPlus::OpenGL; 1900use DC::OpenGL;
1874 1901
1875sub new { 1902sub new {
1876 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1877 1904
1878 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
… …
1883 #text => initial text 1910 #text => initial text
1884 #markup => initial narkup 1911 #markup => initial narkup
1885 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1886 #style => 0, # render flags 1913 #style => 0, # render flags
1887 ellipsise => 3, # end 1914 ellipsise => 3, # end
1888 layout => (new CFPlus::Layout), 1915 layout => (new DC::Layout),
1889 fontsize => 1, 1916 fontsize => 1,
1890 align => -1, 1917 align => 0.5,
1891 valign => -1, 1918 valign => 0.5,
1892 padding_x => 2, 1919 padding_x => 4,
1893 padding_y => 2, 1920 padding_y => 2,
1894 can_events => 0, 1921 can_events => 0,
1895 %arg 1922 %arg
1896 ); 1923 );
1897 1924
1898 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1899 my $layout = new CFPlus::Layout; 1926 my $layout = new DC::Layout;
1900 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1901 $self->{template} = $layout; 1928 $self->{template} = $layout;
1902 } 1929 }
1903 1930
1904 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
… …
1963 1990
1964 $self->{size_req} ||= do { 1991 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh; 1992 my ($max_w, $max_h) = $self->get_max_wh;
1966 1993
1967 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1994 $self->{layout}->set_font ($self->{font}) if $self->{font};
1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1); 1995 $self->{layout}->set_width ($max_w);
1969 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1996 $self->{layout}->set_ellipsise ($self->{ellipsise});
1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1997 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1998 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1972 1999
1973 my ($w, $h) = $self->{layout}->size; 2000 my ($w, $h) = $self->{layout}->size;
1974 2001
1975 if (exists $self->{template}) { 2002 if (exists $self->{template}) {
1976 $self->{template}->set_font ($self->{font}) if $self->{font}; 2003 $self->{template}->set_font ($self->{font}) if $self->{font};
1977 $self->{template}->set_width ($self->{max_w} || -1); 2004 $self->{template}->set_width ($max_w);
1978 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2005 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1979 2006
1980 my ($w2, $h2) = $self->{template}->size; 2007 my ($w2, $h2) = $self->{template}->size;
1981 2008
1982 $w = List::Util::max $w, $w2; 2009 $w = List::Util::max $w, $w2;
… …
2038 2065
2039 [$self->{layout}->size] 2066 [$self->{layout}->size]
2040 }; 2067 };
2041 2068
2042 unless (exists $self->{ox}) { 2069 unless (exists $self->{ox}) {
2043 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2070 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2044 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2071 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2045 : ($self->{w} - $size->[0]) * 0.5);
2046
2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2049 : ($self->{h} - $size->[1]) * 0.5);
2050 2072
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2073 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2052 }; 2074 };
2053 2075
2054# unless ($self->{list}) { 2076# unless ($self->{list}) {
2055# $self->{list} = CFPlus::OpenGL::glGenList; 2077# $self->{list} = DC::OpenGL::glGenList;
2056# CFPlus::OpenGL::glNewList $self->{list}; 2078# DC::OpenGL::glNewList $self->{list};
2057# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2079# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2058# CFPlus::OpenGL::glEndList; 2080# DC::OpenGL::glEndList;
2059# } 2081# }
2060# 2082#
2061# CFPlus::OpenGL::glCallList $self->{list}; 2083# DC::OpenGL::glCallList $self->{list};
2062 2084
2063 $self->{layout}->draw; 2085 $self->{layout}->draw;
2064} 2086}
2065 2087
2066#sub destroy { 2088#sub destroy {
2067# my ($self) = @_; 2089# my ($self) = @_;
2068# 2090#
2069# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2091# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2070# 2092#
2071# $self->SUPER::destroy; 2093# $self->SUPER::destroy;
2072#} 2094#}
2073 2095
2074############################################################################# 2096#############################################################################
2075 2097
2076package CFPlus::UI::EntryBase; 2098package DC::UI::EntryBase;
2077 2099
2078our @ISA = CFPlus::UI::Label::; 2100our @ISA = DC::UI::Label::;
2079 2101
2080use CFPlus::OpenGL; 2102use DC::OpenGL;
2081 2103
2082sub new { 2104sub new {
2083 my $class = shift; 2105 my $class = shift;
2084 2106
2085 $class->SUPER::new ( 2107 $class->SUPER::new (
2086 fg => [1, 1, 1], 2108 fg => [1, 1, 1],
2087 bg => [0, 0, 0, 0.2], 2109 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1], 2110 outline => undef,
2089 active_bg => [0, 0, 1, .2], 2111 active_bg => [0, 0, 1, .2],
2090 active_fg => [1, 1, 1], 2112 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0], 2113 active_outline => [1, 1, 0],
2092 can_hover => 1, 2114 can_hover => 1,
2093 can_focus => 1, 2115 can_focus => 1,
2116 align => 0,
2094 valign => 0, 2117 valign => 0.5,
2095 can_events => 1, 2118 can_events => 1,
2096 ellipsise => 0, 2119 ellipsise => 0,
2120 padding_x => 4,
2121 padding_y => 2,
2097 #text => ... 2122 #text => ...
2098 #hidden => "*", 2123 #hidden => "*",
2099 @_ 2124 @_
2100 ) 2125 )
2101} 2126}
… …
2148 2173
2149 my $text = $self->get_text; 2174 my $text = $self->get_text;
2150 2175
2151 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2176 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2152 2177
2153 if ($uni == 8) { 2178 if ($sym == DC::SDLK_BACKSPACE) {
2154 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2179 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2155 } elsif ($uni == 127) { 2180 } elsif ($sym == DC::SDLK_DELETE) {
2156 substr $text, $self->{cursor}, 1, ""; 2181 substr $text, $self->{cursor}, 1, "";
2157 } elsif ($sym == CFPlus::SDLK_LEFT) { 2182 } elsif ($sym == DC::SDLK_LEFT) {
2158 --$self->{cursor} if $self->{cursor}; 2183 --$self->{cursor} if $self->{cursor};
2159 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2184 } elsif ($sym == DC::SDLK_RIGHT) {
2160 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2185 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2161 } elsif ($sym == CFPlus::SDLK_HOME) { 2186 } elsif ($sym == DC::SDLK_HOME) {
2162 # what a hack 2187 # what a hack
2163 $self->{cursor} = 2188 $self->{cursor} =
2164 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2189 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2165 ? length $1 2190 ? length $1
2166 : 0; 2191 : 0;
2167 } elsif ($sym == CFPlus::SDLK_END) { 2192 } elsif ($sym == DC::SDLK_END) {
2168 # uh, again 2193 # uh, again
2169 $self->{cursor} = 2194 $self->{cursor} =
2170 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2195 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2171 ? $self->{cursor} + length $1 2196 ? $self->{cursor} + length $1
2172 : length $self->{text}; 2197 : length $self->{text};
… …
2263 glColor @{$self->{active_outline}}; 2288 glColor @{$self->{active_outline}};
2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2289 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2265 glLineWidth 1; 2290 glLineWidth 1;
2266 2291
2267 } else { 2292 } else {
2268 glColor @{$self->{outline}}; 2293 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2269 glBegin GL_LINE_STRIP; 2294 glBegin GL_LINE_STRIP;
2270 glVertex .5, $self->{h} * .5; 2295 glVertex .5, $self->{h} * .5;
2271 glVertex .5, $self->{h} - 2.5; 2296 glVertex .5, $self->{h} - 2.5;
2272 glVertex $self->{w} - .5, $self->{h} - 2.5; 2297 glVertex $self->{w} - .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} * .5; 2298 glVertex $self->{w} - .5, $self->{h} * .5;
… …
2275 } 2300 }
2276} 2301}
2277 2302
2278############################################################################# 2303#############################################################################
2279 2304
2280package CFPlus::UI::Entry; 2305package DC::UI::Entry;
2281 2306
2282our @ISA = CFPlus::UI::EntryBase::; 2307our @ISA = DC::UI::EntryBase::;
2283 2308
2284use CFPlus::OpenGL; 2309use DC::OpenGL;
2310
2311sub new {
2312 my $class = shift;
2313
2314 $class->SUPER::new (
2315 history_pointer => -1,
2316 @_
2317 )
2318}
2319
2285 2320
2286sub invoke_key_down { 2321sub invoke_key_down {
2287 my ($self, $ev) = @_; 2322 my ($self, $ev) = @_;
2288 2323
2289 my $sym = $ev->{sym}; 2324 my $sym = $ev->{sym};
… …
2295 $self->{history_pointer} = -1; 2330 $self->{history_pointer} = -1;
2296 $self->{history_saveback} = ''; 2331 $self->{history_saveback} = '';
2297 $self->emit (activate => $txt); 2332 $self->emit (activate => $txt);
2298 $self->update; 2333 $self->update;
2299 2334
2300 } elsif ($sym == CFPlus::SDLK_UP) { 2335 } elsif ($sym == DC::SDLK_UP) {
2301 if ($self->{history_pointer} < 0) { 2336 if ($self->{history_pointer} < 0) {
2302 $self->{history_saveback} = $self->get_text; 2337 $self->{history_saveback} = $self->get_text;
2303 } 2338 }
2304 if (@{$self->{history} || []} > 0) { 2339 if (@{$self->{history} || []} > 0) {
2305 $self->{history_pointer}++; 2340 $self->{history_pointer}++;
… …
2307 $self->{history_pointer} = @{$self->{history} || []} - 1; 2342 $self->{history_pointer} = @{$self->{history} || []} - 1;
2308 } 2343 }
2309 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2310 } 2345 }
2311 2346
2312 } elsif ($sym == CFPlus::SDLK_DOWN) { 2347 } elsif ($sym == DC::SDLK_DOWN) {
2313 $self->{history_pointer}--; 2348 $self->{history_pointer}--;
2314 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2349 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2315 2350
2316 if ($self->{history_pointer} >= 0) { 2351 if ($self->{history_pointer} >= 0) {
2317 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2352 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2318 } else { 2353 } else {
2354 if (defined $self->{history_saveback}) {
2319 $self->set_text ($self->{history_saveback}); 2355 $self->set_text ($self->{history_saveback});
2356 $self->{history_saveback} = undef;
2357 }
2320 } 2358 }
2321 2359
2322 } else { 2360 } else {
2323 return $self->SUPER::invoke_key_down ($ev) 2361 return $self->SUPER::invoke_key_down ($ev)
2324 } 2362 }
… …
2326 1 2364 1
2327} 2365}
2328 2366
2329############################################################################# 2367#############################################################################
2330 2368
2331package CFPlus::UI::TextEdit; 2369package DC::UI::TextEdit;
2332 2370
2333our @ISA = CFPlus::UI::EntryBase::; 2371our @ISA = DC::UI::EntryBase::;
2334 2372
2335use CFPlus::OpenGL; 2373use DC::OpenGL;
2374
2375sub new {
2376 my $class = shift;
2377
2378 $class->SUPER::new (
2379 padding_y => 4,
2380
2381 @_
2382 )
2383}
2336 2384
2337sub move_cursor_ver { 2385sub move_cursor_ver {
2338 my ($self, $dy) = @_; 2386 my ($self, $dy) = @_;
2339 2387
2340 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2388 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2341 2389
2342 $y += $dy; 2390 $line += $dy;
2343 2391
2344 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2392 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2345 $self->{cursor} = $index; 2393 $self->{cursor} = $index;
2346 delete $self->{cur_h}; 2394 delete $self->{cur_h};
2347 $self->update; 2395 $self->update;
2348 return; 2396 return;
2349 } 2397 }
… …
2352sub invoke_key_down { 2400sub invoke_key_down {
2353 my ($self, $ev) = @_; 2401 my ($self, $ev) = @_;
2354 2402
2355 my $sym = $ev->{sym}; 2403 my $sym = $ev->{sym};
2356 2404
2357 if ($sym == CFPlus::SDLK_UP) { 2405 if ($sym == DC::SDLK_UP) {
2358 $self->move_cursor_ver (-1); 2406 $self->move_cursor_ver (-1);
2359 } elsif ($sym == CFPlus::SDLK_DOWN) { 2407 } elsif ($sym == DC::SDLK_DOWN) {
2360 $self->move_cursor_ver (+1); 2408 $self->move_cursor_ver (+1);
2361 } else { 2409 } else {
2362 return $self->SUPER::invoke_key_down ($ev) 2410 return $self->SUPER::invoke_key_down ($ev)
2363 } 2411 }
2364 2412
2365 1 2413 1
2366} 2414}
2367 2415
2368############################################################################# 2416#############################################################################
2369 2417
2370package CFPlus::UI::ButtonBin; 2418package DC::UI::ButtonBin;
2371 2419
2372our @ISA = CFPlus::UI::Bin::; 2420our @ISA = DC::UI::Bin::;
2373 2421
2374use CFPlus::OpenGL; 2422use DC::OpenGL;
2375 2423
2376my @tex = 2424my @tex =
2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2425 map { new_from_resource DC::Texture $_, mipmap => 1 }
2378 qw(b1_button_inactive.png b1_button_active.png); 2426 qw(b1_button_inactive.png b1_button_active.png);
2379 2427
2380sub new { 2428sub new {
2381 my $class = shift; 2429 my $class = shift;
2382 2430
2383 $class->SUPER::new ( 2431 $class->SUPER::new (
2384 can_hover => 1, 2432 can_hover => 1,
2385 align => 0, 2433 align => 0.5,
2386 valign => 0, 2434 valign => 0.5,
2387 can_events => 1, 2435 can_events => 1,
2388 @_ 2436 @_
2389 ) 2437 )
2390} 2438}
2391 2439
… …
2414 $self->SUPER::_draw; 2462 $self->SUPER::_draw;
2415} 2463}
2416 2464
2417############################################################################# 2465#############################################################################
2418 2466
2419package CFPlus::UI::Button; 2467package DC::UI::Button;
2420 2468
2421our @ISA = CFPlus::UI::Label::; 2469our @ISA = DC::UI::Label::;
2422 2470
2423use CFPlus::OpenGL; 2471use DC::OpenGL;
2424 2472
2425my @tex = 2473my @tex =
2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2474 map { new_from_resource DC::Texture $_, mipmap => 1 }
2427 qw(b1_button_inactive.png b1_button_active.png); 2475 qw(b1_button_inactive.png b1_button_active.png);
2428 2476
2429sub new { 2477sub new {
2430 my $class = shift; 2478 my $class = shift;
2431 2479
2432 $class->SUPER::new ( 2480 $class->SUPER::new (
2433 padding_x => 4, 2481 padding_x => 8,
2434 padding_y => 4, 2482 padding_y => 4,
2435 fg => [1.0, 1.0, 1.0], 2483 fg => [1.0, 1.0, 1.0],
2436 active_fg => [0.8, 0.8, 0.8], 2484 active_fg => [0.8, 0.8, 0.8],
2437 can_hover => 1, 2485 can_hover => 1,
2438 align => 0, 2486 align => 0.5,
2439 valign => 0, 2487 valign => 0.5,
2440 can_events => 1, 2488 can_events => 1,
2441 @_ 2489 @_
2442 ) 2490 )
2443} 2491}
2444 2492
… …
2469 $self->SUPER::_draw; 2517 $self->SUPER::_draw;
2470} 2518}
2471 2519
2472############################################################################# 2520#############################################################################
2473 2521
2474package CFPlus::UI::CheckBox; 2522package DC::UI::CheckBox;
2475 2523
2476our @ISA = CFPlus::UI::DrawBG::; 2524our @ISA = DC::UI::DrawBG::;
2477 2525
2478my @tex = 2526my @tex =
2479 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2527 map { new_from_resource DC::Texture $_, mipmap => 1 }
2480 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2528 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2481 2529
2482use CFPlus::OpenGL; 2530use DC::OpenGL;
2483 2531
2484sub new { 2532sub new {
2485 my $class = shift; 2533 my $class = shift;
2486 2534
2487 $class->SUPER::new ( 2535 $class->SUPER::new (
2536 fontsize => 1,
2488 padding_x => 2, 2537 padding_x => 2,
2489 padding_y => 2, 2538 padding_y => 2,
2490 fg => [1, 1, 1], 2539 fg => [1, 1, 1],
2491 active_fg => [1, 1, 0], 2540 active_fg => [1, 1, 0],
2492 bg => [0, 0, 0, 0.2], 2541 bg => [0, 0, 0, 0.2],
… …
2498} 2547}
2499 2548
2500sub size_request { 2549sub size_request {
2501 my ($self) = @_; 2550 my ($self) = @_;
2502 2551
2503 (6) x 2 2552 ($self->{fontsize} * $::FONTSIZE) x 2
2504} 2553}
2505 2554
2506sub toggle { 2555sub toggle {
2507 my ($self) = @_; 2556 my ($self) = @_;
2508 2557
… …
2544 glDisable GL_TEXTURE_2D; 2593 glDisable GL_TEXTURE_2D;
2545} 2594}
2546 2595
2547############################################################################# 2596#############################################################################
2548 2597
2549package CFPlus::UI::Image; 2598package DC::UI::Image;
2550 2599
2551our @ISA = CFPlus::UI::Base::; 2600our @ISA = DC::UI::DrawBG::;
2552 2601
2553use CFPlus::OpenGL; 2602use DC::OpenGL;
2554 2603
2555our %texture_cache; 2604our %texture_cache;
2556 2605
2557sub new { 2606sub new {
2558 my $class = shift; 2607 my $class = shift;
… …
2565 2614
2566 $self->{path} || $self->{tex} 2615 $self->{path} || $self->{tex}
2567 or Carp::croak "'path' or 'tex' attributes required"; 2616 or Carp::croak "'path' or 'tex' attributes required";
2568 2617
2569 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2618 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2570 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2619 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2571 2620
2572 CFPlus::weaken $texture_cache{$self->{path}}; 2621 DC::weaken $texture_cache{$self->{path}};
2573 2622
2574 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2623 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2575 2624
2576 $self 2625 $self
2577} 2626}
2578 2627
2579sub STORABLE_freeze { 2628sub STORABLE_freeze {
2580 my ($self, $cloning) = @_; 2629 my ($self, $cloning) = @_;
2581 2630
2582 $self->{path} 2631 $self->{path}
2583 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2632 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2584 2633
2585 $self->{path} 2634 $self->{path}
2586} 2635}
2587 2636
2588sub STORABLE_attach { 2637sub STORABLE_attach {
2589 my ($self, $cloning, $path) = @_; 2638 my ($self, $cloning, $path) = @_;
2590 2639
2591 $self->new (path => $path) 2640 $self->new (path => $path)
2592} 2641}
2593 2642
2643sub set_texture {
2644 my ($self, $tex) = @_;
2645
2646 $self->{tex} = $tex;
2647 $self->update;
2648}
2649
2594sub size_request { 2650sub size_request {
2595 my ($self) = @_; 2651 my ($self) = @_;
2596 2652
2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale}) 2653 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2598} 2654}
2599 2655
2600sub _draw { 2656sub _draw {
2601 my ($self) = @_; 2657 my ($self) = @_;
2658
2659 $self->SUPER::_draw;
2602 2660
2603 my $tex = $self->{tex}; 2661 my $tex = $self->{tex};
2604 2662
2605 my ($w, $h) = ($self->{w}, $self->{h}); 2663 my ($w, $h) = ($self->{w}, $self->{h});
2606 2664
… …
2619 glDisable GL_TEXTURE_2D; 2677 glDisable GL_TEXTURE_2D;
2620} 2678}
2621 2679
2622############################################################################# 2680#############################################################################
2623 2681
2624package CFPlus::UI::ImageButton; 2682package DC::UI::ImageButton;
2625 2683
2626our @ISA = CFPlus::UI::Image::; 2684our @ISA = DC::UI::Image::;
2627 2685
2628use CFPlus::OpenGL; 2686use DC::OpenGL;
2629
2630my %textures;
2631 2687
2632sub new { 2688sub new {
2633 my $class = shift; 2689 my $class = shift;
2634 2690
2635 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2636 padding_x => 4, 2692 padding_x => 4,
2637 padding_y => 4, 2693 padding_y => 4,
2638 fg => [1, 1, 1], 2694 fg => [1, 1, 1],
2639 active_fg => [0, 0, 1], 2695 active_fg => [0, 0, 1],
2640 can_hover => 1, 2696 can_hover => 1,
2641 align => 0, 2697 align => 0.5,
2642 valign => 0, 2698 valign => 0.5,
2643 can_events => 1, 2699 can_events => 1,
2644 @_ 2700 @_
2645 ); 2701 );
2646} 2702}
2647 2703
… …
2661 1 2717 1
2662} 2718}
2663 2719
2664############################################################################# 2720#############################################################################
2665 2721
2666package CFPlus::UI::VGauge; 2722package DC::UI::VGauge;
2667 2723
2668our @ISA = CFPlus::UI::Base::; 2724our @ISA = DC::UI::Base::;
2669 2725
2670use List::Util qw(min max); 2726use List::Util qw(min max);
2671 2727
2672use CFPlus::OpenGL; 2728use DC::OpenGL;
2673 2729
2674my %tex = ( 2730my %tex = (
2675 food => [ 2731 food => [
2676 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2677 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2733 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2678 ], 2734 ],
2679 grace => [ 2735 grace => [
2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2681 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2737 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2682 ], 2738 ],
2683 hp => [ 2739 hp => [
2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2740 map { new_from_resource DC::Texture $_, mipmap => 1 }
2685 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2741 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2686 ], 2742 ],
2687 mana => [ 2743 mana => [
2688 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2744 map { new_from_resource DC::Texture $_, mipmap => 1 }
2689 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2745 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2690 ], 2746 ],
2691); 2747);
2692 2748
2693# eg. VGauge->new (gauge => 'food'), default gauge: food 2749# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2796 glDisable GL_TEXTURE_2D; 2852 glDisable GL_TEXTURE_2D;
2797} 2853}
2798 2854
2799############################################################################# 2855#############################################################################
2800 2856
2801package CFPlus::UI::Progress; 2857package DC::UI::Progress;
2802 2858
2803our @ISA = CFPlus::UI::Label::; 2859our @ISA = DC::UI::Label::;
2804 2860
2805use CFPlus::OpenGL; 2861use DC::OpenGL;
2806 2862
2807sub new { 2863sub new {
2808 my ($class, %arg) = @_; 2864 my ($class, %arg) = @_;
2809 2865
2810 my $self = $class->SUPER::new ( 2866 my $self = $class->SUPER::new (
2867 padding_x => 2,
2868 padding_y => 2,
2811 fg => [1, 1, 1], 2869 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2], 2870 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8], 2871 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0], 2872 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9, 2873 fontsize => 0.9,
2816 valign => 0, 2874 valign => 0.5,
2817 align => 0, 2875 align => 0.5,
2818 can_events => 1, 2876 can_events => 1,
2819 ellipsise => 1, 2877 ellipsise => 1,
2820 label => "%d%%", 2878 label => "%d%%",
2821 %arg, 2879 %arg,
2822 ); 2880 );
… …
2830 my ($self, $label) = @_; 2888 my ($self, $label) = @_;
2831 2889
2832 return if $self->{label} eq $label; 2890 return if $self->{label} eq $label;
2833 $self->{label} = $label; 2891 $self->{label} = $label;
2834 2892
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value}); 2893 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2836} 2894}
2837 2895
2838sub set_value { 2896sub set_value {
2839 my ($self, $value) = @_; 2897 my ($self, $value) = @_;
2840 2898
… …
2855 my ($self) = @_; 2913 my ($self) = @_;
2856 2914
2857 glEnable GL_BLEND; 2915 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2916 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859 2917
2918 my $px = $self->{padding_x};
2919 my $py = $self->{padding_y};
2920
2860 if ($self->{value} >= 0) { 2921 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value}; 2922 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2862 2923
2863 glColor_premultiply @{$self->{bar}}; 2924 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2; 2925 glRect $px, $py, $s, $self->{h} - $py;
2865 glColor_premultiply @{$self->{bg}}; 2926 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2; 2927 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2867 } 2928 }
2868 2929
2869 glColor_premultiply @{$self->{outline}}; 2930 glColor_premultiply @{$self->{outline}};
2931
2932 $px -= .5;
2933 $py -= .5;
2934
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2935 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2871 2936
2872 glDisable GL_BLEND; 2937 glDisable GL_BLEND;
2873 2938
2874 { 2939 {
2875 local $self->{bg}; # do not draw background 2940 local $self->{bg}; # do not draw background
… …
2877 } 2942 }
2878} 2943}
2879 2944
2880############################################################################# 2945#############################################################################
2881 2946
2882package CFPlus::UI::ExperienceProgress; 2947package DC::UI::ExperienceProgress;
2883 2948
2884our @ISA = CFPlus::UI::Progress::; 2949our @ISA = DC::UI::Progress::;
2885 2950
2886sub new { 2951sub new {
2887 my ($class, %arg) = @_; 2952 my ($class, %arg) = @_;
2888 2953
2954 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2955
2889 my $self = $class->SUPER::new ( 2956 my $self = $class->SUPER::new (
2957 %arg,
2890 tooltip => sub { 2958 tooltip => sub {
2891 my ($self) = @_; 2959 my ($self) = @_;
2892 2960
2893 sprintf "level %d\n%s points\n%s next level\n%s to go", 2961 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2962 $tt,
2894 $self->{lvl}, 2963 $self->{lvl},
2895 ::formsep ($self->{exp}), 2964 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}), 2965 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}), 2966 ::formsep ($self->{nxt} - $self->{exp}),
2967 $self->_percent * 100,
2898 }, 2968 },
2899 %arg
2900 ); 2969 );
2901 2970
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2971 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN; 2972 if $::CONN;
2904 2973
… …
2912 if $::CONN; 2981 if $::CONN;
2913 2982
2914 $self->SUPER::DESTROY; 2983 $self->SUPER::DESTROY;
2915} 2984}
2916 2985
2986sub _percent {
2987 my ($self) = @_;
2988
2989 my $table = $::CONN && $::CONN->{exp_table}
2990 or return -1;
2991
2992 my $l0 = $table->[$self->{lvl} - 1];
2993 my $l1 = $table->[$self->{lvl}];
2994
2995 $self->{nxt} = $l1;
2996
2997 ($self->{exp} - $l0) / ($l1 - $l0)
2998}
2999
2917sub set_value { 3000sub set_value {
2918 my ($self, $lvl, $exp) = @_; 3001 my ($self, $lvl, $exp) = @_;
2919 3002
2920 $self->{lvl} = $lvl; 3003 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp; 3004 $self->{exp} = $exp;
2922 3005
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v); 3006 $self->SUPER::set_value ($self->_percent);
2935} 3007}
2936 3008
2937############################################################################# 3009#############################################################################
2938 3010
2939package CFPlus::UI::Gauge; 3011package DC::UI::Gauge;
2940 3012
2941our @ISA = CFPlus::UI::VBox::; 3013our @ISA = DC::UI::VBox::;
2942 3014
2943sub new { 3015sub new {
2944 my ($class, %arg) = @_; 3016 my ($class, %arg) = @_;
2945 3017
2946 my $self = $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
… …
2948 can_hover => 1, 3020 can_hover => 1,
2949 can_events => 1, 3021 can_events => 1,
2950 %arg, 3022 %arg,
2951 ); 3023 );
2952 3024
2953 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3025 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2954 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3026 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2955 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3027 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2956 3028
2957 $self 3029 $self
2958} 3030}
2959 3031
2960sub set_fontsize { 3032sub set_fontsize {
… …
2981 $self->{value}->set_text ($val); 3053 $self->{value}->set_text ($val);
2982} 3054}
2983 3055
2984############################################################################# 3056#############################################################################
2985 3057
2986package CFPlus::UI::Slider; 3058package DC::UI::Slider;
2987 3059
2988use strict; 3060use common::sense;
2989 3061
2990use CFPlus::OpenGL; 3062use DC::OpenGL;
2991 3063
2992our @ISA = CFPlus::UI::DrawBG::; 3064our @ISA = DC::UI::DrawBG::;
2993 3065
2994my @tex = 3066my @tex =
2995 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3067 map { new_from_resource DC::Texture $_ }
2996 qw(s1_slider.png s1_slider_bg.png); 3068 qw(s1_slider.png s1_slider_bg.png);
2997 3069
2998sub new { 3070sub new {
2999 my $class = shift; 3071 my $class = shift;
3000 3072
… …
3037sub set_value { 3109sub set_value {
3038 my ($self, $value) = @_; 3110 my ($self, $value) = @_;
3039 3111
3040 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3112 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
3041 3113
3042 $hi = $lo + 1 if $hi <= $lo; 3114 $hi = $lo if $hi < $lo;
3043 3115
3044 $page = $hi - $lo if $page > $hi - $lo; 3116 $value = $hi - $page if $value > $hi - $page;
3045
3046 $value = $lo if $value < $lo; 3117 $value = $lo if $value < $lo;
3047 $value = $hi - $page if $value > $hi - $page;
3048 3118
3049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
3050 if $unit; 3120 if $unit;
3051 3121
3052 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
3081 if ($GRAB == $self) { 3151 if ($GRAB == $self) {
3082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3152 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
3083 3153
3084 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3154 my (undef, $lo, $hi, $page) = @{$self->{range}};
3085 3155
3086 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3156 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
3087 3157
3088 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3158 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
3089 } else { 3159 } else {
3090 return 0; 3160 return 0;
3091 } 3161 }
… …
3096sub invoke_mouse_wheel { 3166sub invoke_mouse_wheel {
3097 my ($self, $ev) = @_; 3167 my ($self, $ev) = @_;
3098 3168
3099 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3169 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3100 3170
3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3171 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3102 3172
3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3173 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3104 3174
3105 1 3175 1
3106} 3176}
… …
3116 my ($self) = @_; 3186 my ($self) = @_;
3117 3187
3118 unless ($self->{knob_w}) { 3188 unless ($self->{knob_w}) {
3119 $self->set_value ($self->{range}[0]); 3189 $self->set_value ($self->{range}[0]);
3120 3190
3121 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3191 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
3122 my $range = ($hi - $page - $lo) || 1e-100; 3192 my $range = ($hi - $page - $lo) || 1e-10;
3123 3193
3124 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3194 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
3125 3195
3126 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
3127 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
3128 3198
3129 $value = ($value - $lo) / $range; 3199 $value = ($value - $lo) / $range;
… …
3159 glDisable GL_TEXTURE_2D; 3229 glDisable GL_TEXTURE_2D;
3160} 3230}
3161 3231
3162############################################################################# 3232#############################################################################
3163 3233
3164package CFPlus::UI::ValSlider; 3234package DC::UI::ValSlider;
3165 3235
3166our @ISA = CFPlus::UI::HBox::; 3236our @ISA = DC::UI::HBox::;
3167 3237
3168sub new { 3238sub new {
3169 my ($class, %arg) = @_; 3239 my ($class, %arg) = @_;
3170 3240
3171 my $range = delete $arg{range}; 3241 my $range = delete $arg{range};
3172 3242
3173 my $self = $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
3174 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3244 slider => (new DC::UI::Slider expand => 1, range => $range),
3175 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3245 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3176 to_value => sub { shift }, 3246 to_value => sub { shift },
3177 from_value => sub { shift }, 3247 from_value => sub { shift },
3178 %arg, 3248 %arg,
3179 ); 3249 );
3180 3250
… …
3200sub set_range { shift->{slider}->set_range (@_) } 3270sub set_range { shift->{slider}->set_range (@_) }
3201sub set_value { shift->{slider}->set_value (@_) } 3271sub set_value { shift->{slider}->set_value (@_) }
3202 3272
3203############################################################################# 3273#############################################################################
3204 3274
3205package CFPlus::UI::TextScroller; 3275package DC::UI::TextScroller;
3206 3276
3207our @ISA = CFPlus::UI::HBox::; 3277our @ISA = DC::UI::HBox::;
3208 3278
3209use CFPlus::OpenGL; 3279use DC::OpenGL;
3210 3280
3211sub new { 3281sub new {
3212 my $class = shift; 3282 my $class = shift;
3213 3283
3214 my $self = $class->SUPER::new ( 3284 my $self = $class->SUPER::new (
… …
3216 can_events => 1, 3286 can_events => 1,
3217 indent => 0, 3287 indent => 0,
3218 #font => default_font 3288 #font => default_font
3219 @_, 3289 @_,
3220 3290
3221 layout => (new CFPlus::Layout), 3291 layout => (new DC::Layout),
3222 par => [], 3292 par => [],
3223 max_par => 0, 3293 max_par => 0,
3224 height => 0, 3294 height => 0,
3225 children => [ 3295 children => [
3226 (new CFPlus::UI::Empty expand => 1), 3296 (new DC::UI::Empty expand => 1),
3227 (new CFPlus::UI::Slider vertical => 1), 3297 (new DC::UI::Slider vertical => 1),
3228 ], 3298 ],
3229 ); 3299 );
3230 3300
3231 $self->{children}[1]->connect (changed => sub { $self->update }); 3301 $self->{children}[1]->connect (changed => sub { $self->update });
3232 3302
… …
3288 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3358 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3289 $layout->set_markup ($para->{markup}); 3359 $layout->set_markup ($para->{markup});
3290 3360
3291 $layout->set_shapes ( 3361 $layout->set_shapes (
3292 map 3362 map
3293 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3363 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3294 @{$para->{widget}} 3364 @{$para->{widget}}
3295 ); 3365 );
3296 3366
3297 $layout 3367 $layout
3298} 3368}
… …
3415 $ROOT->on_post_alloc ($self => sub { 3485 $ROOT->on_post_alloc ($self => sub {
3416 $self->force_uptodate; 3486 $self->force_uptodate;
3417 3487
3418 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3488 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3419 3489
3420 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3490 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3421 glClearColor 0, 0, 0, 0; 3491 glClearColor 0, 0, 0, 0;
3422 glClear GL_COLOR_BUFFER_BIT; 3492 glClear GL_COLOR_BUFFER_BIT;
3423 3493
3424 package CFPlus::UI::Base; 3494 package DC::UI::Base;
3425 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3495 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3426 (0, 0, $self->{w}, $self->{h}); 3496 (0, 0, $self->{w}, $self->{h});
3427 3497
3428 my $top = int $self->{children}[1]{range}[0]; 3498 my $top = int $self->{children}[1]{range}[0];
3429 3499
… …
3488 $self->{children}[1]->draw; 3558 $self->{children}[1]->draw;
3489} 3559}
3490 3560
3491############################################################################# 3561#############################################################################
3492 3562
3493package CFPlus::UI::Animator; 3563package DC::UI::Animator;
3494 3564
3495use CFPlus::OpenGL; 3565use DC::OpenGL;
3496 3566
3497our @ISA = CFPlus::UI::Bin::; 3567our @ISA = DC::UI::Bin::;
3498 3568
3499sub moveto { 3569sub moveto {
3500 my ($self, $x, $y) = @_; 3570 my ($self, $x, $y) = @_;
3501 3571
3502 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3572 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3530 glPopMatrix; 3600 glPopMatrix;
3531} 3601}
3532 3602
3533############################################################################# 3603#############################################################################
3534 3604
3535package CFPlus::UI::Flopper; 3605package DC::UI::Flopper;
3536 3606
3537our @ISA = CFPlus::UI::Button::; 3607our @ISA = DC::UI::Button::;
3538 3608
3539sub new { 3609sub new {
3540 my $class = shift; 3610 my $class = shift;
3541 3611
3542 my $self = $class->SUPER::new ( 3612 my $self = $class->SUPER::new (
… …
3554 $self->{other}->toggle_visibility; 3624 $self->{other}->toggle_visibility;
3555} 3625}
3556 3626
3557############################################################################# 3627#############################################################################
3558 3628
3559package CFPlus::UI::Tooltip; 3629package DC::UI::Tooltip;
3560 3630
3561our @ISA = CFPlus::UI::Bin::; 3631our @ISA = DC::UI::Bin::;
3562 3632
3563use CFPlus::OpenGL; 3633use DC::OpenGL;
3564 3634
3565sub new { 3635sub new {
3566 my $class = shift; 3636 my $class = shift;
3567 3637
3568 $class->SUPER::new ( 3638 $class->SUPER::new (
… …
3575 my ($self, $widget) = @_; 3645 my ($self, $widget) = @_;
3576 3646
3577 my $tip = $widget->{tooltip}; 3647 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip; 3648 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579 3649
3580 $tip = CFPlus::Pod::section_label tooltip => $1 3650 $tip = DC::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/; 3651 if $tip =~ /^#(.*)$/;
3582 3652
3583 if ($ENV{CFPLUS_DEBUG} & 2) { 3653 if ($ENV{CFPLUS_DEBUG} & 2) {
3584 $tip .= "\n\n" . (ref $widget) . "\n" 3654 $tip .= "\n\n" . (ref $widget) . "\n"
3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3655 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
… …
3588 } 3658 }
3589 3659
3590 $tip =~ s/^\n+//; 3660 $tip =~ s/^\n+//;
3591 $tip =~ s/\n+$//; 3661 $tip =~ s/\n+$//;
3592 3662
3593 $self->add (new CFPlus::UI::Label 3663 $self->add (new DC::UI::Label
3664 fg => $DC::THEME{tooltip_fg},
3594 markup => $tip, 3665 markup => $tip,
3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3666 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3667 align => 0,
3596 fontsize => 0.8, 3668 fontsize => 0.8,
3597 style => 1, # FLAG_INVERSE 3669 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3598 ellipsise => 0, 3670 ellipsise => 0,
3599 font => ($widget->{tooltip_font} || $::FONT_PROP), 3671 font => ($widget->{tooltip_font} || $::FONT_PROP),
3600 ); 3672 );
3601} 3673}
3602 3674
… …
3639sub _draw { 3711sub _draw {
3640 my ($self) = @_; 3712 my ($self) = @_;
3641 3713
3642 my ($w, $h) = @$self{qw(w h)}; 3714 my ($w, $h) = @$self{qw(w h)};
3643 3715
3644 glColor 1, 0.8, 0.4; 3716 glColor @{ $DC::THEME{tooltip_bg} };
3645 glRect 0, 0, $w, $h; 3717 glRect 0, 0, $w, $h;
3646 3718
3647 glColor 0, 0, 0; 3719 glColor @{ $DC::THEME{tooltip_border} };
3648 glRect_lineloop .5, .5, $w + .5, $h + .5; 3720 glRect_lineloop .5, .5, $w + .5, $h + .5;
3649 3721
3650 glTranslate 2, 2; 3722 glTranslate 2, 2;
3651 3723
3652 $self->SUPER::_draw; 3724 $self->SUPER::_draw;
3653} 3725}
3654 3726
3655############################################################################# 3727#############################################################################
3656 3728
3657package CFPlus::UI::Face; 3729package DC::UI::Face;
3658 3730
3659our @ISA = CFPlus::UI::DrawBG::; 3731our @ISA = DC::UI::DrawBG::;
3660 3732
3661use CFPlus::OpenGL; 3733use DC::OpenGL;
3662 3734
3663sub new { 3735sub new {
3664 my $class = shift; 3736 my $class = shift;
3665 3737
3666 my $self = $class->SUPER::new ( 3738 my $self = $class->SUPER::new (
… …
3669 aspect => 1, 3741 aspect => 1,
3670 can_events => 0, 3742 can_events => 0,
3671 @_, 3743 @_,
3672 ); 3744 );
3673 3745
3674 if ($self->{anim} && $self->{animspeed}) {
3675 CFPlus::weaken (my $widget = $self);
3676
3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3679 $self->{timer} = Event->timer (
3680 parked => 1,
3681 cb => sub {
3682 return unless $::CONN;
3683
3684 my $w = $widget
3685 or return;
3686
3687 ++$w->{frame};
3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3691 $w->update;
3692 $w->update_timer;
3693 },
3694 );
3695
3696 $self->update_face;
3697 $self->update_timer; 3746 $self->update_anim;
3698 }
3699 3747
3700 $self 3748 $self
3701} 3749}
3702 3750
3703sub update_timer { 3751sub update_timer {
3704 my ($self) = @_; 3752 my ($self) = @_;
3705 3753
3706 return unless $self->{timer}; 3754 return unless $self->{timer};
3707 3755
3708 if ($self->{visible}) { 3756 if ($self->{visible}) {
3709 $self->{timer}->at (
3710 $self->{anim_start}
3711 + $self->{animspeed}
3712 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3713 );
3714 $self->{timer}->start; 3757 $self->{timer}->start;
3715 } else { 3758 } else {
3716 $self->{timer}->stop; 3759 $self->{timer}->stop;
3717 } 3760 }
3718} 3761}
… …
3731 $tex->upload (sub { $self->reconfigure }); 3774 $tex->upload (sub { $self->reconfigure });
3732 } 3775 }
3733 } 3776 }
3734 } 3777 }
3735 } 3778 }
3779 }
3780}
3781
3782sub update_anim {
3783 my ($self) = @_;
3784
3785 if ($self->{anim} && $self->{animspeed}) {
3786 DC::weaken (my $widget = $self);
3787
3788 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3789 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3790 return unless $::CONN;
3791
3792 my $w = $widget
3793 or return;
3794
3795 ++$w->{frame};
3796 $w->update_face;
3797
3798 # somehow, $widget can go away
3799 $w->update;
3800 $w->update_timer;
3801 };
3802
3803 $self->update_face;
3804 $self->update_timer;
3805 } else {
3806 delete $self->{timer};
3736 } 3807 }
3737} 3808}
3738 3809
3739sub size_request { 3810sub size_request {
3740 my ($self) = @_; 3811 my ($self) = @_;
… …
3762 return unless $self->{visible}; 3833 return unless $self->{visible};
3763 3834
3764 $self->SUPER::update; 3835 $self->SUPER::update;
3765} 3836}
3766 3837
3838sub set_face {
3839 my ($self, $face) = @_;
3840
3841 $self->{face} = $face;
3842 $self->reconfigure;
3843}
3844
3845sub set_anim {
3846 my ($self, $anim) = @_;
3847
3848 $self->{anim} = $anim;
3849 $self->update_anim;
3850}
3851
3852sub set_animspeed {
3853 my ($self, $animspeed) = @_;
3854
3855 $self->{animspeed} = $animspeed;
3856 $self->update_anim;
3857}
3858
3767sub invoke_visibility_change { 3859sub invoke_visibility_change {
3768 my ($self) = @_; 3860 my ($self) = @_;
3769 3861
3770 $self->update_timer; 3862 $self->update_timer;
3771 3863
… …
3795 $self->SUPER::destroy; 3887 $self->SUPER::destroy;
3796} 3888}
3797 3889
3798############################################################################# 3890#############################################################################
3799 3891
3800package CFPlus::UI::Buttonbar; 3892package DC::UI::Buttonbar;
3801 3893
3802our @ISA = CFPlus::UI::HBox::; 3894our @ISA = DC::UI::HBox::;
3803 3895
3804# TODO: should actually wrap buttons and other goodies. 3896# TODO: should actually wrap buttons and other goodies.
3805 3897
3806############################################################################# 3898#############################################################################
3807 3899
3808package CFPlus::UI::Menu; 3900package DC::UI::Menu;
3809 3901
3810our @ISA = CFPlus::UI::Toplevel::; 3902our @ISA = DC::UI::Toplevel::;
3811 3903
3812use CFPlus::OpenGL; 3904use DC::OpenGL;
3813 3905
3814sub new { 3906sub new {
3815 my $class = shift; 3907 my $class = shift;
3816 3908
3817 my $self = $class->SUPER::new ( 3909 my $self = $class->SUPER::new (
3818 items => [], 3910 items => [],
3819 z => 100, 3911 z => 100,
3820 @_, 3912 @_,
3821 ); 3913 );
3822 3914
3823 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3915 $self->add ($self->{vbox} = new DC::UI::VBox);
3824 3916
3825 for my $item (@{ $self->{items} }) { 3917 for my $item (@{ $self->{items} }) {
3826 my ($widget, $cb, $tooltip) = @$item; 3918 my ($widget, $cb, $tooltip) = @$item;
3827 3919
3828 # handle various types of items, only text for now 3920 # handle various types of items, only text for now
3829 if (!ref $widget) { 3921 if (!ref $widget) {
3830 if ($widget =~ /\t/) { 3922 if ($widget =~ /\t/) {
3831 my ($left, $right) = split /\t/, $widget, 2; 3923 my ($left, $right) = split /\t/, $widget, 2;
3832 3924
3833 $widget = new CFPlus::UI::HBox 3925 $widget = new DC::UI::HBox
3834 can_hover => 1, 3926 can_hover => 1,
3835 can_events => 1, 3927 can_events => 1,
3836 tooltip => $tooltip, 3928 tooltip => $tooltip,
3837 children => [ 3929 children => [
3838 (new CFPlus::UI::Label markup => $left, expand => 1), 3930 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3839 (new CFPlus::UI::Label markup => $right, align => +1), 3931 (new DC::UI::Label markup => $right, align => 1),
3840 ], 3932 ],
3841 ; 3933 ;
3842 3934
3843 } else { 3935 } else {
3844 $widget = new CFPlus::UI::Label 3936 $widget = new DC::UI::Label
3845 can_hover => 1, 3937 can_hover => 1,
3846 can_events => 1, 3938 can_events => 1,
3939 align => 0,
3847 markup => $widget, 3940 markup => $widget,
3848 tooltip => $tooltip; 3941 tooltip => $tooltip;
3849 } 3942 }
3850 } 3943 }
3851 3944
… …
3866 # maybe save $GRAB? must be careful about events... 3959 # maybe save $GRAB? must be careful about events...
3867 $GRAB = $self; 3960 $GRAB = $self;
3868 $self->{button} = $ev->{button}; 3961 $self->{button} = $ev->{button};
3869 3962
3870 $self->show; 3963 $self->show;
3871 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3964
3965 my $x = $ev->{x};
3966 my $y = $ev->{y};
3967
3968 $self->{root}->on_post_alloc ($self => sub {
3969 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3970 });
3971
3972 1 # so it can be used inside event handlers
3872} 3973}
3873 3974
3874sub invoke_mouse_motion { 3975sub invoke_mouse_motion {
3875 my ($self, $ev, $x, $y) = @_; 3976 my ($self, $ev, $x, $y) = @_;
3876 3977
… …
3897 1 3998 1
3898} 3999}
3899 4000
3900############################################################################# 4001#############################################################################
3901 4002
3902package CFPlus::UI::Multiplexer; 4003package DC::UI::Multiplexer;
3903 4004
3904our @ISA = CFPlus::UI::Container::; 4005our @ISA = DC::UI::Container::;
3905 4006
3906sub new { 4007sub new {
3907 my $class = shift; 4008 my $class = shift;
3908 4009
3909 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3910 @_, 4011 @_,
3911 ); 4012 );
3912 4013
3913 $self->{current} = $self->{children}[0] 4014 $self->set_current_page (0);
3914 if @{ $self->{children} };
3915 4015
3916 $self 4016 $self
3917} 4017}
3918 4018
3919sub add { 4019sub add {
3920 my ($self, @widgets) = @_; 4020 my ($self, @widgets) = @_;
3921 4021
3922 $self->SUPER::add (@widgets); 4022 $self->SUPER::add (@widgets);
3923 4023
3924 $self->{current} = $self->{children}[0] 4024 $self->set_current_page (0)
3925 if @{ $self->{children} }; 4025 if @widgets == @{ $self->{children} };
3926} 4026}
3927 4027
3928sub get_current_page { 4028sub get_current_page {
3929 my ($self) = @_; 4029 my ($self) = @_;
3930 4030
… …
3936 4036
3937 my $widget = ref $page_or_widget 4037 my $widget = ref $page_or_widget
3938 ? $page_or_widget 4038 ? $page_or_widget
3939 : $self->{children}[$page_or_widget]; 4039 : $self->{children}[$page_or_widget];
3940 4040
4041 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4042
3941 $self->{current} = $widget; 4043 if (($self->{current} = $widget)) {
4044 $self->{current}->set_visible if $self->{current} && $self->{visible};
3942 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4045 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3943 4046
3944 $self->emit (page_changed => $self->{current}); 4047 $self->emit (page_changed => $self->{current});
4048 }
3945 4049
3946 $self->realloc; 4050 $self->realloc;
3947} 4051}
3948 4052
3949sub visible_children { 4053sub visible_children {
3950 $_[0]{current} 4054 $_[0]{current} || ()
3951} 4055}
3952 4056
3953sub size_request { 4057sub size_request {
3954 my ($self) = @_; 4058 my ($self) = @_;
3955 4059
4060 $self->{current}
3956 $self->{current}->size_request 4061 ? $self->{current}->size_request
4062 : (0, 0)
3957} 4063}
3958 4064
3959sub invoke_size_allocate { 4065sub invoke_size_allocate {
3960 my ($self, $w, $h) = @_; 4066 my ($self, $w, $h) = @_;
3961 4067
3962 $self->{current}->configure (0, 0, $w, $h); 4068 $self->{current}->configure (0, 0, $w, $h)
4069 if $self->{current};
3963 4070
3964 1 4071 1
3965} 4072}
3966 4073
3967sub _draw { 4074sub _draw {
3968 my ($self) = @_; 4075 my ($self) = @_;
3969 4076
3970 $self->{current}->draw; 4077 $self->{current}->draw
4078 if $self->{current};
3971} 4079}
3972 4080
3973############################################################################# 4081#############################################################################
3974 4082
3975package CFPlus::UI::Notebook; 4083package DC::UI::Notebook;
3976 4084
3977use CFPlus::OpenGL; 4085use DC::OpenGL;
3978 4086
3979our @ISA = CFPlus::UI::VBox::; 4087our @ISA = DC::UI::VBox::;
3980 4088
3981sub new { 4089sub new {
3982 my $class = shift; 4090 my $class = shift;
3983 4091
3984 my $self = $class->SUPER::new ( 4092 my $self = $class->SUPER::new (
3985 buttonbar => (new CFPlus::UI::Buttonbar), 4093 buttonbar => (new DC::UI::Buttonbar),
3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4094 multiplexer => (new DC::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2], 4095 active_outline => [.7, .7, 0.2],
3988 # filter => # will be put between multiplexer and $self 4096 # filter => # will be put between multiplexer and $self
3989 @_, 4097 @_,
3990 ); 4098 );
3991 4099
… …
4000 4108
4001 for my $child (@$widgets) { 4109 for my $child (@$widgets) {
4002 Scalar::Util::weaken $child; 4110 Scalar::Util::weaken $child;
4003 $child->{c_tab_} ||= do { 4111 $child->{c_tab_} ||= do {
4004 my $tab = 4112 my $tab =
4005 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4113 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4006 ? $child->{c_tab} 4114 ? $child->{c_tab}
4007 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4115 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4008 4116
4009 $tab->connect (activate => sub { 4117 $tab->connect (activate => sub {
4010 $wself->set_current_page ($child); 4118 $wself->set_current_page ($child);
4011 }); 4119 });
4012 4120
… …
4042} 4150}
4043 4151
4044sub pages { 4152sub pages {
4045 my ($self) = @_; 4153 my ($self) = @_;
4046 $self->{multiplexer}->children 4154 $self->{multiplexer}->children
4155}
4156
4157sub page_index {
4158 my ($self, $widget) = @_;
4159
4160 my $i = 0;
4161 for ($self->pages) {
4162 if ($_ eq $widget) { return $i };
4163 $i++;
4164 }
4165
4166 undef
4047} 4167}
4048 4168
4049sub add_tab { 4169sub add_tab {
4050 my ($self, $title, $widget, $tooltip) = @_; 4170 my ($self, $title, $widget, $tooltip) = @_;
4051 4171
… …
4088 } 4208 }
4089} 4209}
4090 4210
4091############################################################################# 4211#############################################################################
4092 4212
4093package CFPlus::UI::Selector; 4213package DC::UI::Selector;
4094 4214
4095use utf8; 4215use utf8;
4096 4216
4097our @ISA = CFPlus::UI::Button::; 4217our @ISA = DC::UI::Button::;
4098 4218
4099sub new { 4219sub new {
4100 my $class = shift; 4220 my $class = shift;
4101 4221
4102 my $self = $class->SUPER::new ( 4222 my $self = $class->SUPER::new (
… …
4119 my ($value, $title, $tooltip) = @$_; 4239 my ($value, $title, $tooltip) = @$_;
4120 4240
4121 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4241 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4122 } 4242 }
4123 4243
4124 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4244 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4125} 4245}
4126 4246
4127sub _set_value { 4247sub _set_value {
4128 my ($self, $value) = @_; 4248 my ($self, $value) = @_;
4129 4249
4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4250 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4251 $item ||= $self->{options}[0]
4131 or return; 4252 or return;
4132 4253
4133 $self->{value} = $item->[0]; 4254 $self->{value} = $item->[0];
4134 $self->set_markup ("$item->[1] ⇓"); 4255 $self->set_markup ("$item->[1] ⇓");
4135 $self->set_tooltip ($item->[2]); 4256# $self->set_tooltip ($item->[2]);
4136} 4257}
4137 4258
4138sub set_value { 4259sub set_value {
4139 my ($self, $value) = @_; 4260 my ($self, $value) = @_;
4140 4261
… …
4142 4263
4143 $self->_set_value ($value); 4264 $self->_set_value ($value);
4144 $self->emit (changed => $value); 4265 $self->emit (changed => $value);
4145} 4266}
4146 4267
4268sub set_options {
4269 my ($self, $options) = @_;
4270
4271 $self->{options} = $options;
4272 $self->_set_value ($self->{value});
4273}
4274
4147############################################################################# 4275#############################################################################
4148 4276
4149package CFPlus::UI::Statusbox; 4277package DC::UI::Statusbox;
4150 4278
4151our @ISA = CFPlus::UI::VBox::; 4279our @ISA = DC::UI::VBox::;
4152 4280
4153sub new { 4281sub new {
4154 my $class = shift; 4282 my $class = shift;
4155 4283
4156 my $self = $class->SUPER::new ( 4284 my $self = $class->SUPER::new (
4157 fontsize => 0.8, 4285 fontsize => 0.8,
4158 @_, 4286 @_,
4159 ); 4287 );
4160 4288
4161 CFPlus::weaken (my $this = $self); 4289 DC::weaken (my $this = $self);
4162 4290
4163 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4291 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4164 4292
4165 $self 4293 $self
4166} 4294}
4167 4295
4168sub reorder { 4296sub reorder {
4169 my ($self) = @_; 4297 my ($self) = @_;
4170 my $NOW = Time::HiRes::time; 4298 my $NOW = AE::time;
4171 4299
4172 # freeze display when hovering over any label 4300 # freeze display when hovering over any label
4173 return if $CFPlus::UI::TOOLTIP->{owner} 4301 return if $DC::UI::TOOLTIP->{owner}
4174 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4302 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4175 values %{ $self->{item} }; 4303 values %{ $self->{item} };
4176 4304
4177 while (my ($k, $v) = each %{ $self->{item} }) { 4305 while (my ($k, $v) = each %{ $self->{item} }) {
4178 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4306 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4179 } 4307 }
4308
4309 $self->{timer}->set (1, 1);
4180 4310
4181 my @widgets; 4311 my @widgets;
4182 4312
4183 my @items = sort { 4313 my @items = sort {
4184 $a->{pri} <=> $b->{pri} 4314 $a->{pri} <=> $b->{pri}
4185 or $b->{id} <=> $a->{id} 4315 or $b->{id} <=> $a->{id}
4186 } values %{ $self->{item} }; 4316 } values %{ $self->{item} };
4187
4188 $self->{timer}->interval (1);
4189 4317
4190 my $count = 10 + 1; 4318 my $count = 10 + 1;
4191 for my $item (@items) { 4319 for my $item (@items) {
4192 last unless --$count; 4320 last unless --$count;
4193 4321
… …
4200 for ($short) { 4328 for ($short) {
4201 s/^\s+//; 4329 s/^\s+//;
4202 s/\s+/ /g; 4330 s/\s+/ /g;
4203 } 4331 }
4204 4332
4205 new CFPlus::UI::Label 4333 new DC::UI::Label
4206 markup => $short, 4334 markup => $short,
4207 tooltip => $item->{tooltip}, 4335 tooltip => $item->{tooltip},
4208 tooltip_font => $::FONT_PROP, 4336 tooltip_font => $::FONT_PROP,
4209 tooltip_width => 0.67, 4337 tooltip_width => 0.67,
4210 fontsize => $item->{fontsize} || $self->{fontsize}, 4338 fontsize => $item->{fontsize} || $self->{fontsize},
4211 max_w => $::WIDTH * 0.44, 4339 max_w => $::WIDTH * 0.44,
4340 align => 0,
4212 fg => [@{ $item->{fg} }], 4341 fg => [@{ $item->{fg} }],
4213 can_events => 1, 4342 can_events => 1,
4214 can_hover => 1 4343 can_hover => 1
4215 }; 4344 };
4216 4345
4217 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4346 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4218 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4347 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4219 $label->update; 4348 $label->update;
4220 $label->set_max_size (undef, $label->{req_h} * $diff) 4349 $label->set_max_size (undef, $label->{req_h} * $diff)
4221 if $diff < 1; 4350 if $diff < 1;
4222 $self->{timer}->interval (1/30); 4351 $self->{timer}->set (1/30, 1/30);
4223 } else { 4352 } else {
4224 $label->{fg}[3] = $item->{fg}[3] || 1; 4353 $label->{fg}[3] = $item->{fg}[3] || 1;
4225 } 4354 }
4226 4355
4227 push @widgets, $label; 4356 push @widgets, $label;
4228 } 4357 }
4358
4359 my $hash = join ",", @widgets;
4360 return if $hash eq $self->{last_widget_hash};
4361 $self->{last_widget_hash} = $hash;
4229 4362
4230 $self->clear; 4363 $self->clear;
4231 $self->SUPER::add (reverse @widgets); 4364 $self->SUPER::add (reverse @widgets);
4232} 4365}
4233 4366
… …
4289 $self->SUPER::destroy; 4422 $self->SUPER::destroy;
4290} 4423}
4291 4424
4292############################################################################# 4425#############################################################################
4293 4426
4294package CFPlus::UI::Root; 4427package DC::UI::Root;
4295 4428
4296our @ISA = CFPlus::UI::Container::; 4429our @ISA = DC::UI::Container::;
4297 4430
4298use List::Util qw(min max); 4431use List::Util qw(min max);
4299 4432
4300use CFPlus::OpenGL; 4433use DC::OpenGL;
4301 4434
4302sub new { 4435sub new {
4303 my $class = shift; 4436 my $class = shift;
4304 4437
4305 my $self = $class->SUPER::new ( 4438 my $self = $class->SUPER::new (
4306 visible => 1, 4439 visible => 1,
4307 @_, 4440 @_,
4308 ); 4441 );
4309 4442
4310 CFPlus::weaken ($self->{root} = $self); 4443 DC::weaken ($self->{root} = $self);
4311 4444
4312 $self 4445 $self
4313} 4446}
4314 4447
4315sub size_request { 4448sub size_request {
… …
4363} 4496}
4364 4497
4365sub update { 4498sub update {
4366 my ($self) = @_; 4499 my ($self) = @_;
4367 4500
4368 $::WANT_REFRESH->start; 4501 $::WANT_REFRESH = 1;
4369} 4502}
4370 4503
4371sub add { 4504sub add {
4372 my ($self, @children) = @_; 4505 my ($self, @children) = @_;
4373 4506
… …
4440 4573
4441 delete $queue{$widget+0}; 4574 delete $queue{$widget+0};
4442 4575
4443 my ($w, $h) = $widget->size_request; 4576 my ($w, $h) = $widget->size_request;
4444 4577
4445 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4578 $w += $widget->{padding_x} * 2;
4446 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4579 $h += $widget->{padding_y} * 2;
4580
4581 $w = max $widget->{min_w}, $w;
4582 $h = max $widget->{min_h}, $h;
4447 4583
4448 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4584 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4449 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4585 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4450 4586
4451 $w = $widget->{force_w} if exists $widget->{force_w}; 4587 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4518 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4654 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4519 glMatrixMode GL_MODELVIEW; 4655 glMatrixMode GL_MODELVIEW;
4520 glLoadIdentity; 4656 glLoadIdentity;
4521 4657
4522 { 4658 {
4523 package CFPlus::UI::Base; 4659 package DC::UI::Base;
4524 4660
4525 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4661 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4526 (0, 0, $self->{w}, $self->{h}); 4662 (0, 0, $self->{w}, $self->{h});
4527 4663
4528 $self->_draw; 4664 $self->_draw;
4529 } 4665 }
4530} 4666}
4531 4667
4532############################################################################# 4668#############################################################################
4533 4669
4534package CFPlus::UI; 4670package DC::UI;
4535 4671
4536$ROOT = new CFPlus::UI::Root; 4672$ROOT = new DC::UI::Root;
4537$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4673$TOOLTIP = new DC::UI::Tooltip z => 900;
4538 4674
45391 46751
4540

Diff Legend

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