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.433 by root, Wed Aug 22 21:27:13 2007 UTC vs.
Revision 1.476 by root, Sun Jan 11 23:45:52 2009 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use Guard ();
9
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};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
… …
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
… …
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $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.]+$/;
199 $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.]+$/;
200 199
201 $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.]+$/;
202 $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};
… …
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use strict;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
… …
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $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};
256 $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};
257 $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};
258 $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};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __w_ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 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);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
… …
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
… …
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
… …
364 $self->{force_h} = $h; 369 $self->{force_h} = $h;
365 370
366 $self->realloc; 371 $self->realloc;
367} 372}
368 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
372} 395}
373 396
… …
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
… …
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
… …
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
… …
605} 628}
606 629
607sub DESTROY { 630sub DESTROY {
608 my ($self) = @_; 631 my ($self) = @_;
609 632
610 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
611 634
612 local $@; 635 local $@;
613 eval { $self->destroy }; 636 eval { $self->destroy };
614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
615 638
616 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
617} 640}
618 641
619############################################################################# 642#############################################################################
620 643
621package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
622 645
623our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
624 647
625use strict; 648use strict;
626use CFPlus::OpenGL; 649use DC::OpenGL;
627 650
628sub new { 651sub new {
629 my $class = shift; 652 my $class = shift;
630 653
631 $class->SUPER::new ( 654 $class->SUPER::new (
… …
653 } 676 }
654} 677}
655 678
656############################################################################# 679#############################################################################
657 680
658package CFPlus::UI::Empty; 681package DC::UI::Empty;
659 682
660our @ISA = CFPlus::UI::Base::; 683our @ISA = DC::UI::Base::;
661 684
662sub new { 685sub new {
663 my ($class, %arg) = @_; 686 my ($class, %arg) = @_;
664 $class->SUPER::new (can_events => 0, %arg); 687 $class->SUPER::new (can_events => 0, %arg);
665} 688}
… …
672 695
673sub draw { } 696sub draw { }
674 697
675############################################################################# 698#############################################################################
676 699
677package CFPlus::UI::Container; 700package DC::UI::Container;
678 701
679our @ISA = CFPlus::UI::Base::; 702our @ISA = DC::UI::Base::;
680 703
681sub new { 704sub new {
682 my ($class, %arg) = @_; 705 my ($class, %arg) = @_;
683 706
684 my $children = delete $arg{children}; 707 my $children = delete $arg{children};
… …
778 $_->draw for $self->visible_children; 801 $_->draw for $self->visible_children;
779} 802}
780 803
781############################################################################# 804#############################################################################
782 805
783package CFPlus::UI::Bin; 806package DC::UI::Bin;
784 807
785our @ISA = CFPlus::UI::Container::; 808our @ISA = DC::UI::Container::;
786 809
787sub new { 810sub new {
788 my ($class, %arg) = @_; 811 my ($class, %arg) = @_;
789 812
790 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 813 my $child = (delete $arg{child}) || new DC::UI::Empty::;
791 814
792 $class->SUPER::new (children => [$child], %arg) 815 $class->SUPER::new (children => [$child], %arg)
793} 816}
794 817
795sub add { 818sub add {
… …
802sub remove { 825sub remove {
803 my ($self, $widget) = @_; 826 my ($self, $widget) = @_;
804 827
805 $self->SUPER::remove ($widget); 828 $self->SUPER::remove ($widget);
806 829
807 $self->{children} = [new CFPlus::UI::Empty] 830 $self->{children} = [new DC::UI::Empty]
808 unless @{$self->{children}}; 831 unless @{$self->{children}};
809} 832}
810 833
811sub child { $_[0]->{children}[0] } 834sub child { $_[0]->{children}[0] }
812 835
… …
821 844
822 1 845 1
823} 846}
824 847
825############################################################################# 848#############################################################################
826
827# back-buffered drawing area 849# back-buffered drawing area
828 850
829package CFPlus::UI::Window; 851package DC::UI::Window;
830 852
831our @ISA = CFPlus::UI::Bin::; 853our @ISA = DC::UI::Bin::;
832 854
833use CFPlus::OpenGL; 855use DC::OpenGL;
834 856
835sub new { 857sub new {
836 my ($class, %arg) = @_; 858 my ($class, %arg) = @_;
837 859
838 my $self = $class->SUPER::new (%arg); 860 my $self = $class->SUPER::new (%arg);
… …
860} 882}
861 883
862sub render_child { 884sub render_child {
863 my ($self) = @_; 885 my ($self) = @_;
864 886
865 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 887 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
866 glClearColor 0, 0, 0, 0; 888 glClearColor 0, 0, 0, 0;
867 glClear GL_COLOR_BUFFER_BIT; 889 glClear GL_COLOR_BUFFER_BIT;
868 890
869 { 891 {
870 package CFPlus::UI::Base; 892 package DC::UI::Base;
871 893
872 local ($draw_x, $draw_y, $draw_w, $draw_h) = 894 local ($draw_x, $draw_y, $draw_w, $draw_h) =
873 (0, 0, $self->{w}, $self->{h}); 895 (0, 0, $self->{w}, $self->{h});
874 896
875 $self->_render; 897 $self->_render;
… …
892 glDisable GL_TEXTURE_2D; 914 glDisable GL_TEXTURE_2D;
893} 915}
894 916
895############################################################################# 917#############################################################################
896 918
897package CFPlus::UI::ViewPort; 919package DC::UI::ViewPort;
898 920
899use List::Util qw(min max); 921use List::Util qw(min max);
900 922
901our @ISA = CFPlus::UI::Window::; 923our @ISA = DC::UI::Window::;
902 924
903sub new { 925sub new {
904 my $class = shift; 926 my $class = shift;
905 927
906 $class->SUPER::new ( 928 $class->SUPER::new (
… …
990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1012 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
991 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1013 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
992 ) { 1014 ) {
993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1015 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
994 } else { 1016 } else {
995 $self->CFPlus::UI::Base::find_widget ($x, $y) 1017 $self->DC::UI::Base::find_widget ($x, $y)
996 } 1018 }
997} 1019}
998 1020
999sub _render { 1021sub _render {
1000 my ($self) = @_; 1022 my ($self) = @_;
1001 1023
1002 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1024 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1003 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1025 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1004 1026
1005 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1027 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1006 1028
1007 $self->SUPER::_render; 1029 $self->SUPER::_render;
1008} 1030}
1009 1031
1010############################################################################# 1032#############################################################################
1011 1033
1012package CFPlus::UI::ScrolledWindow; 1034package DC::UI::ScrolledWindow;
1013 1035
1014our @ISA = CFPlus::UI::Table::; 1036our @ISA = DC::UI::Table::;
1015 1037
1016sub new { 1038sub new {
1017 my ($class, %arg) = @_; 1039 my ($class, %arg) = @_;
1018 1040
1019 my $child = delete $arg{child}; 1041 my $child = delete $arg{child};
1020 1042
1021 my $self; 1043 my $self;
1022 1044
1023 my $hslider = new CFPlus::UI::Slider 1045 my $hslider = new DC::UI::Slider
1024 c_col => 0, 1046 c_col => 0,
1025 c_row => 1, 1047 c_row => 1,
1026 vertical => 0, 1048 vertical => 0,
1027 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
1028 on_changed => sub { 1050 on_changed => sub {
1029 $self->{hpos} = $_[1]; 1051 $self->{hpos} = $_[1];
1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1031 }, 1053 },
1032 ; 1054 ;
1033 1055
1034 my $vslider = new CFPlus::UI::Slider 1056 my $vslider = new DC::UI::Slider
1035 c_col => 1, 1057 c_col => 1,
1036 c_row => 0, 1058 c_row => 0,
1037 vertical => 1, 1059 vertical => 1,
1038 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
1039 on_changed => sub { 1061 on_changed => sub {
… …
1051 col_expand => [1, 0], 1073 col_expand => [1, 0],
1052 row_expand => [1, 0], 1074 row_expand => [1, 0],
1053 %arg, 1075 %arg,
1054 ); 1076 );
1055 1077
1056 $self->{vp} = new CFPlus::UI::ViewPort 1078 $self->{vp} = new DC::UI::ViewPort
1057 c_col => 0, 1079 c_col => 0,
1058 c_row => 0, 1080 c_row => 0,
1059 expand => 1, 1081 expand => 1,
1060 scroll_x => $self->{scroll_x}, 1082 scroll_x => $self->{scroll_x},
1061 scroll_y => $self->{scroll_y}, 1083 scroll_y => $self->{scroll_y},
… …
1187 $self->SUPER::invoke_size_allocate ($w, $h) 1209 $self->SUPER::invoke_size_allocate ($w, $h)
1188} 1210}
1189 1211
1190############################################################################# 1212#############################################################################
1191 1213
1192package CFPlus::UI::Frame; 1214package DC::UI::Frame;
1193 1215
1194our @ISA = CFPlus::UI::Bin::; 1216our @ISA = DC::UI::Bin::;
1195 1217
1196use CFPlus::OpenGL; 1218use DC::OpenGL;
1197 1219
1198sub new { 1220sub new {
1199 my $class = shift; 1221 my $class = shift;
1200 1222
1201 $class->SUPER::new ( 1223 $class->SUPER::new (
… …
1220 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1221} 1243}
1222 1244
1223############################################################################# 1245#############################################################################
1224 1246
1225package CFPlus::UI::FancyFrame; 1247package DC::UI::FancyFrame;
1226 1248
1227our @ISA = CFPlus::UI::Bin::; 1249our @ISA = DC::UI::Bin::;
1228 1250
1229use CFPlus::OpenGL; 1251use DC::OpenGL;
1230 1252
1231sub new { 1253sub new {
1232 my ($class, %arg) = @_; 1254 my ($class, %arg) = @_;
1233 1255
1234 if ((exists $arg{label}) && !ref $arg{label}) { 1256 if ((exists $arg{label}) && !ref $arg{label}) {
1235 $arg{label} = new CFPlus::UI::Label 1257 $arg{label} = new DC::UI::Label
1236 align => 1, 1258 align => 1,
1237 valign => 0, 1259 valign => 0.5,
1238 text => $arg{label}, 1260 text => $arg{label},
1239 fontsize => ($arg{border} || 0.8) * 0.75; 1261 fontsize => ($arg{border} || 0.8) * 0.75;
1240 } 1262 }
1241 1263
1242 my $self = $class->SUPER::new ( 1264 my $self = $class->SUPER::new (
1243 # label => "", 1265 # label => "",
1244 fg => [0.6, 0.3, 0.1], 1266 fg => undef,
1245 border => 0.8, 1267 border => 0.8,
1246 style => 'single', 1268 style => 'single',
1247 %arg, 1269 %arg,
1248 ); 1270 );
1249 1271
… …
1252 1274
1253sub add { 1275sub add {
1254 my ($self, @widgets) = @_; 1276 my ($self, @widgets) = @_;
1255 1277
1256 $self->SUPER::add (@widgets); 1278 $self->SUPER::add (@widgets);
1257 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1279 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1258} 1280}
1259 1281
1260sub border { 1282sub border {
1261 int $_[0]{border} * $::FONTSIZE 1283 int $_[0]{border} * $::FONTSIZE
1262} 1284}
… …
1302 my $border = $self->border; 1324 my $border = $self->border;
1303 my ($w, $h) = ($self->{w}, $self->{h}); 1325 my ($w, $h) = ($self->{w}, $self->{h});
1304 1326
1305 $child->draw; 1327 $child->draw;
1306 1328
1307 glColor @{$self->{fg}}; 1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1308 glBegin GL_LINE_STRIP; 1330 glBegin GL_LINE_STRIP;
1309 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1310 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1311 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1312 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1320 } 1342 }
1321} 1343}
1322 1344
1323############################################################################# 1345#############################################################################
1324 1346
1325package CFPlus::UI::Toplevel; 1347package DC::UI::Toplevel;
1326 1348
1327our @ISA = CFPlus::UI::Bin::; 1349our @ISA = DC::UI::Bin::;
1328 1350
1329use CFPlus::OpenGL; 1351use DC::OpenGL;
1330 1352
1331my $bg = 1353my $bg =
1332 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1333 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1334 1356
1335my @border = 1357my @border =
1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1358 map { new_from_resource DC::Texture $_, mipmap => 1 }
1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1338 1360
1339my @icon = 1361my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png); 1363 qw(x1_move.png x1_resize.png);
1342 1364
1343sub new { 1365sub new {
1344 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1345 1367
1346 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1347 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1348 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1349 border => 0.6, 1371 border => 0.8,
1350 can_events => 1, 1372 can_events => 1,
1351 min_w => 64, 1373 min_w => 64,
1352 min_h => 32, 1374 min_h => 32,
1353 %arg, 1375 %arg,
1354 ); 1376 );
1355 1377
1356 $self->{title_widget} = new CFPlus::UI::Label 1378 $self->{title_widget} = new DC::UI::Label
1357 align => 0, 1379 align => 0.5,
1358 valign => 1, 1380 valign => 1,
1359 text => $self->{title}, 1381 text => $self->{title},
1360 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1361 if exists $self->{title}; 1383 if exists $self->{title};
1362 1384
1363 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1364 $self->{close_button} = 1386 $self->{close_button} =
1365 new CFPlus::UI::ImageButton 1387 new DC::UI::ImageButton
1366 path => 'x1_close.png', 1388 path => 'x1_close.png',
1367 on_activate => sub { $self->emit ("delete") }; 1389 on_activate => sub { $self->emit ("delete") };
1368 1390
1369 $self->CFPlus::UI::Container::add ($self->{close_button}); 1391 $self->DC::UI::Container::add ($self->{close_button});
1370 } 1392 }
1371 1393
1372 $self 1394 $self
1373} 1395}
1374 1396
1375sub add { 1397sub add {
1376 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1377 1399
1378 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1379 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1401 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1380 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1402 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1381} 1403}
1382 1404
1383sub border { 1405sub border {
1384 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1407}
1408
1409sub get_max_wh {
1410 my ($self) = @_;
1411
1412 return ($self->{w}, $self->{h})
1413 if $self->{visible} && $self->{w};
1414
1415 $self->SUPER::get_max_wh
1385} 1416}
1386 1417
1387sub size_request { 1418sub size_request {
1388 my ($self) = @_; 1419 my ($self) = @_;
1389 1420
… …
1514 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1516 1547
1517 my $border = $self->border; 1548 my $border = $self->border;
1518 1549
1550 if ($border) {
1519 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524 1556
1525 # move 1557 # move
1526 my $w2 = ($w - $border) * .5; 1558 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5; 1559 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531 1563
1532 # resize 1564 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button}; 1567 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1538 1571
1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1540 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1541 1574
1542 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
… …
1561 if $self->{close_button}; 1594 if $self->{close_button};
1562} 1595}
1563 1596
1564############################################################################# 1597#############################################################################
1565 1598
1566package CFPlus::UI::Table; 1599package DC::UI::Table;
1567 1600
1568our @ISA = CFPlus::UI::Container::; 1601our @ISA = DC::UI::Container::;
1569 1602
1570use List::Util qw(max sum); 1603use List::Util qw(max sum);
1571 1604
1572use CFPlus::OpenGL; 1605use DC::OpenGL;
1573 1606
1574sub new { 1607sub new {
1575 my $class = shift; 1608 my $class = shift;
1576 1609
1577 $class->SUPER::new ( 1610 $class->SUPER::new (
… …
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)}; 1654 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622 1655
1623 my $sw = sum @w[$c .. $c + $cs - 1]; 1656 my $sw = sum @w[$c .. $c + $cs - 1];
1624 1657
1625 if ($w > $sw) { 1658 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1659 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 } 1660 }
1628 } 1661 }
1629 1662
1630 # second pass, rows 1663 # second pass, rows
1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { 1664 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)}; 1665 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1633 1666
1634 my $sh = sum @h[$r .. $r + $rs - 1]; 1667 my $sh = sum @h[$r .. $r + $rs - 1];
1635 1668
1636 if ($h > $sh) { 1669 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1670 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1638 } 1671 }
1639 } 1672 }
1640 1673
1641 (\@w, \@h) 1674 (\@w, \@h)
1642} 1675}
… …
1665 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1666 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1667 1700
1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1669 1702
1670 CFPlus::UI::harmonize $ws; 1703 DC::UI::harmonize $ws;
1671 1704
1672 my @row_expand = @{$self->{row_expand}}; 1705 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand; 1706 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1; 1707 my $row_expand = (sum @row_expand) || 1;
1675 1708
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677 1710
1678 CFPlus::UI::harmonize $hs; 1711 DC::UI::harmonize $hs;
1679 1712
1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1713 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1714 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1682 1715
1683 for my $widget ($self->children) { 1716 for my $widget ($self->children) {
… …
1692 1 1725 1
1693} 1726}
1694 1727
1695############################################################################# 1728#############################################################################
1696 1729
1697package CFPlus::UI::Fixed; 1730package DC::UI::Fixed;
1698 1731
1699use List::Util qw(min max); 1732use List::Util qw(min max);
1700 1733
1701our @ISA = CFPlus::UI::Container::; 1734our @ISA = DC::UI::Container::;
1702 1735
1703sub _scale($$$) { 1736sub _scale($$$) {
1704 my ($rel, $val, $max) = @_; 1737 my ($rel, $val, $max) = @_;
1705 1738
1706 $rel ? $val * $max : $val 1739 $rel ? $val * $max : $val
… …
1758 1 1791 1
1759} 1792}
1760 1793
1761############################################################################# 1794#############################################################################
1762 1795
1763package CFPlus::UI::Box; 1796package DC::UI::Box;
1764 1797
1765our @ISA = CFPlus::UI::Container::; 1798our @ISA = DC::UI::Container::;
1766 1799
1767sub size_request { 1800sub size_request {
1768 my ($self) = @_; 1801 my ($self) = @_;
1769 1802
1770 my @children = $self->visible_children; 1803 my @children = $self->visible_children;
… …
1805 $req[$_] += $space * $children[$_]{expand} 1838 $req[$_] += $space * $children[$_]{expand}
1806 for 0 .. $#children; 1839 for 0 .. $#children;
1807 } 1840 }
1808 } 1841 }
1809 1842
1810 CFPlus::UI::harmonize \@req; 1843 DC::UI::harmonize \@req;
1811 1844
1812 my $pos = 0; 1845 my $pos = 0;
1813 for (0 .. $#children) { 1846 for (0 .. $#children) {
1814 my $alloc = $req[$_]; 1847 my $alloc = $req[$_];
1815 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1848 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1820 1 1853 1
1821} 1854}
1822 1855
1823############################################################################# 1856#############################################################################
1824 1857
1825package CFPlus::UI::HBox; 1858package DC::UI::HBox;
1826 1859
1827our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1828 1861
1829sub new { 1862sub new {
1830 my $class = shift; 1863 my $class = shift;
1831 1864
1832 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1835 ) 1868 )
1836} 1869}
1837 1870
1838############################################################################# 1871#############################################################################
1839 1872
1840package CFPlus::UI::VBox; 1873package DC::UI::VBox;
1841 1874
1842our @ISA = CFPlus::UI::Box::; 1875our @ISA = DC::UI::Box::;
1843 1876
1844sub new { 1877sub new {
1845 my $class = shift; 1878 my $class = shift;
1846 1879
1847 $class->SUPER::new ( 1880 $class->SUPER::new (
… …
1850 ) 1883 )
1851} 1884}
1852 1885
1853############################################################################# 1886#############################################################################
1854 1887
1855package CFPlus::UI::Label; 1888package DC::UI::Label;
1856 1889
1857our @ISA = CFPlus::UI::DrawBG::; 1890our @ISA = DC::UI::DrawBG::;
1858 1891
1859use CFPlus::OpenGL; 1892use DC::OpenGL;
1860 1893
1861sub new { 1894sub new {
1862 my ($class, %arg) = @_; 1895 my ($class, %arg) = @_;
1863 1896
1864 my $self = $class->SUPER::new ( 1897 my $self = $class->SUPER::new (
… …
1869 #text => initial text 1902 #text => initial text
1870 #markup => initial narkup 1903 #markup => initial narkup
1871 #max_w => maximum pixel width 1904 #max_w => maximum pixel width
1872 #style => 0, # render flags 1905 #style => 0, # render flags
1873 ellipsise => 3, # end 1906 ellipsise => 3, # end
1874 layout => (new CFPlus::Layout), 1907 layout => (new DC::Layout),
1875 fontsize => 1, 1908 fontsize => 1,
1876 align => -1, 1909 align => 0.5,
1877 valign => -1, 1910 valign => 0.5,
1878 padding_x => 2, 1911 padding_x => 4,
1879 padding_y => 2, 1912 padding_y => 2,
1880 can_events => 0, 1913 can_events => 0,
1881 %arg 1914 %arg
1882 ); 1915 );
1883 1916
1884 if (exists $self->{template}) { 1917 if (exists $self->{template}) {
1885 my $layout = new CFPlus::Layout; 1918 my $layout = new DC::Layout;
1886 $layout->set_text (delete $self->{template}); 1919 $layout->set_text (delete $self->{template});
1887 $self->{template} = $layout; 1920 $self->{template} = $layout;
1888 } 1921 }
1889 1922
1890 if (exists $self->{markup}) { 1923 if (exists $self->{markup}) {
… …
1946 1979
1947sub size_request { 1980sub size_request {
1948 my ($self) = @_; 1981 my ($self) = @_;
1949 1982
1950 $self->{size_req} ||= do { 1983 $self->{size_req} ||= do {
1984 my ($max_w, $max_h) = $self->get_max_wh;
1985
1951 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1952 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($max_w);
1953 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1954 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1955 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1956 1991
1957 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1958 1993
1959 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1960 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1961 $self->{template}->set_width ($self->{max_w} || -1); 1996 $self->{template}->set_width ($max_w);
1962 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1963 1998
1964 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1965 2000
1966 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
2022 2057
2023 [$self->{layout}->size] 2058 [$self->{layout}->size]
2024 }; 2059 };
2025 2060
2026 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
2027 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2028 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2063 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2029 : ($self->{w} - $size->[0]) * 0.5);
2030
2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2033 : ($self->{h} - $size->[1]) * 0.5);
2034 2064
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036 }; 2066 };
2037 2067
2038# unless ($self->{list}) { 2068# unless ($self->{list}) {
2039# $self->{list} = CFPlus::OpenGL::glGenList; 2069# $self->{list} = DC::OpenGL::glGenList;
2040# CFPlus::OpenGL::glNewList $self->{list}; 2070# DC::OpenGL::glNewList $self->{list};
2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2071# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList; 2072# DC::OpenGL::glEndList;
2043# } 2073# }
2044# 2074#
2045# CFPlus::OpenGL::glCallList $self->{list}; 2075# DC::OpenGL::glCallList $self->{list};
2046 2076
2047 $self->{layout}->draw; 2077 $self->{layout}->draw;
2048} 2078}
2049 2079
2050#sub destroy { 2080#sub destroy {
2051# my ($self) = @_; 2081# my ($self) = @_;
2052# 2082#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2083# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054# 2084#
2055# $self->SUPER::destroy; 2085# $self->SUPER::destroy;
2056#} 2086#}
2057 2087
2058############################################################################# 2088#############################################################################
2059 2089
2060package CFPlus::UI::EntryBase; 2090package DC::UI::EntryBase;
2061 2091
2062our @ISA = CFPlus::UI::Label::; 2092our @ISA = DC::UI::Label::;
2063 2093
2064use CFPlus::OpenGL; 2094use DC::OpenGL;
2065 2095
2066sub new { 2096sub new {
2067 my $class = shift; 2097 my $class = shift;
2068 2098
2069 $class->SUPER::new ( 2099 $class->SUPER::new (
2070 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
2071 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1], 2102 outline => undef,
2073 active_bg => [0, 0, 1, .2], 2103 active_bg => [0, 0, 1, .2],
2074 active_fg => [1, 1, 1], 2104 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0], 2105 active_outline => [1, 1, 0],
2076 can_hover => 1, 2106 can_hover => 1,
2077 can_focus => 1, 2107 can_focus => 1,
2108 align => 0,
2078 valign => 0, 2109 valign => 0.5,
2079 can_events => 1, 2110 can_events => 1,
2080 ellipsise => 0, 2111 ellipsise => 0,
2112 padding_x => 4,
2113 padding_y => 2,
2081 #text => ... 2114 #text => ...
2082 #hidden => "*", 2115 #hidden => "*",
2083 @_ 2116 @_
2084 ) 2117 )
2085} 2118}
… …
2132 2165
2133 my $text = $self->get_text; 2166 my $text = $self->get_text;
2134 2167
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2168 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2136 2169
2137 if ($uni == 8) { 2170 if ($sym == DC::SDLK_BACKSPACE) {
2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2139 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
2140 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
2141 } elsif ($sym == CFPlus::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
2142 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
2143 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
2144 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2145 } elsif ($sym == CFPlus::SDLK_HOME) { 2178 } elsif ($sym == DC::SDLK_HOME) {
2146 # what a hack 2179 # what a hack
2147 $self->{cursor} = 2180 $self->{cursor} =
2148 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2181 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2149 ? length $1 2182 ? length $1
2150 : 0; 2183 : 0;
2151 } elsif ($sym == CFPlus::SDLK_END) { 2184 } elsif ($sym == DC::SDLK_END) {
2152 # uh, again 2185 # uh, again
2153 $self->{cursor} = 2186 $self->{cursor} =
2154 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2187 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2155 ? $self->{cursor} + length $1 2188 ? $self->{cursor} + length $1
2156 : length $self->{text}; 2189 : length $self->{text};
… …
2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2238 } 2271 }
2239 2272
2240 glColor_premultiply @{$self->{active_fg}}; 2273 glColor_premultiply @{$self->{active_fg}};
2241 glBegin GL_LINES; 2274 glBegin GL_LINES;
2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd; 2277 glEnd;
2245 2278
2246 glLineWidth 3; 2279 glLineWidth 3;
2247 glColor @{$self->{active_outline}}; 2280 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1; 2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2249 glLineWidth 1; 2282 glLineWidth 1;
2250 2283
2251 } else { 2284 } else {
2252 glColor @{$self->{outline}}; 2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP; 2286 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5; 2287 glVertex .5, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3; 2288 glVertex .5, $self->{h} - 2.5;
2257 glVertex $self->{w} - 1, $self->{h} - 3; 2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2258 glVertex $self->{w} - 1, $self->{h} * .5; 2290 glVertex $self->{w} - .5, $self->{h} * .5;
2259 glEnd; 2291 glEnd;
2260 } 2292 }
2261} 2293}
2262 2294
2263############################################################################# 2295#############################################################################
2264 2296
2265package CFPlus::UI::Entry; 2297package DC::UI::Entry;
2266 2298
2267our @ISA = CFPlus::UI::EntryBase::; 2299our @ISA = DC::UI::EntryBase::;
2268 2300
2269use CFPlus::OpenGL; 2301use DC::OpenGL;
2302
2303sub new {
2304 my $class = shift;
2305
2306 $class->SUPER::new (
2307 history_pointer => -1,
2308 @_
2309 )
2310}
2311
2270 2312
2271sub invoke_key_down { 2313sub invoke_key_down {
2272 my ($self, $ev) = @_; 2314 my ($self, $ev) = @_;
2273 2315
2274 my $sym = $ev->{sym}; 2316 my $sym = $ev->{sym};
… …
2280 $self->{history_pointer} = -1; 2322 $self->{history_pointer} = -1;
2281 $self->{history_saveback} = ''; 2323 $self->{history_saveback} = '';
2282 $self->emit (activate => $txt); 2324 $self->emit (activate => $txt);
2283 $self->update; 2325 $self->update;
2284 2326
2285 } elsif ($sym == CFPlus::SDLK_UP) { 2327 } elsif ($sym == DC::SDLK_UP) {
2286 if ($self->{history_pointer} < 0) { 2328 if ($self->{history_pointer} < 0) {
2287 $self->{history_saveback} = $self->get_text; 2329 $self->{history_saveback} = $self->get_text;
2288 } 2330 }
2289 if (@{$self->{history} || []} > 0) { 2331 if (@{$self->{history} || []} > 0) {
2290 $self->{history_pointer}++; 2332 $self->{history_pointer}++;
… …
2292 $self->{history_pointer} = @{$self->{history} || []} - 1; 2334 $self->{history_pointer} = @{$self->{history} || []} - 1;
2293 } 2335 }
2294 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2336 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2295 } 2337 }
2296 2338
2297 } elsif ($sym == CFPlus::SDLK_DOWN) { 2339 } elsif ($sym == DC::SDLK_DOWN) {
2298 $self->{history_pointer}--; 2340 $self->{history_pointer}--;
2299 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2341 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2300 2342
2301 if ($self->{history_pointer} >= 0) { 2343 if ($self->{history_pointer} >= 0) {
2302 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2303 } else { 2345 } else {
2346 if (defined $self->{history_saveback}) {
2304 $self->set_text ($self->{history_saveback}); 2347 $self->set_text ($self->{history_saveback});
2348 $self->{history_saveback} = undef;
2349 }
2305 } 2350 }
2306 2351
2307 } else { 2352 } else {
2308 return $self->SUPER::invoke_key_down ($ev) 2353 return $self->SUPER::invoke_key_down ($ev)
2309 } 2354 }
… …
2311 1 2356 1
2312} 2357}
2313 2358
2314############################################################################# 2359#############################################################################
2315 2360
2316package CFPlus::UI::TextEdit; 2361package DC::UI::TextEdit;
2317 2362
2318our @ISA = CFPlus::UI::EntryBase::; 2363our @ISA = DC::UI::EntryBase::;
2319 2364
2320use CFPlus::OpenGL; 2365use DC::OpenGL;
2366
2367sub new {
2368 my $class = shift;
2369
2370 $class->SUPER::new (
2371 padding_y => 4,
2372
2373 @_
2374 )
2375}
2321 2376
2322sub move_cursor_ver { 2377sub move_cursor_ver {
2323 my ($self, $dy) = @_; 2378 my ($self, $dy) = @_;
2324 2379
2325 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2380 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2326 2381
2327 $y += $dy; 2382 $line += $dy;
2328 2383
2329 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2384 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2330 $self->{cursor} = $index; 2385 $self->{cursor} = $index;
2331 delete $self->{cur_h}; 2386 delete $self->{cur_h};
2332 $self->update; 2387 $self->update;
2333 return; 2388 return;
2334 } 2389 }
… …
2337sub invoke_key_down { 2392sub invoke_key_down {
2338 my ($self, $ev) = @_; 2393 my ($self, $ev) = @_;
2339 2394
2340 my $sym = $ev->{sym}; 2395 my $sym = $ev->{sym};
2341 2396
2342 if ($sym == CFPlus::SDLK_UP) { 2397 if ($sym == DC::SDLK_UP) {
2343 $self->move_cursor_ver (-1); 2398 $self->move_cursor_ver (-1);
2344 } elsif ($sym == CFPlus::SDLK_DOWN) { 2399 } elsif ($sym == DC::SDLK_DOWN) {
2345 $self->move_cursor_ver (+1); 2400 $self->move_cursor_ver (+1);
2346 } else { 2401 } else {
2347 return $self->SUPER::invoke_key_down ($ev) 2402 return $self->SUPER::invoke_key_down ($ev)
2348 } 2403 }
2349 2404
2350 1 2405 1
2351} 2406}
2352 2407
2353############################################################################# 2408#############################################################################
2354 2409
2355package CFPlus::UI::ButtonBin; 2410package DC::UI::ButtonBin;
2356 2411
2357our @ISA = CFPlus::UI::Bin::; 2412our @ISA = DC::UI::Bin::;
2358 2413
2359use CFPlus::OpenGL; 2414use DC::OpenGL;
2360 2415
2361my @tex = 2416my @tex =
2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2363 qw(b1_button_inactive.png b1_button_active.png); 2418 qw(b1_button_inactive.png b1_button_active.png);
2364 2419
2365sub new { 2420sub new {
2366 my $class = shift; 2421 my $class = shift;
2367 2422
2368 $class->SUPER::new ( 2423 $class->SUPER::new (
2369 can_hover => 1, 2424 can_hover => 1,
2370 align => 0, 2425 align => 0.5,
2371 valign => 0, 2426 valign => 0.5,
2372 can_events => 1, 2427 can_events => 1,
2373 @_ 2428 @_
2374 ) 2429 )
2375} 2430}
2376 2431
… …
2399 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2400} 2455}
2401 2456
2402############################################################################# 2457#############################################################################
2403 2458
2404package CFPlus::UI::Button; 2459package DC::UI::Button;
2405 2460
2406our @ISA = CFPlus::UI::Label::; 2461our @ISA = DC::UI::Label::;
2407 2462
2408use CFPlus::OpenGL; 2463use DC::OpenGL;
2409 2464
2410my @tex = 2465my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png); 2467 qw(b1_button_inactive.png b1_button_active.png);
2413 2468
2414sub new { 2469sub new {
2415 my $class = shift; 2470 my $class = shift;
2416 2471
2417 $class->SUPER::new ( 2472 $class->SUPER::new (
2418 padding_x => 4, 2473 padding_x => 8,
2419 padding_y => 4, 2474 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0], 2475 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8], 2476 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1, 2477 can_hover => 1,
2423 align => 0, 2478 align => 0.5,
2424 valign => 0, 2479 valign => 0.5,
2425 can_events => 1, 2480 can_events => 1,
2426 @_ 2481 @_
2427 ) 2482 )
2428} 2483}
2429 2484
… …
2454 $self->SUPER::_draw; 2509 $self->SUPER::_draw;
2455} 2510}
2456 2511
2457############################################################################# 2512#############################################################################
2458 2513
2459package CFPlus::UI::CheckBox; 2514package DC::UI::CheckBox;
2460 2515
2461our @ISA = CFPlus::UI::DrawBG::; 2516our @ISA = DC::UI::DrawBG::;
2462 2517
2463my @tex = 2518my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2465 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2466 2521
2467use CFPlus::OpenGL; 2522use DC::OpenGL;
2468 2523
2469sub new { 2524sub new {
2470 my $class = shift; 2525 my $class = shift;
2471 2526
2472 $class->SUPER::new ( 2527 $class->SUPER::new (
2528 fontsize => 1,
2473 padding_x => 2, 2529 padding_x => 2,
2474 padding_y => 2, 2530 padding_y => 2,
2475 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2476 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2477 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
… …
2483} 2539}
2484 2540
2485sub size_request { 2541sub size_request {
2486 my ($self) = @_; 2542 my ($self) = @_;
2487 2543
2488 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2489} 2545}
2490 2546
2491sub toggle { 2547sub toggle {
2492 my ($self) = @_; 2548 my ($self) = @_;
2493 2549
… …
2512sub _draw { 2568sub _draw {
2513 my ($self) = @_; 2569 my ($self) = @_;
2514 2570
2515 $self->SUPER::_draw; 2571 $self->SUPER::_draw;
2516 2572
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2573 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2518 2574
2519 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2520 2576
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2577 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522 2578
… …
2529 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2530} 2586}
2531 2587
2532############################################################################# 2588#############################################################################
2533 2589
2534package CFPlus::UI::Image; 2590package DC::UI::Image;
2535 2591
2536our @ISA = CFPlus::UI::Base::; 2592our @ISA = DC::UI::Base::;
2537 2593
2538use CFPlus::OpenGL; 2594use DC::OpenGL;
2539 2595
2540our %texture_cache; 2596our %texture_cache;
2541 2597
2542sub new { 2598sub new {
2543 my $class = shift; 2599 my $class = shift;
… …
2550 2606
2551 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2552 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2553 2609
2554 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2555 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2556 2612
2557 CFPlus::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2558 2614
2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2560 2616
2561 $self 2617 $self
2562} 2618}
2563 2619
2564sub STORABLE_freeze { 2620sub STORABLE_freeze {
2565 my ($self, $cloning) = @_; 2621 my ($self, $cloning) = @_;
2566 2622
2567 $self->{path} 2623 $self->{path}
2568 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2624 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2569 2625
2570 $self->{path} 2626 $self->{path}
2571} 2627}
2572 2628
2573sub STORABLE_attach { 2629sub STORABLE_attach {
… …
2604 glDisable GL_TEXTURE_2D; 2660 glDisable GL_TEXTURE_2D;
2605} 2661}
2606 2662
2607############################################################################# 2663#############################################################################
2608 2664
2609package CFPlus::UI::ImageButton; 2665package DC::UI::ImageButton;
2610 2666
2611our @ISA = CFPlus::UI::Image::; 2667our @ISA = DC::UI::Image::;
2612 2668
2613use CFPlus::OpenGL; 2669use DC::OpenGL;
2614 2670
2615my %textures; 2671my %textures;
2616 2672
2617sub new { 2673sub new {
2618 my $class = shift; 2674 my $class = shift;
… …
2621 padding_x => 4, 2677 padding_x => 4,
2622 padding_y => 4, 2678 padding_y => 4,
2623 fg => [1, 1, 1], 2679 fg => [1, 1, 1],
2624 active_fg => [0, 0, 1], 2680 active_fg => [0, 0, 1],
2625 can_hover => 1, 2681 can_hover => 1,
2626 align => 0, 2682 align => 0.5,
2627 valign => 0, 2683 valign => 0.5,
2628 can_events => 1, 2684 can_events => 1,
2629 @_ 2685 @_
2630 ); 2686 );
2631} 2687}
2632 2688
… …
2646 1 2702 1
2647} 2703}
2648 2704
2649############################################################################# 2705#############################################################################
2650 2706
2651package CFPlus::UI::VGauge; 2707package DC::UI::VGauge;
2652 2708
2653our @ISA = CFPlus::UI::Base::; 2709our @ISA = DC::UI::Base::;
2654 2710
2655use List::Util qw(min max); 2711use List::Util qw(min max);
2656 2712
2657use CFPlus::OpenGL; 2713use DC::OpenGL;
2658 2714
2659my %tex = ( 2715my %tex = (
2660 food => [ 2716 food => [
2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2662 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2663 ], 2719 ],
2664 grace => [ 2720 grace => [
2665 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2666 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2722 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2667 ], 2723 ],
2668 hp => [ 2724 hp => [
2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2670 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2671 ], 2727 ],
2672 mana => [ 2728 mana => [
2673 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2729 map { new_from_resource DC::Texture $_, mipmap => 1 }
2674 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2730 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2675 ], 2731 ],
2676); 2732);
2677 2733
2678# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2781 glDisable GL_TEXTURE_2D; 2837 glDisable GL_TEXTURE_2D;
2782} 2838}
2783 2839
2784############################################################################# 2840#############################################################################
2785 2841
2786package CFPlus::UI::Progress; 2842package DC::UI::Progress;
2787 2843
2788our @ISA = CFPlus::UI::Label::; 2844our @ISA = DC::UI::Label::;
2789 2845
2790use CFPlus::OpenGL; 2846use DC::OpenGL;
2791 2847
2792sub new { 2848sub new {
2793 my ($class, %arg) = @_; 2849 my ($class, %arg) = @_;
2794 2850
2795 my $self = $class->SUPER::new ( 2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2796 fg => [1, 1, 1], 2854 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2], 2855 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8], 2856 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0], 2857 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9, 2858 fontsize => 0.9,
2801 valign => 0, 2859 valign => 0.5,
2802 align => 0, 2860 align => 0.5,
2803 can_events => 1, 2861 can_events => 1,
2804 ellipsise => 1, 2862 ellipsise => 1,
2805 label => "%d%%", 2863 label => "%d%%",
2806 %arg, 2864 %arg,
2807 ); 2865 );
… …
2815 my ($self, $label) = @_; 2873 my ($self, $label) = @_;
2816 2874
2817 return if $self->{label} eq $label; 2875 return if $self->{label} eq $label;
2818 $self->{label} = $label; 2876 $self->{label} = $label;
2819 2877
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value}); 2878 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2821} 2879}
2822 2880
2823sub set_value { 2881sub set_value {
2824 my ($self, $value) = @_; 2882 my ($self, $value) = @_;
2825 2883
… …
2840 my ($self) = @_; 2898 my ($self) = @_;
2841 2899
2842 glEnable GL_BLEND; 2900 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844 2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2845 if ($self->{value} >= 0) { 2906 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value}; 2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2847 2908
2848 glColor_premultiply @{$self->{bar}}; 2909 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2; 2910 glRect $px, $py, $s, $self->{h} - $py;
2850 glColor_premultiply @{$self->{bg}}; 2911 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2; 2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2852 } 2913 }
2853 2914
2854 glColor_premultiply @{$self->{outline}}; 2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2; 2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2856 2921
2857 glDisable GL_BLEND; 2922 glDisable GL_BLEND;
2858 2923
2859 { 2924 {
2860 local $self->{bg}; # do not draw background 2925 local $self->{bg}; # do not draw background
… …
2862 } 2927 }
2863} 2928}
2864 2929
2865############################################################################# 2930#############################################################################
2866 2931
2867package CFPlus::UI::ExperienceProgress; 2932package DC::UI::ExperienceProgress;
2868 2933
2869our @ISA = CFPlus::UI::Progress::; 2934our @ISA = DC::UI::Progress::;
2870 2935
2871sub new { 2936sub new {
2872 my ($class, %arg) = @_; 2937 my ($class, %arg) = @_;
2873 2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2874 my $self = $class->SUPER::new ( 2941 my $self = $class->SUPER::new (
2875 %arg 2942 %arg,
2943 tooltip => sub {
2944 my ($self) = @_;
2945
2946 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2947 $tt,
2948 $self->{lvl},
2949 ::formsep ($self->{exp}),
2950 ::formsep ($self->{nxt}),
2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2953 },
2876 ); 2954 );
2877 2955
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN; 2957 if $::CONN;
2880 2958
… …
2888 if $::CONN; 2966 if $::CONN;
2889 2967
2890 $self->SUPER::DESTROY; 2968 $self->SUPER::DESTROY;
2891} 2969}
2892 2970
2971sub _percent {
2972 my ($self) = @_;
2973
2974 my $table = $::CONN && $::CONN->{exp_table}
2975 or return -1;
2976
2977 my $l0 = $table->[$self->{lvl} - 1];
2978 my $l1 = $table->[$self->{lvl}];
2979
2980 $self->{nxt} = $l1;
2981
2982 ($self->{exp} - $l0) / ($l1 - $l0)
2983}
2984
2893sub set_value { 2985sub set_value {
2894 my ($self, $lvl, $exp) = @_; 2986 my ($self, $lvl, $exp) = @_;
2895 2987
2896 my $v = -1; 2988 $self->{lvl} = $lvl;
2989 $self->{exp} = $exp;
2897 2990
2898 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2899 my $l0 = $table->[$lvl - 1];
2900 my $l1 = $table->[$lvl];
2901
2902 $v = ($exp - $l0) / ($l1 - $l0);
2903 }
2904
2905 $self->SUPER::set_value ($v); 2991 $self->SUPER::set_value ($self->_percent);
2906} 2992}
2907 2993
2908############################################################################# 2994#############################################################################
2909 2995
2910package CFPlus::UI::Gauge; 2996package DC::UI::Gauge;
2911 2997
2912our @ISA = CFPlus::UI::VBox::; 2998our @ISA = DC::UI::VBox::;
2913 2999
2914sub new { 3000sub new {
2915 my ($class, %arg) = @_; 3001 my ($class, %arg) = @_;
2916 3002
2917 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
… …
2919 can_hover => 1, 3005 can_hover => 1,
2920 can_events => 1, 3006 can_events => 1,
2921 %arg, 3007 %arg,
2922 ); 3008 );
2923 3009
2924 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3010 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2925 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3011 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2926 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3012 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2927 3013
2928 $self 3014 $self
2929} 3015}
2930 3016
2931sub set_fontsize { 3017sub set_fontsize {
… …
2952 $self->{value}->set_text ($val); 3038 $self->{value}->set_text ($val);
2953} 3039}
2954 3040
2955############################################################################# 3041#############################################################################
2956 3042
2957package CFPlus::UI::Slider; 3043package DC::UI::Slider;
2958 3044
2959use strict; 3045use strict;
2960 3046
2961use CFPlus::OpenGL; 3047use DC::OpenGL;
2962 3048
2963our @ISA = CFPlus::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
2964 3050
2965my @tex = 3051my @tex =
2966 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
2967 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
2968 3054
2969sub new { 3055sub new {
2970 my $class = shift; 3056 my $class = shift;
2971 3057
… …
3008sub set_value { 3094sub set_value {
3009 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
3010 3096
3011 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
3012 3098
3013 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
3014 3100
3015 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
3016
3017 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
3018 $value = $hi - $page if $value > $hi - $page;
3019 3103
3020 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
3021 if $unit; 3105 if $unit;
3022 3106
3023 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
3067sub invoke_mouse_wheel { 3151sub invoke_mouse_wheel {
3068 my ($self, $ev) = @_; 3152 my ($self, $ev) = @_;
3069 3153
3070 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3154 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3071 3155
3072 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3156 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3073 3157
3074 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3158 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3075 3159
3076 1 3160 1
3077} 3161}
… …
3087 my ($self) = @_; 3171 my ($self) = @_;
3088 3172
3089 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
3090 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
3091 3175
3092 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
3093 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
3094 3178
3095 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3179 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
3096 3180
3097 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3181 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
3098 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
3099 3183
3100 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
… …
3130 glDisable GL_TEXTURE_2D; 3214 glDisable GL_TEXTURE_2D;
3131} 3215}
3132 3216
3133############################################################################# 3217#############################################################################
3134 3218
3135package CFPlus::UI::ValSlider; 3219package DC::UI::ValSlider;
3136 3220
3137our @ISA = CFPlus::UI::HBox::; 3221our @ISA = DC::UI::HBox::;
3138 3222
3139sub new { 3223sub new {
3140 my ($class, %arg) = @_; 3224 my ($class, %arg) = @_;
3141 3225
3142 my $range = delete $arg{range}; 3226 my $range = delete $arg{range};
3143 3227
3144 my $self = $class->SUPER::new ( 3228 my $self = $class->SUPER::new (
3145 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3229 slider => (new DC::UI::Slider expand => 1, range => $range),
3146 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3230 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3147 to_value => sub { shift }, 3231 to_value => sub { shift },
3148 from_value => sub { shift }, 3232 from_value => sub { shift },
3149 %arg, 3233 %arg,
3150 ); 3234 );
3151 3235
… …
3171sub set_range { shift->{slider}->set_range (@_) } 3255sub set_range { shift->{slider}->set_range (@_) }
3172sub set_value { shift->{slider}->set_value (@_) } 3256sub set_value { shift->{slider}->set_value (@_) }
3173 3257
3174############################################################################# 3258#############################################################################
3175 3259
3176package CFPlus::UI::TextScroller; 3260package DC::UI::TextScroller;
3177 3261
3178our @ISA = CFPlus::UI::HBox::; 3262our @ISA = DC::UI::HBox::;
3179 3263
3180use CFPlus::OpenGL; 3264use DC::OpenGL;
3181 3265
3182sub new { 3266sub new {
3183 my $class = shift; 3267 my $class = shift;
3184 3268
3185 my $self = $class->SUPER::new ( 3269 my $self = $class->SUPER::new (
… …
3187 can_events => 1, 3271 can_events => 1,
3188 indent => 0, 3272 indent => 0,
3189 #font => default_font 3273 #font => default_font
3190 @_, 3274 @_,
3191 3275
3192 layout => (new CFPlus::Layout), 3276 layout => (new DC::Layout),
3193 par => [], 3277 par => [],
3194 max_par => 0, 3278 max_par => 0,
3195 height => 0, 3279 height => 0,
3196 children => [ 3280 children => [
3197 (new CFPlus::UI::Empty expand => 1), 3281 (new DC::UI::Empty expand => 1),
3198 (new CFPlus::UI::Slider vertical => 1), 3282 (new DC::UI::Slider vertical => 1),
3199 ], 3283 ],
3200 ); 3284 );
3201 3285
3202 $self->{children}[1]->connect (changed => sub { $self->update }); 3286 $self->{children}[1]->connect (changed => sub { $self->update });
3203 3287
… …
3259 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3343 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3260 $layout->set_markup ($para->{markup}); 3344 $layout->set_markup ($para->{markup});
3261 3345
3262 $layout->set_shapes ( 3346 $layout->set_shapes (
3263 map 3347 map
3264 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3348 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3265 @{$para->{widget}} 3349 @{$para->{widget}}
3266 ); 3350 );
3267 3351
3268 $layout 3352 $layout
3269} 3353}
… …
3386 $ROOT->on_post_alloc ($self => sub { 3470 $ROOT->on_post_alloc ($self => sub {
3387 $self->force_uptodate; 3471 $self->force_uptodate;
3388 3472
3389 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3473 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3390 3474
3391 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3475 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3392 glClearColor 0, 0, 0, 0; 3476 glClearColor 0, 0, 0, 0;
3393 glClear GL_COLOR_BUFFER_BIT; 3477 glClear GL_COLOR_BUFFER_BIT;
3394 3478
3395 package CFPlus::UI::Base; 3479 package DC::UI::Base;
3396 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3480 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3397 (0, 0, $self->{w}, $self->{h}); 3481 (0, 0, $self->{w}, $self->{h});
3398 3482
3399 my $top = int $self->{children}[1]{range}[0]; 3483 my $top = int $self->{children}[1]{range}[0];
3400 3484
… …
3459 $self->{children}[1]->draw; 3543 $self->{children}[1]->draw;
3460} 3544}
3461 3545
3462############################################################################# 3546#############################################################################
3463 3547
3464package CFPlus::UI::Animator; 3548package DC::UI::Animator;
3465 3549
3466use CFPlus::OpenGL; 3550use DC::OpenGL;
3467 3551
3468our @ISA = CFPlus::UI::Bin::; 3552our @ISA = DC::UI::Bin::;
3469 3553
3470sub moveto { 3554sub moveto {
3471 my ($self, $x, $y) = @_; 3555 my ($self, $x, $y) = @_;
3472 3556
3473 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3557 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3501 glPopMatrix; 3585 glPopMatrix;
3502} 3586}
3503 3587
3504############################################################################# 3588#############################################################################
3505 3589
3506package CFPlus::UI::Flopper; 3590package DC::UI::Flopper;
3507 3591
3508our @ISA = CFPlus::UI::Button::; 3592our @ISA = DC::UI::Button::;
3509 3593
3510sub new { 3594sub new {
3511 my $class = shift; 3595 my $class = shift;
3512 3596
3513 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3525 $self->{other}->toggle_visibility; 3609 $self->{other}->toggle_visibility;
3526} 3610}
3527 3611
3528############################################################################# 3612#############################################################################
3529 3613
3530package CFPlus::UI::Tooltip; 3614package DC::UI::Tooltip;
3531 3615
3532our @ISA = CFPlus::UI::Bin::; 3616our @ISA = DC::UI::Bin::;
3533 3617
3534use CFPlus::OpenGL; 3618use DC::OpenGL;
3535 3619
3536sub new { 3620sub new {
3537 my $class = shift; 3621 my $class = shift;
3538 3622
3539 $class->SUPER::new ( 3623 $class->SUPER::new (
… …
3543} 3627}
3544 3628
3545sub set_tooltip_from { 3629sub set_tooltip_from {
3546 my ($self, $widget) = @_; 3630 my ($self, $widget) = @_;
3547 3631
3548 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3549 if $widget->{tooltip} =~ /^#(.*)$/;
3550
3551 my $tooltip = $widget->{tooltip}; 3632 my $tip = $widget->{tooltip};
3633 $tip = $tip->($widget) if "CODE" eq ref $tip;
3634
3635 $tip = DC::Pod::section_label tooltip => $1
3636 if $tip =~ /^#(.*)$/;
3552 3637
3553 if ($ENV{CFPLUS_DEBUG} & 2) { 3638 if ($ENV{CFPLUS_DEBUG} & 2) {
3554 $tooltip .= "\n\n" . (ref $widget) . "\n" 3639 $tip .= "\n\n" . (ref $widget) . "\n"
3555 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3640 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3556 . "req $widget->{req_w} $widget->{req_h}\n" 3641 . "req $widget->{req_w} $widget->{req_h}\n"
3557 . "visible $widget->{visible}"; 3642 . "visible $widget->{visible}";
3558 } 3643 }
3559 3644
3560 $tooltip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
3561 $tooltip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
3562 3647
3563 $self->add (new CFPlus::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
3564 markup => $tooltip, 3650 markup => $tip,
3565 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3652 align => 0,
3566 fontsize => 0.8, 3653 fontsize => 0.8,
3567 style => 1, # FLAG_INVERSE 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3568 ellipsise => 0, 3655 ellipsise => 0,
3569 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
3570 ); 3657 );
3571} 3658}
3572 3659
… …
3607} 3694}
3608 3695
3609sub _draw { 3696sub _draw {
3610 my ($self) = @_; 3697 my ($self) = @_;
3611 3698
3612 glTranslate 0.375, 0.375;
3613
3614 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
3615 3700
3616 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
3617 glRect 0, 0, $w, $h; 3702 glRect 0, 0, $w, $h;
3618 3703
3619 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
3620 glRect_lineloop 0, 0, $w, $h; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
3621 3706
3622 glTranslate 2 - 0.375, 2 - 0.375; 3707 glTranslate 2, 2;
3623 3708
3624 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
3625} 3710}
3626 3711
3627############################################################################# 3712#############################################################################
3628 3713
3629package CFPlus::UI::Face; 3714package DC::UI::Face;
3630 3715
3631our @ISA = CFPlus::UI::DrawBG::; 3716our @ISA = DC::UI::DrawBG::;
3632 3717
3633use CFPlus::OpenGL; 3718use DC::OpenGL;
3634 3719
3635sub new { 3720sub new {
3636 my $class = shift; 3721 my $class = shift;
3637 3722
3638 my $self = $class->SUPER::new ( 3723 my $self = $class->SUPER::new (
… …
3641 aspect => 1, 3726 aspect => 1,
3642 can_events => 0, 3727 can_events => 0,
3643 @_, 3728 @_,
3644 ); 3729 );
3645 3730
3646 if ($self->{anim} && $self->{animspeed}) {
3647 CFPlus::weaken (my $widget = $self);
3648
3649 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3650 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3651 $self->{timer} = Event->timer (
3652 parked => 1,
3653 cb => sub {
3654 return unless $::CONN;
3655
3656 my $w = $widget
3657 or return;
3658
3659 ++$w->{frame};
3660 $w->update_face;
3661
3662 # somehow, $widget can go away
3663 $w->update;
3664 $w->update_timer;
3665 },
3666 );
3667
3668 $self->update_face;
3669 $self->update_timer; 3731 $self->update_anim;
3670 }
3671 3732
3672 $self 3733 $self
3673} 3734}
3674 3735
3675sub update_timer { 3736sub update_timer {
3676 my ($self) = @_; 3737 my ($self) = @_;
3677 3738
3678 return unless $self->{timer}; 3739 return unless $self->{timer};
3679 3740
3680 if ($self->{visible}) { 3741 if ($self->{visible}) {
3681 $self->{timer}->at (
3682 $self->{anim_start}
3683 + $self->{animspeed}
3684 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3685 );
3686 $self->{timer}->start; 3742 $self->{timer}->start;
3687 } else { 3743 } else {
3688 $self->{timer}->stop; 3744 $self->{timer}->stop;
3689 } 3745 }
3690} 3746}
… …
3703 $tex->upload (sub { $self->reconfigure }); 3759 $tex->upload (sub { $self->reconfigure });
3704 } 3760 }
3705 } 3761 }
3706 } 3762 }
3707 } 3763 }
3764 }
3765}
3766
3767sub update_anim {
3768 my ($self) = @_;
3769
3770 if ($self->{anim} && $self->{animspeed}) {
3771 DC::weaken (my $widget = $self);
3772
3773 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3774 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3775 return unless $::CONN;
3776
3777 my $w = $widget
3778 or return;
3779
3780 ++$w->{frame};
3781 $w->update_face;
3782
3783 # somehow, $widget can go away
3784 $w->update;
3785 $w->update_timer;
3786 };
3787
3788 $self->update_face;
3789 $self->update_timer;
3790 } else {
3791 delete $self->{timer};
3708 } 3792 }
3709} 3793}
3710 3794
3711sub size_request { 3795sub size_request {
3712 my ($self) = @_; 3796 my ($self) = @_;
… …
3734 return unless $self->{visible}; 3818 return unless $self->{visible};
3735 3819
3736 $self->SUPER::update; 3820 $self->SUPER::update;
3737} 3821}
3738 3822
3823sub set_face {
3824 my ($self, $face) = @_;
3825
3826 $self->{face} = $face;
3827 $self->reconfigure;
3828}
3829
3830sub set_anim {
3831 my ($self, $anim) = @_;
3832
3833 $self->{anim} = $anim;
3834 $self->update_anim;
3835}
3836
3837sub set_animspeed {
3838 my ($self, $animspeed) = @_;
3839
3840 $self->{animspeed} = $animspeed;
3841 $self->update_anim;
3842}
3843
3739sub invoke_visibility_change { 3844sub invoke_visibility_change {
3740 my ($self) = @_; 3845 my ($self) = @_;
3741 3846
3742 $self->update_timer; 3847 $self->update_timer;
3743 3848
… …
3767 $self->SUPER::destroy; 3872 $self->SUPER::destroy;
3768} 3873}
3769 3874
3770############################################################################# 3875#############################################################################
3771 3876
3772package CFPlus::UI::Buttonbar; 3877package DC::UI::Buttonbar;
3773 3878
3774our @ISA = CFPlus::UI::HBox::; 3879our @ISA = DC::UI::HBox::;
3775 3880
3776# TODO: should actually wrap buttons and other goodies. 3881# TODO: should actually wrap buttons and other goodies.
3777 3882
3778############################################################################# 3883#############################################################################
3779 3884
3780package CFPlus::UI::Menu; 3885package DC::UI::Menu;
3781 3886
3782our @ISA = CFPlus::UI::Toplevel::; 3887our @ISA = DC::UI::Toplevel::;
3783 3888
3784use CFPlus::OpenGL; 3889use DC::OpenGL;
3785 3890
3786sub new { 3891sub new {
3787 my $class = shift; 3892 my $class = shift;
3788 3893
3789 my $self = $class->SUPER::new ( 3894 my $self = $class->SUPER::new (
3790 items => [], 3895 items => [],
3791 z => 100, 3896 z => 100,
3792 @_, 3897 @_,
3793 ); 3898 );
3794 3899
3795 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3900 $self->add ($self->{vbox} = new DC::UI::VBox);
3796 3901
3797 for my $item (@{ $self->{items} }) { 3902 for my $item (@{ $self->{items} }) {
3798 my ($widget, $cb, $tooltip) = @$item; 3903 my ($widget, $cb, $tooltip) = @$item;
3799 3904
3800 # handle various types of items, only text for now 3905 # handle various types of items, only text for now
3801 if (!ref $widget) { 3906 if (!ref $widget) {
3802 if ($widget =~ /\t/) { 3907 if ($widget =~ /\t/) {
3803 my ($left, $right) = split /\t/, $widget, 2; 3908 my ($left, $right) = split /\t/, $widget, 2;
3804 3909
3805 $widget = new CFPlus::UI::HBox 3910 $widget = new DC::UI::HBox
3806 can_hover => 1, 3911 can_hover => 1,
3807 can_events => 1, 3912 can_events => 1,
3808 tooltip => $tooltip, 3913 tooltip => $tooltip,
3809 children => [ 3914 children => [
3810 (new CFPlus::UI::Label markup => $left, expand => 1), 3915 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3811 (new CFPlus::UI::Label markup => $right, align => +1), 3916 (new DC::UI::Label markup => $right, align => 1),
3812 ], 3917 ],
3813 ; 3918 ;
3814 3919
3815 } else { 3920 } else {
3816 $widget = new CFPlus::UI::Label 3921 $widget = new DC::UI::Label
3817 can_hover => 1, 3922 can_hover => 1,
3818 can_events => 1, 3923 can_events => 1,
3924 align => 0,
3819 markup => $widget, 3925 markup => $widget,
3820 tooltip => $tooltip; 3926 tooltip => $tooltip;
3821 } 3927 }
3822 } 3928 }
3823 3929
… …
3838 # maybe save $GRAB? must be careful about events... 3944 # maybe save $GRAB? must be careful about events...
3839 $GRAB = $self; 3945 $GRAB = $self;
3840 $self->{button} = $ev->{button}; 3946 $self->{button} = $ev->{button};
3841 3947
3842 $self->show; 3948 $self->show;
3843 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3949
3950 my $x = $ev->{x};
3951 my $y = $ev->{y};
3952
3953 $self->{root}->on_post_alloc ($self => sub {
3954 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3955 });
3956
3957 1 # so it can be used inside event handlers
3844} 3958}
3845 3959
3846sub invoke_mouse_motion { 3960sub invoke_mouse_motion {
3847 my ($self, $ev, $x, $y) = @_; 3961 my ($self, $ev, $x, $y) = @_;
3848 3962
… …
3869 1 3983 1
3870} 3984}
3871 3985
3872############################################################################# 3986#############################################################################
3873 3987
3874package CFPlus::UI::Multiplexer; 3988package DC::UI::Multiplexer;
3875 3989
3876our @ISA = CFPlus::UI::Container::; 3990our @ISA = DC::UI::Container::;
3877 3991
3878sub new { 3992sub new {
3879 my $class = shift; 3993 my $class = shift;
3880 3994
3881 my $self = $class->SUPER::new ( 3995 my $self = $class->SUPER::new (
3882 @_, 3996 @_,
3883 ); 3997 );
3884 3998
3885 $self->{current} = $self->{children}[0] 3999 $self->set_current_page (0);
3886 if @{ $self->{children} };
3887 4000
3888 $self 4001 $self
3889} 4002}
3890 4003
3891sub add { 4004sub add {
3892 my ($self, @widgets) = @_; 4005 my ($self, @widgets) = @_;
3893 4006
3894 $self->SUPER::add (@widgets); 4007 $self->SUPER::add (@widgets);
3895 4008
3896 $self->{current} = $self->{children}[0] 4009 $self->set_current_page (0)
3897 if @{ $self->{children} }; 4010 if @widgets == @{ $self->{children} };
3898} 4011}
3899 4012
3900sub get_current_page { 4013sub get_current_page {
3901 my ($self) = @_; 4014 my ($self) = @_;
3902 4015
… …
3908 4021
3909 my $widget = ref $page_or_widget 4022 my $widget = ref $page_or_widget
3910 ? $page_or_widget 4023 ? $page_or_widget
3911 : $self->{children}[$page_or_widget]; 4024 : $self->{children}[$page_or_widget];
3912 4025
4026 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4027
3913 $self->{current} = $widget; 4028 if (($self->{current} = $widget)) {
4029 $self->{current}->set_visible if $self->{current} && $self->{visible};
3914 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4030 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3915 4031
3916 $self->emit (page_changed => $self->{current}); 4032 $self->emit (page_changed => $self->{current});
4033 }
3917 4034
3918 $self->realloc; 4035 $self->realloc;
3919} 4036}
3920 4037
3921sub visible_children { 4038sub visible_children {
3922 $_[0]{current} 4039 $_[0]{current} || ()
3923} 4040}
3924 4041
3925sub size_request { 4042sub size_request {
3926 my ($self) = @_; 4043 my ($self) = @_;
3927 4044
4045 $self->{current}
3928 $self->{current}->size_request 4046 ? $self->{current}->size_request
4047 : (0, 0)
3929} 4048}
3930 4049
3931sub invoke_size_allocate { 4050sub invoke_size_allocate {
3932 my ($self, $w, $h) = @_; 4051 my ($self, $w, $h) = @_;
3933 4052
3934 $self->{current}->configure (0, 0, $w, $h); 4053 $self->{current}->configure (0, 0, $w, $h)
4054 if $self->{current};
3935 4055
3936 1 4056 1
3937} 4057}
3938 4058
3939sub _draw { 4059sub _draw {
3940 my ($self) = @_; 4060 my ($self) = @_;
3941 4061
3942 $self->{current}->draw; 4062 $self->{current}->draw
4063 if $self->{current};
3943} 4064}
3944 4065
3945############################################################################# 4066#############################################################################
3946 4067
3947package CFPlus::UI::Notebook; 4068package DC::UI::Notebook;
3948 4069
3949use CFPlus::OpenGL; 4070use DC::OpenGL;
3950 4071
3951our @ISA = CFPlus::UI::VBox::; 4072our @ISA = DC::UI::VBox::;
3952 4073
3953sub new { 4074sub new {
3954 my $class = shift; 4075 my $class = shift;
3955 4076
3956 my $self = $class->SUPER::new ( 4077 my $self = $class->SUPER::new (
3957 buttonbar => (new CFPlus::UI::Buttonbar), 4078 buttonbar => (new DC::UI::Buttonbar),
3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4079 multiplexer => (new DC::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0], 4080 active_outline => [.7, .7, 0.2],
3960 # filter => # will be put between multiplexer and $self 4081 # filter => # will be put between multiplexer and $self
3961 @_, 4082 @_,
3962 ); 4083 );
3963 4084
3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4085 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3972 4093
3973 for my $child (@$widgets) { 4094 for my $child (@$widgets) {
3974 Scalar::Util::weaken $child; 4095 Scalar::Util::weaken $child;
3975 $child->{c_tab_} ||= do { 4096 $child->{c_tab_} ||= do {
3976 my $tab = 4097 my $tab =
3977 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4098 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
3978 ? $child->{c_tab} 4099 ? $child->{c_tab}
3979 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4100 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3980 4101
3981 $tab->connect (activate => sub { 4102 $tab->connect (activate => sub {
3982 $wself->set_current_page ($child); 4103 $wself->set_current_page ($child);
3983 }); 4104 });
3984 4105
… …
4016sub pages { 4137sub pages {
4017 my ($self) = @_; 4138 my ($self) = @_;
4018 $self->{multiplexer}->children 4139 $self->{multiplexer}->children
4019} 4140}
4020 4141
4142sub page_index {
4143 my ($self, $widget) = @_;
4144
4145 my $i = 0;
4146 for ($self->pages) {
4147 if ($_ eq $widget) { return $i };
4148 $i++;
4149 }
4150
4151 undef
4152}
4153
4021sub add_tab { 4154sub add_tab {
4022 my ($self, $title, $widget, $tooltip) = @_; 4155 my ($self, $title, $widget, $tooltip) = @_;
4023 4156
4024 $title = [$title, $tooltip] unless ref $title; 4157 $title = [$title, $tooltip] unless ref $title;
4025 $widget->{c_tab} = $title; 4158 $widget->{c_tab} = $title;
… …
4045 4178
4046 $self->SUPER::_draw (); 4179 $self->SUPER::_draw ();
4047 4180
4048 if (my $cur = $self->{multiplexer}{current}) { 4181 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) { 4182 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y}; 4183 glTranslate $self->{buttonbar}{x} + $cur->{x},
4184 $self->{buttonbar}{y} + $cur->{y};
4051 glLineWidth 3; 4185 glLineWidth 3;
4186 #glEnable GL_BLEND;
4187 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4052 glColor @{$self->{active_outline}}; 4188 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2; 4189 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4054 glLineWidth 1; 4190 glLineWidth 1;
4191 #glDisable GL_BLEND;
4055 } 4192 }
4056 } 4193 }
4057} 4194}
4058 4195
4059############################################################################# 4196#############################################################################
4060 4197
4061package CFPlus::UI::Selector; 4198package DC::UI::Selector;
4062 4199
4063use utf8; 4200use utf8;
4064 4201
4065our @ISA = CFPlus::UI::Button::; 4202our @ISA = DC::UI::Button::;
4066 4203
4067sub new { 4204sub new {
4068 my $class = shift; 4205 my $class = shift;
4069 4206
4070 my $self = $class->SUPER::new ( 4207 my $self = $class->SUPER::new (
… …
4087 my ($value, $title, $tooltip) = @$_; 4224 my ($value, $title, $tooltip) = @$_;
4088 4225
4089 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4226 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4090 } 4227 }
4091 4228
4092 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4229 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4093} 4230}
4094 4231
4095sub _set_value { 4232sub _set_value {
4096 my ($self, $value) = @_; 4233 my ($self, $value) = @_;
4097 4234
4098 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4235 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4236 $item ||= $self->{options}[0]
4099 or return; 4237 or return;
4100 4238
4101 $self->{value} = $item->[0]; 4239 $self->{value} = $item->[0];
4102 $self->set_markup ("$item->[1] ⇓"); 4240 $self->set_markup ("$item->[1] ⇓");
4103 $self->set_tooltip ($item->[2]); 4241# $self->set_tooltip ($item->[2]);
4104} 4242}
4105 4243
4106sub set_value { 4244sub set_value {
4107 my ($self, $value) = @_; 4245 my ($self, $value) = @_;
4108 4246
… …
4110 4248
4111 $self->_set_value ($value); 4249 $self->_set_value ($value);
4112 $self->emit (changed => $value); 4250 $self->emit (changed => $value);
4113} 4251}
4114 4252
4253sub set_options {
4254 my ($self, $options) = @_;
4255
4256 $self->{options} = $options;
4257 $self->_set_value ($self->{value});
4258}
4259
4115############################################################################# 4260#############################################################################
4116 4261
4117package CFPlus::UI::Statusbox; 4262package DC::UI::Statusbox;
4118 4263
4119our @ISA = CFPlus::UI::VBox::; 4264our @ISA = DC::UI::VBox::;
4120 4265
4121sub new { 4266sub new {
4122 my $class = shift; 4267 my $class = shift;
4123 4268
4124 my $self = $class->SUPER::new ( 4269 my $self = $class->SUPER::new (
4125 fontsize => 0.8, 4270 fontsize => 0.8,
4126 @_, 4271 @_,
4127 ); 4272 );
4128 4273
4129 CFPlus::weaken (my $this = $self); 4274 DC::weaken (my $this = $self);
4130 4275
4131 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4276 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4132 4277
4133 $self 4278 $self
4134} 4279}
4135 4280
4136sub reorder { 4281sub reorder {
4137 my ($self) = @_; 4282 my ($self) = @_;
4138 my $NOW = Time::HiRes::time; 4283 my $NOW = EV::time;
4139 4284
4140 # freeze display when hovering over any label 4285 # freeze display when hovering over any label
4141 return if $CFPlus::UI::TOOLTIP->{owner} 4286 return if $DC::UI::TOOLTIP->{owner}
4142 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4287 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4143 values %{ $self->{item} }; 4288 values %{ $self->{item} };
4144 4289
4145 while (my ($k, $v) = each %{ $self->{item} }) { 4290 while (my ($k, $v) = each %{ $self->{item} }) {
4146 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4291 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4147 } 4292 }
4293
4294 $self->{timer}->set (1, 1);
4148 4295
4149 my @widgets; 4296 my @widgets;
4150 4297
4151 my @items = sort { 4298 my @items = sort {
4152 $a->{pri} <=> $b->{pri} 4299 $a->{pri} <=> $b->{pri}
4153 or $b->{id} <=> $a->{id} 4300 or $b->{id} <=> $a->{id}
4154 } values %{ $self->{item} }; 4301 } values %{ $self->{item} };
4155
4156 $self->{timer}->interval (1);
4157 4302
4158 my $count = 10 + 1; 4303 my $count = 10 + 1;
4159 for my $item (@items) { 4304 for my $item (@items) {
4160 last unless --$count; 4305 last unless --$count;
4161 4306
… …
4168 for ($short) { 4313 for ($short) {
4169 s/^\s+//; 4314 s/^\s+//;
4170 s/\s+/ /g; 4315 s/\s+/ /g;
4171 } 4316 }
4172 4317
4173 new CFPlus::UI::Label 4318 new DC::UI::Label
4174 markup => $short, 4319 markup => $short,
4175 tooltip => $item->{tooltip}, 4320 tooltip => $item->{tooltip},
4176 tooltip_font => $::FONT_PROP, 4321 tooltip_font => $::FONT_PROP,
4177 tooltip_width => 0.67, 4322 tooltip_width => 0.67,
4178 fontsize => $item->{fontsize} || $self->{fontsize}, 4323 fontsize => $item->{fontsize} || $self->{fontsize},
4179 max_w => $::WIDTH * 0.44, 4324 max_w => $::WIDTH * 0.44,
4325 align => 0,
4180 fg => [@{ $item->{fg} }], 4326 fg => [@{ $item->{fg} }],
4181 can_events => 1, 4327 can_events => 1,
4182 can_hover => 1 4328 can_hover => 1
4183 }; 4329 };
4184 4330
4185 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4331 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4186 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4332 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4187 $label->update; 4333 $label->update;
4188 $label->set_max_size (undef, $label->{req_h} * $diff) 4334 $label->set_max_size (undef, $label->{req_h} * $diff)
4189 if $diff < 1; 4335 if $diff < 1;
4190 $self->{timer}->interval (1/30); 4336 $self->{timer}->set (1/30, 1/30);
4191 } else { 4337 } else {
4192 $label->{fg}[3] = $item->{fg}[3] || 1; 4338 $label->{fg}[3] = $item->{fg}[3] || 1;
4193 } 4339 }
4194 4340
4195 push @widgets, $label; 4341 push @widgets, $label;
4196 } 4342 }
4343
4344 my $hash = join ",", @widgets;
4345 return if $hash eq $self->{last_widget_hash};
4346 $self->{last_widget_hash} = $hash;
4197 4347
4198 $self->clear; 4348 $self->clear;
4199 $self->SUPER::add (reverse @widgets); 4349 $self->SUPER::add (reverse @widgets);
4200} 4350}
4201 4351
… …
4257 $self->SUPER::destroy; 4407 $self->SUPER::destroy;
4258} 4408}
4259 4409
4260############################################################################# 4410#############################################################################
4261 4411
4262package CFPlus::UI::Root; 4412package DC::UI::Root;
4263 4413
4264our @ISA = CFPlus::UI::Container::; 4414our @ISA = DC::UI::Container::;
4265 4415
4266use List::Util qw(min max); 4416use List::Util qw(min max);
4267 4417
4268use CFPlus::OpenGL; 4418use DC::OpenGL;
4269 4419
4270sub new { 4420sub new {
4271 my $class = shift; 4421 my $class = shift;
4272 4422
4273 my $self = $class->SUPER::new ( 4423 my $self = $class->SUPER::new (
4274 visible => 1, 4424 visible => 1,
4275 @_, 4425 @_,
4276 ); 4426 );
4277 4427
4278 CFPlus::weaken ($self->{root} = $self); 4428 DC::weaken ($self->{root} = $self);
4279 4429
4280 $self 4430 $self
4281} 4431}
4282 4432
4283sub size_request { 4433sub size_request {
… …
4331} 4481}
4332 4482
4333sub update { 4483sub update {
4334 my ($self) = @_; 4484 my ($self) = @_;
4335 4485
4336 $::WANT_REFRESH->start; 4486 $::WANT_REFRESH = 1;
4337} 4487}
4338 4488
4339sub add { 4489sub add {
4340 my ($self, @children) = @_; 4490 my ($self, @children) = @_;
4341 4491
… …
4408 4558
4409 delete $queue{$widget+0}; 4559 delete $queue{$widget+0};
4410 4560
4411 my ($w, $h) = $widget->size_request; 4561 my ($w, $h) = $widget->size_request;
4412 4562
4413 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4563 $w += $widget->{padding_x} * 2;
4414 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4564 $h += $widget->{padding_y} * 2;
4565
4566 $w = max $widget->{min_w}, $w;
4567 $h = max $widget->{min_h}, $h;
4415 4568
4416 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4569 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4417 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4570 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4418 4571
4419 $w = $widget->{force_w} if exists $widget->{force_w}; 4572 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4486 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4639 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4487 glMatrixMode GL_MODELVIEW; 4640 glMatrixMode GL_MODELVIEW;
4488 glLoadIdentity; 4641 glLoadIdentity;
4489 4642
4490 { 4643 {
4491 package CFPlus::UI::Base; 4644 package DC::UI::Base;
4492 4645
4493 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4646 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4494 (0, 0, $self->{w}, $self->{h}); 4647 (0, 0, $self->{w}, $self->{h});
4495 4648
4496 $self->_draw; 4649 $self->_draw;
4497 } 4650 }
4498} 4651}
4499 4652
4500############################################################################# 4653#############################################################################
4501 4654
4502package CFPlus::UI; 4655package DC::UI;
4503 4656
4504$ROOT = new CFPlus::UI::Root; 4657$ROOT = new DC::UI::Root;
4505$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4658$TOOLTIP = new DC::UI::Tooltip z => 900;
4506 4659
45071 46601
4508

Diff Legend

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