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.421 by root, Wed Aug 1 14:27:21 2007 UTC vs.
Revision 1.474 by root, Sun Jan 11 22:11:23 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
635 local $@;
612 eval { $self->destroy }; 636 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 638
615 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
616} 640}
617 641
618############################################################################# 642#############################################################################
619 643
620package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
621 645
622our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
623 647
624use strict; 648use strict;
625use CFPlus::OpenGL; 649use DC::OpenGL;
626 650
627sub new { 651sub new {
628 my $class = shift; 652 my $class = shift;
629
630 # range [value, low, high, page]
631 653
632 $class->SUPER::new ( 654 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
635 @_ 657 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 669 my ($w, $h) = @$self{qw(w h)};
648 670
649 glEnable GL_BLEND; 671 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 673 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 674 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 675 glDisable GL_BLEND;
661 } 676 }
662} 677}
663 678
664############################################################################# 679#############################################################################
665 680
666package CFPlus::UI::Empty; 681package DC::UI::Empty;
667 682
668our @ISA = CFPlus::UI::Base::; 683our @ISA = DC::UI::Base::;
669 684
670sub new { 685sub new {
671 my ($class, %arg) = @_; 686 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 687 $class->SUPER::new (can_events => 0, %arg);
673} 688}
… …
680 695
681sub draw { } 696sub draw { }
682 697
683############################################################################# 698#############################################################################
684 699
685package CFPlus::UI::Container; 700package DC::UI::Container;
686 701
687our @ISA = CFPlus::UI::Base::; 702our @ISA = DC::UI::Base::;
688 703
689sub new { 704sub new {
690 my ($class, %arg) = @_; 705 my ($class, %arg) = @_;
691 706
692 my $children = delete $arg{children}; 707 my $children = delete $arg{children};
… …
786 $_->draw for $self->visible_children; 801 $_->draw for $self->visible_children;
787} 802}
788 803
789############################################################################# 804#############################################################################
790 805
791package CFPlus::UI::Bin; 806package DC::UI::Bin;
792 807
793our @ISA = CFPlus::UI::Container::; 808our @ISA = DC::UI::Container::;
794 809
795sub new { 810sub new {
796 my ($class, %arg) = @_; 811 my ($class, %arg) = @_;
797 812
798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 813 my $child = (delete $arg{child}) || new DC::UI::Empty::;
799 814
800 $class->SUPER::new (children => [$child], %arg) 815 $class->SUPER::new (children => [$child], %arg)
801} 816}
802 817
803sub add { 818sub add {
… …
810sub remove { 825sub remove {
811 my ($self, $widget) = @_; 826 my ($self, $widget) = @_;
812 827
813 $self->SUPER::remove ($widget); 828 $self->SUPER::remove ($widget);
814 829
815 $self->{children} = [new CFPlus::UI::Empty] 830 $self->{children} = [new DC::UI::Empty]
816 unless @{$self->{children}}; 831 unless @{$self->{children}};
817} 832}
818 833
819sub child { $_[0]->{children}[0] } 834sub child { $_[0]->{children}[0] }
820 835
… …
829 844
830 1 845 1
831} 846}
832 847
833############################################################################# 848#############################################################################
834
835# back-buffered drawing area 849# back-buffered drawing area
836 850
837package CFPlus::UI::Window; 851package DC::UI::Window;
838 852
839our @ISA = CFPlus::UI::Bin::; 853our @ISA = DC::UI::Bin::;
840 854
841use CFPlus::OpenGL; 855use DC::OpenGL;
842 856
843sub new { 857sub new {
844 my ($class, %arg) = @_; 858 my ($class, %arg) = @_;
845 859
846 my $self = $class->SUPER::new (%arg); 860 my $self = $class->SUPER::new (%arg);
… …
868} 882}
869 883
870sub render_child { 884sub render_child {
871 my ($self) = @_; 885 my ($self) = @_;
872 886
873 $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 {
874 glClearColor 0, 0, 0, 0; 888 glClearColor 0, 0, 0, 0;
875 glClear GL_COLOR_BUFFER_BIT; 889 glClear GL_COLOR_BUFFER_BIT;
876 890
877 { 891 {
878 package CFPlus::UI::Base; 892 package DC::UI::Base;
879 893
880 local ($draw_x, $draw_y, $draw_w, $draw_h) = 894 local ($draw_x, $draw_y, $draw_w, $draw_h) =
881 (0, 0, $self->{w}, $self->{h}); 895 (0, 0, $self->{w}, $self->{h});
882 896
883 $self->_render; 897 $self->_render;
… …
900 glDisable GL_TEXTURE_2D; 914 glDisable GL_TEXTURE_2D;
901} 915}
902 916
903############################################################################# 917#############################################################################
904 918
905package CFPlus::UI::ViewPort; 919package DC::UI::ViewPort;
906 920
907use List::Util qw(min max); 921use List::Util qw(min max);
908 922
909our @ISA = CFPlus::UI::Window::; 923our @ISA = DC::UI::Window::;
910 924
911sub new { 925sub new {
912 my $class = shift; 926 my $class = shift;
913 927
914 $class->SUPER::new ( 928 $class->SUPER::new (
… …
998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1012 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
999 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1013 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1000 ) { 1014 ) {
1001 $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})
1002 } else { 1016 } else {
1003 $self->CFPlus::UI::Base::find_widget ($x, $y) 1017 $self->DC::UI::Base::find_widget ($x, $y)
1004 } 1018 }
1005} 1019}
1006 1020
1007sub _render { 1021sub _render {
1008 my ($self) = @_; 1022 my ($self) = @_;
1009 1023
1010 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};
1011 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};
1012 1026
1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1027 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1014 1028
1015 $self->SUPER::_render; 1029 $self->SUPER::_render;
1016} 1030}
1017 1031
1018############################################################################# 1032#############################################################################
1019 1033
1020package CFPlus::UI::ScrolledWindow; 1034package DC::UI::ScrolledWindow;
1021 1035
1022our @ISA = CFPlus::UI::Table::; 1036our @ISA = DC::UI::Table::;
1023 1037
1024sub new { 1038sub new {
1025 my ($class, %arg) = @_; 1039 my ($class, %arg) = @_;
1026 1040
1027 my $child = delete $arg{child}; 1041 my $child = delete $arg{child};
1028 1042
1029 my $self; 1043 my $self;
1030 1044
1031 my $hslider = new CFPlus::UI::Slider 1045 my $hslider = new DC::UI::Slider
1032 c_col => 0, 1046 c_col => 0,
1033 c_row => 1, 1047 c_row => 1,
1034 vertical => 0, 1048 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1050 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1051 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1053 },
1040 ; 1054 ;
1041 1055
1042 my $vslider = new CFPlus::UI::Slider 1056 my $vslider = new DC::UI::Slider
1043 c_col => 1, 1057 c_col => 1,
1044 c_row => 0, 1058 c_row => 0,
1045 vertical => 1, 1059 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1061 on_changed => sub {
… …
1059 col_expand => [1, 0], 1073 col_expand => [1, 0],
1060 row_expand => [1, 0], 1074 row_expand => [1, 0],
1061 %arg, 1075 %arg,
1062 ); 1076 );
1063 1077
1064 $self->{vp} = new CFPlus::UI::ViewPort 1078 $self->{vp} = new DC::UI::ViewPort
1065 c_col => 0, 1079 c_col => 0,
1066 c_row => 0, 1080 c_row => 0,
1067 expand => 1, 1081 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1082 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1083 scroll_y => $self->{scroll_y},
… …
1195 $self->SUPER::invoke_size_allocate ($w, $h) 1209 $self->SUPER::invoke_size_allocate ($w, $h)
1196} 1210}
1197 1211
1198############################################################################# 1212#############################################################################
1199 1213
1200package CFPlus::UI::Frame; 1214package DC::UI::Frame;
1201 1215
1202our @ISA = CFPlus::UI::Bin::; 1216our @ISA = DC::UI::Bin::;
1203 1217
1204use CFPlus::OpenGL; 1218use DC::OpenGL;
1205 1219
1206sub new { 1220sub new {
1207 my $class = shift; 1221 my $class = shift;
1208 1222
1209 $class->SUPER::new ( 1223 $class->SUPER::new (
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1233 my ($w, $h) = @$self{qw(w h)};
1220 1234
1221 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1237 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1238 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1239 glDisable GL_BLEND;
1233 } 1240 }
1234 1241
1235 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1236} 1243}
1237 1244
1238############################################################################# 1245#############################################################################
1239 1246
1240package CFPlus::UI::FancyFrame; 1247package DC::UI::FancyFrame;
1241 1248
1242our @ISA = CFPlus::UI::Bin::; 1249our @ISA = DC::UI::Bin::;
1243 1250
1244use CFPlus::OpenGL; 1251use DC::OpenGL;
1245 1252
1246sub new { 1253sub new {
1247 my ($class, %arg) = @_; 1254 my ($class, %arg) = @_;
1248 1255
1249 if ((exists $arg{label}) && !ref $arg{label}) { 1256 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label 1257 $arg{label} = new DC::UI::Label
1251 align => 1, 1258 align => 1,
1252 valign => 0, 1259 valign => 0.5,
1253 text => $arg{label}, 1260 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75; 1261 fontsize => ($arg{border} || 0.8) * 0.75;
1255 } 1262 }
1256 1263
1257 my $self = $class->SUPER::new ( 1264 my $self = $class->SUPER::new (
1258 # label => "", 1265 # label => "",
1259 fg => [0.6, 0.3, 0.1], 1266 fg => undef,
1260 border => 0.8, 1267 border => 0.8,
1261 style => 'single', 1268 style => 'single',
1262 %arg, 1269 %arg,
1263 ); 1270 );
1264 1271
… …
1267 1274
1268sub add { 1275sub add {
1269 my ($self, @widgets) = @_; 1276 my ($self, @widgets) = @_;
1270 1277
1271 $self->SUPER::add (@widgets); 1278 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1279 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273} 1280}
1274 1281
1275sub border { 1282sub border {
1276 int $_[0]{border} * $::FONTSIZE 1283 int $_[0]{border} * $::FONTSIZE
1277} 1284}
… …
1317 my $border = $self->border; 1324 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h}); 1325 my ($w, $h) = ($self->{w}, $self->{h});
1319 1326
1320 $child->draw; 1327 $child->draw;
1321 1328
1322 glColor @{$self->{fg}}; 1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1323 glBegin GL_LINE_STRIP; 1330 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 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;
1327 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;
… …
1335 } 1342 }
1336} 1343}
1337 1344
1338############################################################################# 1345#############################################################################
1339 1346
1340package CFPlus::UI::Toplevel; 1347package DC::UI::Toplevel;
1341 1348
1342our @ISA = CFPlus::UI::Bin::; 1349our @ISA = DC::UI::Bin::;
1343 1350
1344use CFPlus::OpenGL; 1351use DC::OpenGL;
1345 1352
1346my $bg = 1353my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1348 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1349 1356
1350my @border = 1357my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1358 map { new_from_resource DC::Texture $_, mipmap => 1 }
1352 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);
1353 1360
1354my @icon = 1361my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png); 1363 qw(x1_move.png x1_resize.png);
1357 1364
1358sub new { 1365sub new {
1359 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1360 1367
1361 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1362 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1363 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1364 border => 0.6, 1371 border => 0.8,
1365 can_events => 1, 1372 can_events => 1,
1366 min_w => 64, 1373 min_w => 64,
1367 min_h => 32, 1374 min_h => 32,
1368 %arg, 1375 %arg,
1369 ); 1376 );
1370 1377
1371 $self->{title_widget} = new CFPlus::UI::Label 1378 $self->{title_widget} = new DC::UI::Label
1372 align => 0, 1379 align => 0.5,
1373 valign => 1, 1380 valign => 1,
1374 text => $self->{title}, 1381 text => $self->{title},
1375 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1376 if exists $self->{title}; 1383 if exists $self->{title};
1377 1384
1378 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1379 $self->{close_button} = 1386 $self->{close_button} =
1380 new CFPlus::UI::ImageButton 1387 new DC::UI::ImageButton
1381 path => 'x1_close.png', 1388 path => 'x1_close.png',
1382 on_activate => sub { $self->emit ("delete") }; 1389 on_activate => sub { $self->emit ("delete") };
1383 1390
1384 $self->CFPlus::UI::Container::add ($self->{close_button}); 1391 $self->DC::UI::Container::add ($self->{close_button});
1385 } 1392 }
1386 1393
1387 $self 1394 $self
1388} 1395}
1389 1396
1390sub add { 1397sub add {
1391 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1392 1399
1393 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1394 $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};
1395 $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};
1396} 1403}
1397 1404
1398sub border { 1405sub border {
1399 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
1400} 1416}
1401 1417
1402sub size_request { 1418sub size_request {
1403 my ($self) = @_; 1419 my ($self) = @_;
1404 1420
… …
1529 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 1547
1532 my $border = $self->border; 1548 my $border = $self->border;
1533 1549
1550 if ($border) {
1534 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539 1556
1540 # move 1557 # move
1541 my $w2 = ($w - $border) * .5; 1558 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5; 1559 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546 1563
1547 # resize 1564 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button}; 1567 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1553 1571
1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1555 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1556 1574
1557 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
… …
1576 if $self->{close_button}; 1594 if $self->{close_button};
1577} 1595}
1578 1596
1579############################################################################# 1597#############################################################################
1580 1598
1581package CFPlus::UI::Table; 1599package DC::UI::Table;
1582 1600
1583our @ISA = CFPlus::UI::Container::; 1601our @ISA = DC::UI::Container::;
1584 1602
1585use List::Util qw(max sum); 1603use List::Util qw(max sum);
1586 1604
1587use CFPlus::OpenGL; 1605use DC::OpenGL;
1588 1606
1589sub new { 1607sub new {
1590 my $class = shift; 1608 my $class = shift;
1591 1609
1592 $class->SUPER::new ( 1610 $class->SUPER::new (
… …
1636 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)};
1637 1655
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1656 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1657
1640 if ($w > $sw) { 1658 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1659 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1660 }
1643 } 1661 }
1644 1662
1645 # second pass, rows 1663 # second pass, rows
1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { 1664 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 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)};
1648 1666
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1667 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1668
1651 if ($h > $sh) { 1669 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1670 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1653 } 1671 }
1654 } 1672 }
1655 1673
1656 (\@w, \@h) 1674 (\@w, \@h)
1657} 1675}
… …
1680 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1681 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1682 1700
1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1684 1702
1685 CFPlus::UI::harmonize $ws; 1703 DC::UI::harmonize $ws;
1686 1704
1687 my @row_expand = @{$self->{row_expand}}; 1705 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand; 1706 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1; 1707 my $row_expand = (sum @row_expand) || 1;
1690 1708
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692 1710
1693 CFPlus::UI::harmonize $hs; 1711 DC::UI::harmonize $hs;
1694 1712
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1713 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1714 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1715
1698 for my $widget ($self->children) { 1716 for my $widget ($self->children) {
… …
1707 1 1725 1
1708} 1726}
1709 1727
1710############################################################################# 1728#############################################################################
1711 1729
1712package CFPlus::UI::Fixed; 1730package DC::UI::Fixed;
1713 1731
1714use List::Util qw(min max); 1732use List::Util qw(min max);
1715 1733
1716our @ISA = CFPlus::UI::Container::; 1734our @ISA = DC::UI::Container::;
1717 1735
1718sub _scale($$$) { 1736sub _scale($$$) {
1719 my ($rel, $val, $max) = @_; 1737 my ($rel, $val, $max) = @_;
1720 1738
1721 $rel ? $val * $max : $val 1739 $rel ? $val * $max : $val
… …
1773 1 1791 1
1774} 1792}
1775 1793
1776############################################################################# 1794#############################################################################
1777 1795
1778package CFPlus::UI::Box; 1796package DC::UI::Box;
1779 1797
1780our @ISA = CFPlus::UI::Container::; 1798our @ISA = DC::UI::Container::;
1781 1799
1782sub size_request { 1800sub size_request {
1783 my ($self) = @_; 1801 my ($self) = @_;
1784 1802
1785 my @children = $self->visible_children; 1803 my @children = $self->visible_children;
… …
1820 $req[$_] += $space * $children[$_]{expand} 1838 $req[$_] += $space * $children[$_]{expand}
1821 for 0 .. $#children; 1839 for 0 .. $#children;
1822 } 1840 }
1823 } 1841 }
1824 1842
1825 CFPlus::UI::harmonize \@req; 1843 DC::UI::harmonize \@req;
1826 1844
1827 my $pos = 0; 1845 my $pos = 0;
1828 for (0 .. $#children) { 1846 for (0 .. $#children) {
1829 my $alloc = $req[$_]; 1847 my $alloc = $req[$_];
1830 $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));
… …
1835 1 1853 1
1836} 1854}
1837 1855
1838############################################################################# 1856#############################################################################
1839 1857
1840package CFPlus::UI::HBox; 1858package DC::UI::HBox;
1841 1859
1842our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1843 1861
1844sub new { 1862sub new {
1845 my $class = shift; 1863 my $class = shift;
1846 1864
1847 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1850 ) 1868 )
1851} 1869}
1852 1870
1853############################################################################# 1871#############################################################################
1854 1872
1855package CFPlus::UI::VBox; 1873package DC::UI::VBox;
1856 1874
1857our @ISA = CFPlus::UI::Box::; 1875our @ISA = DC::UI::Box::;
1858 1876
1859sub new { 1877sub new {
1860 my $class = shift; 1878 my $class = shift;
1861 1879
1862 $class->SUPER::new ( 1880 $class->SUPER::new (
… …
1865 ) 1883 )
1866} 1884}
1867 1885
1868############################################################################# 1886#############################################################################
1869 1887
1870package CFPlus::UI::Label; 1888package DC::UI::Label;
1871 1889
1872our @ISA = CFPlus::UI::DrawBG::; 1890our @ISA = DC::UI::DrawBG::;
1873 1891
1874use CFPlus::OpenGL; 1892use DC::OpenGL;
1875 1893
1876sub new { 1894sub new {
1877 my ($class, %arg) = @_; 1895 my ($class, %arg) = @_;
1878 1896
1879 my $self = $class->SUPER::new ( 1897 my $self = $class->SUPER::new (
… …
1884 #text => initial text 1902 #text => initial text
1885 #markup => initial narkup 1903 #markup => initial narkup
1886 #max_w => maximum pixel width 1904 #max_w => maximum pixel width
1887 #style => 0, # render flags 1905 #style => 0, # render flags
1888 ellipsise => 3, # end 1906 ellipsise => 3, # end
1889 layout => (new CFPlus::Layout), 1907 layout => (new DC::Layout),
1890 fontsize => 1, 1908 fontsize => 1,
1891 align => -1, 1909 align => 0.5,
1892 valign => -1, 1910 valign => 0.5,
1893 padding_x => 2, 1911 padding_x => 4,
1894 padding_y => 2, 1912 padding_y => 2,
1895 can_events => 0, 1913 can_events => 0,
1896 %arg 1914 %arg
1897 ); 1915 );
1898 1916
1899 if (exists $self->{template}) { 1917 if (exists $self->{template}) {
1900 my $layout = new CFPlus::Layout; 1918 my $layout = new DC::Layout;
1901 $layout->set_text (delete $self->{template}); 1919 $layout->set_text (delete $self->{template});
1902 $self->{template} = $layout; 1920 $self->{template} = $layout;
1903 } 1921 }
1904 1922
1905 if (exists $self->{markup}) { 1923 if (exists $self->{markup}) {
… …
1923 1941
1924 delete $self->{ox}; 1942 delete $self->{ox};
1925 $self->SUPER::realloc; 1943 $self->SUPER::realloc;
1926} 1944}
1927 1945
1946sub clear {
1947 my ($self) = @_;
1948
1949 $self->set_text ("");
1950}
1951
1928sub set_text { 1952sub set_text {
1929 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1930 1954
1931 return if $self->{text} eq "T$text"; 1955 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1956 $self->{text} = "T$text";
… …
1955 1979
1956sub size_request { 1980sub size_request {
1957 my ($self) = @_; 1981 my ($self) = @_;
1958 1982
1959 $self->{size_req} ||= do { 1983 $self->{size_req} ||= do {
1984 my ($max_w, $max_h) = $self->get_max_wh;
1985
1960 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($max_w);
1962 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1965 1991
1966 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1967 1993
1968 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1969 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1970 $self->{template}->set_width ($self->{max_w} || -1); 1996 $self->{template}->set_width ($max_w);
1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1972 1998
1973 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1974 2000
1975 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
2031 2057
2032 [$self->{layout}->size] 2058 [$self->{layout}->size]
2033 }; 2059 };
2034 2060
2035 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
2036 $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);
2037 : $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);
2038 : ($self->{w} - $size->[0]) * 0.5);
2039 2064
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5);
2043 }; 2066 };
2044 2067
2045# unless ($self->{list}) { 2068# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2069# $self->{list} = DC::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2070# DC::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2071# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList; 2072# DC::OpenGL::glEndList;
2050# } 2073# }
2051# 2074#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2075# DC::OpenGL::glCallList $self->{list};
2053 2076
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2077 $self->{layout}->draw;
2055} 2078}
2056 2079
2057#sub destroy { 2080#sub destroy {
2058# my ($self) = @_; 2081# my ($self) = @_;
2059# 2082#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2083# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061# 2084#
2062# $self->SUPER::destroy; 2085# $self->SUPER::destroy;
2063#} 2086#}
2064 2087
2065############################################################################# 2088#############################################################################
2066 2089
2067package CFPlus::UI::EntryBase; 2090package DC::UI::EntryBase;
2068 2091
2069our @ISA = CFPlus::UI::Label::; 2092our @ISA = DC::UI::Label::;
2070 2093
2071use CFPlus::OpenGL; 2094use DC::OpenGL;
2072 2095
2073sub new { 2096sub new {
2074 my $class = shift; 2097 my $class = shift;
2075 2098
2076 $class->SUPER::new ( 2099 $class->SUPER::new (
2077 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1], 2102 outline => undef,
2080 active_bg => [0, 0, 1, .2], 2103 active_bg => [0, 0, 1, .2],
2081 active_fg => [1, 1, 1], 2104 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0], 2105 active_outline => [1, 1, 0],
2083 can_hover => 1, 2106 can_hover => 1,
2084 can_focus => 1, 2107 can_focus => 1,
2108 align => 0,
2085 valign => 0, 2109 valign => 0.5,
2086 can_events => 1, 2110 can_events => 1,
2087 ellipsise => 0, 2111 ellipsise => 0,
2112 padding_x => 4,
2113 padding_y => 2,
2088 #text => ... 2114 #text => ...
2089 #hidden => "*", 2115 #hidden => "*",
2090 @_ 2116 @_
2091 ) 2117 )
2092} 2118}
… …
2139 2165
2140 my $text = $self->get_text; 2166 my $text = $self->get_text;
2141 2167
2142 $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;
2143 2169
2144 if ($uni == 8) { 2170 if ($sym == DC::SDLK_BACKSPACE) {
2145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2146 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
2147 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
2148 } elsif ($sym == CFPlus::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
2149 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
2150 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
2151 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2152 } elsif ($sym == CFPlus::SDLK_HOME) { 2178 } elsif ($sym == DC::SDLK_HOME) {
2153 # what a hack 2179 # what a hack
2154 $self->{cursor} = 2180 $self->{cursor} =
2155 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2181 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2156 ? length $1 2182 ? length $1
2157 : 0; 2183 : 0;
2158 } elsif ($sym == CFPlus::SDLK_END) { 2184 } elsif ($sym == DC::SDLK_END) {
2159 # uh, again 2185 # uh, again
2160 $self->{cursor} = 2186 $self->{cursor} =
2161 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2187 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2162 ? $self->{cursor} + length $1 2188 ? $self->{cursor} + length $1
2163 : length $self->{text}; 2189 : length $self->{text};
… …
2227 glColor_premultiply @{$self->{bg}}; 2253 glColor_premultiply @{$self->{bg}};
2228 } 2254 }
2229 2255
2230 glEnable GL_BLEND; 2256 glEnable GL_BLEND;
2231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2257 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2232 glBegin GL_QUADS;
2233 glVertex 0 , 0;
2234 glVertex 0 , $self->{h};
2235 glVertex $self->{w}, $self->{h}; 2258 glRect 0, 0, $self->{w}, $self->{h};
2236 glVertex $self->{w}, 0;
2237 glEnd;
2238 glDisable GL_BLEND; 2259 glDisable GL_BLEND;
2239 2260
2240 $self->SUPER::_draw; 2261 $self->SUPER::_draw;
2241 2262
2242 #TODO: force update every cursor change :( 2263 #TODO: force update every cursor change :(
… …
2249 @$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);
2250 } 2271 }
2251 2272
2252 glColor_premultiply @{$self->{active_fg}}; 2273 glColor_premultiply @{$self->{active_fg}};
2253 glBegin GL_LINES; 2274 glBegin GL_LINES;
2254 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};
2255 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};
2256 glEnd; 2277 glEnd;
2257 2278
2258 glLineWidth 3; 2279 glLineWidth 3;
2259 glColor @{$self->{active_outline}}; 2280 glColor @{$self->{active_outline}};
2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2282 glLineWidth 1;
2283
2284 } else {
2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2260 glBegin GL_LINE_LOOP; 2286 glBegin GL_LINE_STRIP;
2261 glVertex 0, 0; 2287 glVertex .5, $self->{h} * .5;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h} - 1; 2288 glVertex .5, $self->{h} - 2.5;
2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2290 glVertex $self->{w} - .5, $self->{h} * .5;
2265 glEnd; 2291 glEnd;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2276 glEnd;
2277 } 2292 }
2278} 2293}
2279 2294
2280############################################################################# 2295#############################################################################
2281 2296
2282package CFPlus::UI::Entry; 2297package DC::UI::Entry;
2283 2298
2284our @ISA = CFPlus::UI::EntryBase::; 2299our @ISA = DC::UI::EntryBase::;
2285 2300
2286use 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
2287 2312
2288sub invoke_key_down { 2313sub invoke_key_down {
2289 my ($self, $ev) = @_; 2314 my ($self, $ev) = @_;
2290 2315
2291 my $sym = $ev->{sym}; 2316 my $sym = $ev->{sym};
… …
2297 $self->{history_pointer} = -1; 2322 $self->{history_pointer} = -1;
2298 $self->{history_saveback} = ''; 2323 $self->{history_saveback} = '';
2299 $self->emit (activate => $txt); 2324 $self->emit (activate => $txt);
2300 $self->update; 2325 $self->update;
2301 2326
2302 } elsif ($sym == CFPlus::SDLK_UP) { 2327 } elsif ($sym == DC::SDLK_UP) {
2303 if ($self->{history_pointer} < 0) { 2328 if ($self->{history_pointer} < 0) {
2304 $self->{history_saveback} = $self->get_text; 2329 $self->{history_saveback} = $self->get_text;
2305 } 2330 }
2306 if (@{$self->{history} || []} > 0) { 2331 if (@{$self->{history} || []} > 0) {
2307 $self->{history_pointer}++; 2332 $self->{history_pointer}++;
… …
2309 $self->{history_pointer} = @{$self->{history} || []} - 1; 2334 $self->{history_pointer} = @{$self->{history} || []} - 1;
2310 } 2335 }
2311 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2336 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2312 } 2337 }
2313 2338
2314 } elsif ($sym == CFPlus::SDLK_DOWN) { 2339 } elsif ($sym == DC::SDLK_DOWN) {
2315 $self->{history_pointer}--; 2340 $self->{history_pointer}--;
2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2341 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2317 2342
2318 if ($self->{history_pointer} >= 0) { 2343 if ($self->{history_pointer} >= 0) {
2319 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2320 } else { 2345 } else {
2346 if (defined $self->{history_saveback}) {
2321 $self->set_text ($self->{history_saveback}); 2347 $self->set_text ($self->{history_saveback});
2348 $self->{history_saveback} = undef;
2349 }
2322 } 2350 }
2323 2351
2324 } else { 2352 } else {
2325 return $self->SUPER::invoke_key_down ($ev) 2353 return $self->SUPER::invoke_key_down ($ev)
2326 } 2354 }
… …
2328 1 2356 1
2329} 2357}
2330 2358
2331############################################################################# 2359#############################################################################
2332 2360
2333package CFPlus::UI::TextEdit; 2361package DC::UI::TextEdit;
2334 2362
2335our @ISA = CFPlus::UI::EntryBase::; 2363our @ISA = DC::UI::EntryBase::;
2336 2364
2337use 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}
2338 2376
2339sub move_cursor_ver { 2377sub move_cursor_ver {
2340 my ($self, $dy) = @_; 2378 my ($self, $dy) = @_;
2341 2379
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2380 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343 2381
2344 $y += $dy; 2382 $line += $dy;
2345 2383
2346 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))) {
2347 $self->{cursor} = $index; 2385 $self->{cursor} = $index;
2348 delete $self->{cur_h}; 2386 delete $self->{cur_h};
2349 $self->update; 2387 $self->update;
2350 return; 2388 return;
2351 } 2389 }
… …
2354sub invoke_key_down { 2392sub invoke_key_down {
2355 my ($self, $ev) = @_; 2393 my ($self, $ev) = @_;
2356 2394
2357 my $sym = $ev->{sym}; 2395 my $sym = $ev->{sym};
2358 2396
2359 if ($sym == CFPlus::SDLK_UP) { 2397 if ($sym == DC::SDLK_UP) {
2360 $self->move_cursor_ver (-1); 2398 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) { 2399 } elsif ($sym == DC::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1); 2400 $self->move_cursor_ver (+1);
2363 } else { 2401 } else {
2364 return $self->SUPER::invoke_key_down ($ev) 2402 return $self->SUPER::invoke_key_down ($ev)
2365 } 2403 }
2366 2404
2367 1 2405 1
2368} 2406}
2369 2407
2370############################################################################# 2408#############################################################################
2371 2409
2372package CFPlus::UI::ButtonBin; 2410package DC::UI::ButtonBin;
2373 2411
2374our @ISA = CFPlus::UI::Bin::; 2412our @ISA = DC::UI::Bin::;
2375 2413
2376use CFPlus::OpenGL; 2414use DC::OpenGL;
2377 2415
2378my @tex = 2416my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2380 qw(b1_button_inactive.png b1_button_active.png); 2418 qw(b1_button_inactive.png b1_button_active.png);
2381 2419
2382sub new { 2420sub new {
2383 my $class = shift; 2421 my $class = shift;
2384 2422
2385 $class->SUPER::new ( 2423 $class->SUPER::new (
2386 can_hover => 1, 2424 can_hover => 1,
2387 align => 0, 2425 align => 0.5,
2388 valign => 0, 2426 valign => 0.5,
2389 can_events => 1, 2427 can_events => 1,
2390 @_ 2428 @_
2391 ) 2429 )
2392} 2430}
2393 2431
… …
2416 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2417} 2455}
2418 2456
2419############################################################################# 2457#############################################################################
2420 2458
2421package CFPlus::UI::Button; 2459package DC::UI::Button;
2422 2460
2423our @ISA = CFPlus::UI::Label::; 2461our @ISA = DC::UI::Label::;
2424 2462
2425use CFPlus::OpenGL; 2463use DC::OpenGL;
2426 2464
2427my @tex = 2465my @tex =
2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2429 qw(b1_button_inactive.png b1_button_active.png); 2467 qw(b1_button_inactive.png b1_button_active.png);
2430 2468
2431sub new { 2469sub new {
2432 my $class = shift; 2470 my $class = shift;
2433 2471
2434 $class->SUPER::new ( 2472 $class->SUPER::new (
2435 padding_x => 4, 2473 padding_x => 8,
2436 padding_y => 4, 2474 padding_y => 4,
2437 fg => [1.0, 1.0, 1.0], 2475 fg => [1.0, 1.0, 1.0],
2438 active_fg => [0.8, 0.8, 0.8], 2476 active_fg => [0.8, 0.8, 0.8],
2439 can_hover => 1, 2477 can_hover => 1,
2440 align => 0, 2478 align => 0.5,
2441 valign => 0, 2479 valign => 0.5,
2442 can_events => 1, 2480 can_events => 1,
2443 @_ 2481 @_
2444 ) 2482 )
2445} 2483}
2446 2484
… …
2471 $self->SUPER::_draw; 2509 $self->SUPER::_draw;
2472} 2510}
2473 2511
2474############################################################################# 2512#############################################################################
2475 2513
2476package CFPlus::UI::CheckBox; 2514package DC::UI::CheckBox;
2477 2515
2478our @ISA = CFPlus::UI::DrawBG::; 2516our @ISA = DC::UI::DrawBG::;
2479 2517
2480my @tex = 2518my @tex =
2481 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2482 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2483 2521
2484use CFPlus::OpenGL; 2522use DC::OpenGL;
2485 2523
2486sub new { 2524sub new {
2487 my $class = shift; 2525 my $class = shift;
2488 2526
2489 $class->SUPER::new ( 2527 $class->SUPER::new (
2528 fontsize => 1,
2490 padding_x => 2, 2529 padding_x => 2,
2491 padding_y => 2, 2530 padding_y => 2,
2492 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2493 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2494 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
… …
2500} 2539}
2501 2540
2502sub size_request { 2541sub size_request {
2503 my ($self) = @_; 2542 my ($self) = @_;
2504 2543
2505 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2506} 2545}
2507 2546
2508sub toggle { 2547sub toggle {
2509 my ($self) = @_; 2548 my ($self) = @_;
2510 2549
… …
2529sub _draw { 2568sub _draw {
2530 my ($self) = @_; 2569 my ($self) = @_;
2531 2570
2532 $self->SUPER::_draw; 2571 $self->SUPER::_draw;
2533 2572
2534 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2573 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2535 2574
2536 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2537 2576
2538 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;
2539 2578
… …
2546 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2547} 2586}
2548 2587
2549############################################################################# 2588#############################################################################
2550 2589
2551package CFPlus::UI::Image; 2590package DC::UI::Image;
2552 2591
2553our @ISA = CFPlus::UI::Base::; 2592our @ISA = DC::UI::Base::;
2554 2593
2555use CFPlus::OpenGL; 2594use DC::OpenGL;
2556 2595
2557our %texture_cache; 2596our %texture_cache;
2558 2597
2559sub new { 2598sub new {
2560 my $class = shift; 2599 my $class = shift;
… …
2567 2606
2568 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2569 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2570 2609
2571 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2572 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2573 2612
2574 CFPlus::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2575 2614
2576 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2577 2616
2578 $self 2617 $self
2579} 2618}
2580 2619
2581sub STORABLE_freeze { 2620sub STORABLE_freeze {
2582 my ($self, $cloning) = @_; 2621 my ($self, $cloning) = @_;
2583 2622
2584 $self->{path} 2623 $self->{path}
2585 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";
2586 2625
2587 $self->{path} 2626 $self->{path}
2588} 2627}
2589 2628
2590sub STORABLE_attach { 2629sub STORABLE_attach {
… …
2621 glDisable GL_TEXTURE_2D; 2660 glDisable GL_TEXTURE_2D;
2622} 2661}
2623 2662
2624############################################################################# 2663#############################################################################
2625 2664
2626package CFPlus::UI::ImageButton; 2665package DC::UI::ImageButton;
2627 2666
2628our @ISA = CFPlus::UI::Image::; 2667our @ISA = DC::UI::Image::;
2629 2668
2630use CFPlus::OpenGL; 2669use DC::OpenGL;
2631 2670
2632my %textures; 2671my %textures;
2633 2672
2634sub new { 2673sub new {
2635 my $class = shift; 2674 my $class = shift;
… …
2638 padding_x => 4, 2677 padding_x => 4,
2639 padding_y => 4, 2678 padding_y => 4,
2640 fg => [1, 1, 1], 2679 fg => [1, 1, 1],
2641 active_fg => [0, 0, 1], 2680 active_fg => [0, 0, 1],
2642 can_hover => 1, 2681 can_hover => 1,
2643 align => 0, 2682 align => 0.5,
2644 valign => 0, 2683 valign => 0.5,
2645 can_events => 1, 2684 can_events => 1,
2646 @_ 2685 @_
2647 ); 2686 );
2648} 2687}
2649 2688
2689sub invoke_button_down {
2690 my ($self, $ev, $x, $y) = @_;
2691
2692 1
2693}
2694
2650sub invoke_button_up { 2695sub invoke_button_up {
2651 my ($self, $ev, $x, $y) = @_; 2696 my ($self, $ev, $x, $y) = @_;
2652 2697
2653 $self->emit ("activate") 2698 $self->emit ("activate")
2654 if $x >= 0 && $x < $self->{w} 2699 if $x >= 0 && $x < $self->{w}
… …
2657 1 2702 1
2658} 2703}
2659 2704
2660############################################################################# 2705#############################################################################
2661 2706
2662package CFPlus::UI::VGauge; 2707package DC::UI::VGauge;
2663 2708
2664our @ISA = CFPlus::UI::Base::; 2709our @ISA = DC::UI::Base::;
2665 2710
2666use List::Util qw(min max); 2711use List::Util qw(min max);
2667 2712
2668use CFPlus::OpenGL; 2713use DC::OpenGL;
2669 2714
2670my %tex = ( 2715my %tex = (
2671 food => [ 2716 food => [
2672 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2673 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2674 ], 2719 ],
2675 grace => [ 2720 grace => [
2676 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2677 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/
2678 ], 2723 ],
2679 hp => [ 2724 hp => [
2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2681 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2682 ], 2727 ],
2683 mana => [ 2728 mana => [
2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2729 map { new_from_resource DC::Texture $_, mipmap => 1 }
2685 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/
2686 ], 2731 ],
2687); 2732);
2688 2733
2689# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2792 glDisable GL_TEXTURE_2D; 2837 glDisable GL_TEXTURE_2D;
2793} 2838}
2794 2839
2795############################################################################# 2840#############################################################################
2796 2841
2842package DC::UI::Progress;
2843
2844our @ISA = DC::UI::Label::;
2845
2846use DC::OpenGL;
2847
2848sub new {
2849 my ($class, %arg) = @_;
2850
2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2854 fg => [1, 1, 1],
2855 bg => [0, 0, 1, 0.2],
2856 bar => [0.7, 0.5, 0.1, 0.8],
2857 outline => [0.4, 0.3, 0],
2858 fontsize => 0.9,
2859 valign => 0.5,
2860 align => 0.5,
2861 can_events => 1,
2862 ellipsise => 1,
2863 label => "%d%%",
2864 %arg,
2865 );
2866
2867 $self->set_value ($arg{value} || -1);
2868
2869 $self
2870}
2871
2872sub set_label {
2873 my ($self, $label) = @_;
2874
2875 return if $self->{label} eq $label;
2876 $self->{label} = $label;
2877
2878 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2879}
2880
2881sub set_value {
2882 my ($self, $value) = @_;
2883
2884 if ($self->{value} ne $value) {
2885 $self->{value} = $value;
2886
2887 if ($value < 0) {
2888 $self->set_text ("-");
2889 } else {
2890 $self->set_text (sprintf $self->{label}, $value * 100);
2891 }
2892
2893 $self->update;
2894 }
2895}
2896
2897sub _draw {
2898 my ($self) = @_;
2899
2900 glEnable GL_BLEND;
2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2906 if ($self->{value} >= 0) {
2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2908
2909 glColor_premultiply @{$self->{bar}};
2910 glRect $px, $py, $s, $self->{h} - $py;
2911 glColor_premultiply @{$self->{bg}};
2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2913 }
2914
2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2921
2922 glDisable GL_BLEND;
2923
2924 {
2925 local $self->{bg}; # do not draw background
2926 $self->SUPER::_draw;
2927 }
2928}
2929
2930#############################################################################
2931
2932package DC::UI::ExperienceProgress;
2933
2934our @ISA = DC::UI::Progress::;
2935
2936sub new {
2937 my ($class, %arg) = @_;
2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2941 my $self = $class->SUPER::new (
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%%",
2947 $tt,
2948 $self->{lvl},
2949 ::formsep ($self->{exp}),
2950 ::formsep ($self->{nxt}),
2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2953 },
2954 );
2955
2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2957 if $::CONN;
2958
2959 $self
2960}
2961
2962sub DESTROY {
2963 my ($self) = @_;
2964
2965 delete $::CONN->{on_exp_update}{$self+0}
2966 if $::CONN;
2967
2968 $self->SUPER::DESTROY;
2969}
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
2985sub set_value {
2986 my ($self, $lvl, $exp) = @_;
2987
2988 $self->{lvl} = $lvl;
2989 $self->{exp} = $exp;
2990
2991 $self->SUPER::set_value ($self->_percent);
2992}
2993
2994#############################################################################
2995
2797package CFPlus::UI::Gauge; 2996package DC::UI::Gauge;
2798 2997
2799our @ISA = CFPlus::UI::VBox::; 2998our @ISA = DC::UI::VBox::;
2800 2999
2801sub new { 3000sub new {
2802 my ($class, %arg) = @_; 3001 my ($class, %arg) = @_;
2803 3002
2804 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
… …
2806 can_hover => 1, 3005 can_hover => 1,
2807 can_events => 1, 3006 can_events => 1,
2808 %arg, 3007 %arg,
2809 ); 3008 );
2810 3009
2811 $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");
2812 $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);
2813 $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");
2814 3013
2815 $self 3014 $self
2816} 3015}
2817 3016
2818sub set_fontsize { 3017sub set_fontsize {
… …
2839 $self->{value}->set_text ($val); 3038 $self->{value}->set_text ($val);
2840} 3039}
2841 3040
2842############################################################################# 3041#############################################################################
2843 3042
2844package CFPlus::UI::Slider; 3043package DC::UI::Slider;
2845 3044
2846use strict; 3045use strict;
2847 3046
2848use CFPlus::OpenGL; 3047use DC::OpenGL;
2849 3048
2850our @ISA = CFPlus::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
2851 3050
2852my @tex = 3051my @tex =
2853 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
2854 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
2855 3054
2856sub new { 3055sub new {
2857 my $class = shift; 3056 my $class = shift;
2858 3057
… …
2895sub set_value { 3094sub set_value {
2896 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
2897 3096
2898 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2899 3098
2900 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
2901 3100
2902 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
2903
2904 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
2905 $value = $hi - $page if $value > $hi - $page;
2906 3103
2907 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2908 if $unit; 3105 if $unit;
2909 3106
2910 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2954sub invoke_mouse_wheel { 3151sub invoke_mouse_wheel {
2955 my ($self, $ev) = @_; 3152 my ($self, $ev) = @_;
2956 3153
2957 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3154 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2958 3155
2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3156 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2960 3157
2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3158 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2962 3159
2963 1 3160 1
2964} 3161}
… …
2974 my ($self) = @_; 3171 my ($self) = @_;
2975 3172
2976 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
2977 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
2978 3175
2979 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2980 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
2981 3178
2982 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};
2983 3180
2984 $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;
2985 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2986 3183
2987 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
… …
3017 glDisable GL_TEXTURE_2D; 3214 glDisable GL_TEXTURE_2D;
3018} 3215}
3019 3216
3020############################################################################# 3217#############################################################################
3021 3218
3022package CFPlus::UI::ValSlider; 3219package DC::UI::ValSlider;
3023 3220
3024our @ISA = CFPlus::UI::HBox::; 3221our @ISA = DC::UI::HBox::;
3025 3222
3026sub new { 3223sub new {
3027 my ($class, %arg) = @_; 3224 my ($class, %arg) = @_;
3028 3225
3029 my $range = delete $arg{range}; 3226 my $range = delete $arg{range};
3030 3227
3031 my $self = $class->SUPER::new ( 3228 my $self = $class->SUPER::new (
3032 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3229 slider => (new DC::UI::Slider expand => 1, range => $range),
3033 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3230 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3034 to_value => sub { shift }, 3231 to_value => sub { shift },
3035 from_value => sub { shift }, 3232 from_value => sub { shift },
3036 %arg, 3233 %arg,
3037 ); 3234 );
3038 3235
… …
3058sub set_range { shift->{slider}->set_range (@_) } 3255sub set_range { shift->{slider}->set_range (@_) }
3059sub set_value { shift->{slider}->set_value (@_) } 3256sub set_value { shift->{slider}->set_value (@_) }
3060 3257
3061############################################################################# 3258#############################################################################
3062 3259
3063package CFPlus::UI::TextScroller; 3260package DC::UI::TextScroller;
3064 3261
3065our @ISA = CFPlus::UI::HBox::; 3262our @ISA = DC::UI::HBox::;
3066 3263
3067use CFPlus::OpenGL; 3264use DC::OpenGL;
3068 3265
3069sub new { 3266sub new {
3070 my $class = shift; 3267 my $class = shift;
3071 3268
3072 my $self = $class->SUPER::new ( 3269 my $self = $class->SUPER::new (
… …
3074 can_events => 1, 3271 can_events => 1,
3075 indent => 0, 3272 indent => 0,
3076 #font => default_font 3273 #font => default_font
3077 @_, 3274 @_,
3078 3275
3079 layout => (new CFPlus::Layout), 3276 layout => (new DC::Layout),
3080 par => [], 3277 par => [],
3081 max_par => 0, 3278 max_par => 0,
3082 height => 0, 3279 height => 0,
3083 children => [ 3280 children => [
3084 (new CFPlus::UI::Empty expand => 1), 3281 (new DC::UI::Empty expand => 1),
3085 (new CFPlus::UI::Slider vertical => 1), 3282 (new DC::UI::Slider vertical => 1),
3086 ], 3283 ],
3087 ); 3284 );
3088 3285
3089 $self->{children}[1]->connect (changed => sub { $self->update }); 3286 $self->{children}[1]->connect (changed => sub { $self->update });
3090 3287
… …
3146 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3343 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3147 $layout->set_markup ($para->{markup}); 3344 $layout->set_markup ($para->{markup});
3148 3345
3149 $layout->set_shapes ( 3346 $layout->set_shapes (
3150 map 3347 map
3151 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3348 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3152 @{$para->{widget}} 3349 @{$para->{widget}}
3153 ); 3350 );
3154 3351
3155 $layout 3352 $layout
3156} 3353}
… …
3273 $ROOT->on_post_alloc ($self => sub { 3470 $ROOT->on_post_alloc ($self => sub {
3274 $self->force_uptodate; 3471 $self->force_uptodate;
3275 3472
3276 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3473 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3277 3474
3278 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3475 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3279 glClearColor 0, 0, 0, 0; 3476 glClearColor 0, 0, 0, 0;
3280 glClear GL_COLOR_BUFFER_BIT; 3477 glClear GL_COLOR_BUFFER_BIT;
3281 3478
3282 package CFPlus::UI::Base; 3479 package DC::UI::Base;
3283 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3480 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3284 (0, 0, $self->{w}, $self->{h}); 3481 (0, 0, $self->{w}, $self->{h});
3285 3482
3286 my $top = int $self->{children}[1]{range}[0]; 3483 my $top = int $self->{children}[1]{range}[0];
3287 3484
… …
3298 3495
3299 if ($y0 < $y + $h && $y < $y1) { 3496 if ($y0 < $y + $h && $y < $y1) {
3300 my $layout = $self->get_layout ($para); 3497 my $layout = $self->get_layout ($para);
3301 3498
3302 $layout->render ($para->{indent}, $y - $y0); 3499 $layout->render ($para->{indent}, $y - $y0);
3500 $layout->draw;
3303 3501
3304 if (my @w = @{ $para->{widget} }) { 3502 if (my @w = @{ $para->{widget} }) {
3305 my @s = $layout->get_shapes; 3503 my @s = $layout->get_shapes;
3306 3504
3307 for (@w) { 3505 for (@w) {
… …
3345 $self->{children}[1]->draw; 3543 $self->{children}[1]->draw;
3346} 3544}
3347 3545
3348############################################################################# 3546#############################################################################
3349 3547
3350package CFPlus::UI::Animator; 3548package DC::UI::Animator;
3351 3549
3352use CFPlus::OpenGL; 3550use DC::OpenGL;
3353 3551
3354our @ISA = CFPlus::UI::Bin::; 3552our @ISA = DC::UI::Bin::;
3355 3553
3356sub moveto { 3554sub moveto {
3357 my ($self, $x, $y) = @_; 3555 my ($self, $x, $y) = @_;
3358 3556
3359 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3557 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3387 glPopMatrix; 3585 glPopMatrix;
3388} 3586}
3389 3587
3390############################################################################# 3588#############################################################################
3391 3589
3392package CFPlus::UI::Flopper; 3590package DC::UI::Flopper;
3393 3591
3394our @ISA = CFPlus::UI::Button::; 3592our @ISA = DC::UI::Button::;
3395 3593
3396sub new { 3594sub new {
3397 my $class = shift; 3595 my $class = shift;
3398 3596
3399 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3411 $self->{other}->toggle_visibility; 3609 $self->{other}->toggle_visibility;
3412} 3610}
3413 3611
3414############################################################################# 3612#############################################################################
3415 3613
3416package CFPlus::UI::Tooltip; 3614package DC::UI::Tooltip;
3417 3615
3418our @ISA = CFPlus::UI::Bin::; 3616our @ISA = DC::UI::Bin::;
3419 3617
3420use CFPlus::OpenGL; 3618use DC::OpenGL;
3421 3619
3422sub new { 3620sub new {
3423 my $class = shift; 3621 my $class = shift;
3424 3622
3425 $class->SUPER::new ( 3623 $class->SUPER::new (
… …
3429} 3627}
3430 3628
3431sub set_tooltip_from { 3629sub set_tooltip_from {
3432 my ($self, $widget) = @_; 3630 my ($self, $widget) = @_;
3433 3631
3434 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3435 if $widget->{tooltip} =~ /^#(.*)$/;
3436
3437 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 =~ /^#(.*)$/;
3438 3637
3439 if ($ENV{CFPLUS_DEBUG} & 2) { 3638 if ($ENV{CFPLUS_DEBUG} & 2) {
3440 $tooltip .= "\n\n" . (ref $widget) . "\n" 3639 $tip .= "\n\n" . (ref $widget) . "\n"
3441 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3640 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3442 . "req $widget->{req_w} $widget->{req_h}\n" 3641 . "req $widget->{req_w} $widget->{req_h}\n"
3443 . "visible $widget->{visible}"; 3642 . "visible $widget->{visible}";
3444 } 3643 }
3445 3644
3446 $tooltip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
3447 $tooltip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
3448 3647
3449 $self->add (new CFPlus::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
3450 markup => $tooltip, 3650 markup => $tip,
3451 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3652 align => 0,
3452 fontsize => 0.8, 3653 fontsize => 0.8,
3453 style => 1, # FLAG_INVERSE 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3454 ellipsise => 0, 3655 ellipsise => 0,
3455 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
3456 ); 3657 );
3457} 3658}
3458 3659
… …
3493} 3694}
3494 3695
3495sub _draw { 3696sub _draw {
3496 my ($self) = @_; 3697 my ($self) = @_;
3497 3698
3498 glTranslate 0.375, 0.375;
3499
3500 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
3501 3700
3502 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
3503 glRect 0, 0, $w, $h; 3702 glRect 0, 0, $w, $h;
3504 3703
3505 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
3506 glBegin GL_LINE_LOOP; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
3507 glVertex 0 , 0;
3508 glVertex 0 , $h;
3509 glVertex $w, $h;
3510 glVertex $w, 0;
3511 glEnd;
3512 3706
3513 glTranslate 2 - 0.375, 2 - 0.375; 3707 glTranslate 2, 2;
3514 3708
3515 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
3516} 3710}
3517 3711
3518############################################################################# 3712#############################################################################
3519 3713
3520package CFPlus::UI::Face; 3714package DC::UI::Face;
3521 3715
3522our @ISA = CFPlus::UI::DrawBG::; 3716our @ISA = DC::UI::DrawBG::;
3523 3717
3524use CFPlus::OpenGL; 3718use DC::OpenGL;
3525 3719
3526sub new { 3720sub new {
3527 my $class = shift; 3721 my $class = shift;
3528 3722
3529 my $self = $class->SUPER::new ( 3723 my $self = $class->SUPER::new (
… …
3533 can_events => 0, 3727 can_events => 0,
3534 @_, 3728 @_,
3535 ); 3729 );
3536 3730
3537 if ($self->{anim} && $self->{animspeed}) { 3731 if ($self->{anim} && $self->{animspeed}) {
3538 CFPlus::weaken (my $widget = $self); 3732 DC::weaken (my $widget = $self);
3539 3733
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3734 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3735 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3542 $self->{timer} = Event->timer (
3543 parked => 1,
3544 cb => sub {
3545 return unless $::CONN && $widget; 3736 return unless $::CONN;
3546 3737
3738 my $w = $widget
3739 or return;
3740
3547 ++$widget->{frame}; 3741 ++$w->{frame};
3548 $widget->update_face; 3742 $w->update_face;
3743
3744 # somehow, $widget can go away
3549 $widget->update; 3745 $w->update;
3550
3551 $widget->update_timer; 3746 $w->update_timer;
3552 },
3553 ); 3747 };
3554 3748
3555 $self->update_face; 3749 $self->update_face;
3556 $self->update_timer; 3750 $self->update_timer;
3557 } 3751 }
3558 3752
… …
3563 my ($self) = @_; 3757 my ($self) = @_;
3564 3758
3565 return unless $self->{timer}; 3759 return unless $self->{timer};
3566 3760
3567 if ($self->{visible}) { 3761 if ($self->{visible}) {
3568 $self->{timer}->at (
3569 $self->{anim_start}
3570 + $self->{animspeed}
3571 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572 );
3573 $self->{timer}->start; 3762 $self->{timer}->start;
3574 } else { 3763 } else {
3575 $self->{timer}->stop; 3764 $self->{timer}->stop;
3576 } 3765 }
3577} 3766}
3578 3767
3579sub update_face { 3768sub update_face {
3580 my ($self) = @_; 3769 my ($self) = @_;
3581 3770
3582 return unless $::CONN; 3771 if ($::CONN) {
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3772 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) { 3773 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3774 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3775 delete $self->{face_change_cb};
3776
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3777 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3778 unless ($tex->{name} || $tex->{loading}) {
3779 $tex->upload (sub { $self->reconfigure });
3780 }
3781 }
3782 }
3589 } 3783 }
3590 } 3784 }
3591} 3785}
3592 3786
3593sub size_request { 3787sub size_request {
3594 my ($self) = @_; 3788 my ($self) = @_;
3595 3789
3596 if ($::CONN) { 3790 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3791 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) { 3792 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex; 3793 if ($tex->{name}) {
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3794 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else { 3795 } elsif (!$tex->{loading}) {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3796 $tex->upload (sub { $self->reconfigure });
3603 $self->realloc;
3604 }); 3797 }
3605 } 3798 }
3799
3800 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3606 } 3801 }
3607 } 3802 }
3608 3803
3609 ($self->{size_w} || 8, $self->{size_h} || 8) 3804 ($self->{size_w} || 8, $self->{size_h} || 8)
3610} 3805}
… …
3648 $self->SUPER::destroy; 3843 $self->SUPER::destroy;
3649} 3844}
3650 3845
3651############################################################################# 3846#############################################################################
3652 3847
3653package CFPlus::UI::Buttonbar; 3848package DC::UI::Buttonbar;
3654 3849
3655our @ISA = CFPlus::UI::HBox::; 3850our @ISA = DC::UI::HBox::;
3656 3851
3657# TODO: should actually wrap buttons and other goodies. 3852# TODO: should actually wrap buttons and other goodies.
3658 3853
3659############################################################################# 3854#############################################################################
3660 3855
3661package CFPlus::UI::Menu; 3856package DC::UI::Menu;
3662 3857
3663our @ISA = CFPlus::UI::Toplevel::; 3858our @ISA = DC::UI::Toplevel::;
3664 3859
3665use CFPlus::OpenGL; 3860use DC::OpenGL;
3666 3861
3667sub new { 3862sub new {
3668 my $class = shift; 3863 my $class = shift;
3669 3864
3670 my $self = $class->SUPER::new ( 3865 my $self = $class->SUPER::new (
3671 items => [], 3866 items => [],
3672 z => 100, 3867 z => 100,
3673 @_, 3868 @_,
3674 ); 3869 );
3675 3870
3676 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3871 $self->add ($self->{vbox} = new DC::UI::VBox);
3677 3872
3678 for my $item (@{ $self->{items} }) { 3873 for my $item (@{ $self->{items} }) {
3679 my ($widget, $cb, $tooltip) = @$item; 3874 my ($widget, $cb, $tooltip) = @$item;
3680 3875
3681 # handle various types of items, only text for now 3876 # handle various types of items, only text for now
3682 if (!ref $widget) { 3877 if (!ref $widget) {
3683 if ($widget =~ /\t/) { 3878 if ($widget =~ /\t/) {
3684 my ($left, $right) = split /\t/, $widget, 2; 3879 my ($left, $right) = split /\t/, $widget, 2;
3685 3880
3686 $widget = new CFPlus::UI::HBox 3881 $widget = new DC::UI::HBox
3687 can_hover => 1, 3882 can_hover => 1,
3688 can_events => 1, 3883 can_events => 1,
3689 tooltip => $tooltip, 3884 tooltip => $tooltip,
3690 children => [ 3885 children => [
3691 (new CFPlus::UI::Label markup => $left, expand => 1), 3886 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3692 (new CFPlus::UI::Label markup => $right, align => +1), 3887 (new DC::UI::Label markup => $right, align => 1),
3693 ], 3888 ],
3694 ; 3889 ;
3695 3890
3696 } else { 3891 } else {
3697 $widget = new CFPlus::UI::Label 3892 $widget = new DC::UI::Label
3698 can_hover => 1, 3893 can_hover => 1,
3699 can_events => 1, 3894 can_events => 1,
3895 align => 0,
3700 markup => $widget, 3896 markup => $widget,
3701 tooltip => $tooltip; 3897 tooltip => $tooltip;
3702 } 3898 }
3703 } 3899 }
3704 3900
… …
3719 # maybe save $GRAB? must be careful about events... 3915 # maybe save $GRAB? must be careful about events...
3720 $GRAB = $self; 3916 $GRAB = $self;
3721 $self->{button} = $ev->{button}; 3917 $self->{button} = $ev->{button};
3722 3918
3723 $self->show; 3919 $self->show;
3724 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3920
3921 my $x = $ev->{x};
3922 my $y = $ev->{y};
3923
3924 $self->{root}->on_post_alloc ($self => sub {
3925 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3926 });
3927
3928 1 # so it can be used inside event handlers
3725} 3929}
3726 3930
3727sub invoke_mouse_motion { 3931sub invoke_mouse_motion {
3728 my ($self, $ev, $x, $y) = @_; 3932 my ($self, $ev, $x, $y) = @_;
3729 3933
… …
3750 1 3954 1
3751} 3955}
3752 3956
3753############################################################################# 3957#############################################################################
3754 3958
3755package CFPlus::UI::Multiplexer; 3959package DC::UI::Multiplexer;
3756 3960
3757our @ISA = CFPlus::UI::Container::; 3961our @ISA = DC::UI::Container::;
3758 3962
3759sub new { 3963sub new {
3760 my $class = shift; 3964 my $class = shift;
3761 3965
3762 my $self = $class->SUPER::new ( 3966 my $self = $class->SUPER::new (
3763 @_, 3967 @_,
3764 ); 3968 );
3765 3969
3766 $self->{current} = $self->{children}[0] 3970 $self->set_current_page (0);
3767 if @{ $self->{children} };
3768 3971
3769 $self 3972 $self
3770} 3973}
3771 3974
3772sub add { 3975sub add {
3773 my ($self, @widgets) = @_; 3976 my ($self, @widgets) = @_;
3774 3977
3775 $self->SUPER::add (@widgets); 3978 $self->SUPER::add (@widgets);
3776 3979
3777 $self->{current} = $self->{children}[0] 3980 $self->set_current_page (0)
3778 if @{ $self->{children} }; 3981 if @widgets == @{ $self->{children} };
3779} 3982}
3780 3983
3781sub get_current_page { 3984sub get_current_page {
3782 my ($self) = @_; 3985 my ($self) = @_;
3783 3986
… …
3789 3992
3790 my $widget = ref $page_or_widget 3993 my $widget = ref $page_or_widget
3791 ? $page_or_widget 3994 ? $page_or_widget
3792 : $self->{children}[$page_or_widget]; 3995 : $self->{children}[$page_or_widget];
3793 3996
3997 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3998
3794 $self->{current} = $widget; 3999 if (($self->{current} = $widget)) {
4000 $self->{current}->set_visible if $self->{current} && $self->{visible};
3795 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4001 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3796 4002
3797 $self->emit (page_changed => $self->{current}); 4003 $self->emit (page_changed => $self->{current});
4004 }
3798 4005
3799 $self->realloc; 4006 $self->realloc;
3800} 4007}
3801 4008
3802sub visible_children { 4009sub visible_children {
3803 $_[0]{current} 4010 $_[0]{current} || ()
3804} 4011}
3805 4012
3806sub size_request { 4013sub size_request {
3807 my ($self) = @_; 4014 my ($self) = @_;
3808 4015
4016 $self->{current}
3809 $self->{current}->size_request 4017 ? $self->{current}->size_request
4018 : (0, 0)
3810} 4019}
3811 4020
3812sub invoke_size_allocate { 4021sub invoke_size_allocate {
3813 my ($self, $w, $h) = @_; 4022 my ($self, $w, $h) = @_;
3814 4023
3815 $self->{current}->configure (0, 0, $w, $h); 4024 $self->{current}->configure (0, 0, $w, $h)
4025 if $self->{current};
3816 4026
3817 1 4027 1
3818} 4028}
3819 4029
3820sub _draw { 4030sub _draw {
3821 my ($self) = @_; 4031 my ($self) = @_;
3822 4032
3823 $self->{current}->draw; 4033 $self->{current}->draw
4034 if $self->{current};
3824} 4035}
3825 4036
3826############################################################################# 4037#############################################################################
3827 4038
3828package CFPlus::UI::Notebook; 4039package DC::UI::Notebook;
3829 4040
4041use DC::OpenGL;
4042
3830our @ISA = CFPlus::UI::VBox::; 4043our @ISA = DC::UI::VBox::;
3831 4044
3832sub new { 4045sub new {
3833 my $class = shift; 4046 my $class = shift;
3834 4047
3835 my $self = $class->SUPER::new ( 4048 my $self = $class->SUPER::new (
3836 buttonbar => (new CFPlus::UI::Buttonbar), 4049 buttonbar => (new DC::UI::Buttonbar),
3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4050 multiplexer => (new DC::UI::Multiplexer expand => 1),
4051 active_outline => [.7, .7, 0.2],
3838 # filter => # will be put between multiplexer and $self 4052 # filter => # will be put between multiplexer and $self
3839 @_, 4053 @_,
3840 ); 4054 );
3841 4055
3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3850 4064
3851 for my $child (@$widgets) { 4065 for my $child (@$widgets) {
3852 Scalar::Util::weaken $child; 4066 Scalar::Util::weaken $child;
3853 $child->{c_tab_} ||= do { 4067 $child->{c_tab_} ||= do {
3854 my $tab = 4068 my $tab =
3855 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4069 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
3856 ? $child->{c_tab} 4070 ? $child->{c_tab}
3857 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4071 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858 4072
3859 $tab->connect (activate => sub { 4073 $tab->connect (activate => sub {
3860 $wself->set_current_page ($child); 4074 $wself->set_current_page ($child);
3861 }); 4075 });
3862 4076
… …
3894sub pages { 4108sub pages {
3895 my ($self) = @_; 4109 my ($self) = @_;
3896 $self->{multiplexer}->children 4110 $self->{multiplexer}->children
3897} 4111}
3898 4112
4113sub page_index {
4114 my ($self, $widget) = @_;
4115
4116 my $i = 0;
4117 for ($self->pages) {
4118 if ($_ eq $widget) { return $i };
4119 $i++;
4120 }
4121
4122 undef
4123}
4124
3899sub add_tab { 4125sub add_tab {
3900 my ($self, $title, $widget, $tooltip) = @_; 4126 my ($self, $title, $widget, $tooltip) = @_;
3901 4127
3902 $title = [$title, $tooltip] unless ref $title; 4128 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title; 4129 $widget->{c_tab} = $title;
… …
3916 4142
3917 $self->{multiplexer}->set_current_page ($page); 4143 $self->{multiplexer}->set_current_page ($page);
3918 $self->emit (page_changed => $self->{multiplexer}{current}); 4144 $self->emit (page_changed => $self->{multiplexer}{current});
3919} 4145}
3920 4146
4147sub _draw {
4148 my ($self) = @_;
4149
4150 $self->SUPER::_draw ();
4151
4152 if (my $cur = $self->{multiplexer}{current}) {
4153 if ($cur = $cur->{c_tab_}) {
4154 glTranslate $self->{buttonbar}{x} + $cur->{x},
4155 $self->{buttonbar}{y} + $cur->{y};
4156 glLineWidth 3;
4157 #glEnable GL_BLEND;
4158 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4159 glColor @{$self->{active_outline}};
4160 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4161 glLineWidth 1;
4162 #glDisable GL_BLEND;
4163 }
4164 }
4165}
4166
3921############################################################################# 4167#############################################################################
3922 4168
3923package CFPlus::UI::Selector; 4169package DC::UI::Selector;
3924 4170
3925use utf8; 4171use utf8;
3926 4172
3927our @ISA = CFPlus::UI::Button::; 4173our @ISA = DC::UI::Button::;
3928 4174
3929sub new { 4175sub new {
3930 my $class = shift; 4176 my $class = shift;
3931 4177
3932 my $self = $class->SUPER::new ( 4178 my $self = $class->SUPER::new (
… …
3949 my ($value, $title, $tooltip) = @$_; 4195 my ($value, $title, $tooltip) = @$_;
3950 4196
3951 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4197 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3952 } 4198 }
3953 4199
3954 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4200 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3955} 4201}
3956 4202
3957sub _set_value { 4203sub _set_value {
3958 my ($self, $value) = @_; 4204 my ($self, $value) = @_;
3959 4205
3960 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4206 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4207 $item ||= $self->{options}[0]
3961 or return; 4208 or return;
3962 4209
3963 $self->{value} = $item->[0]; 4210 $self->{value} = $item->[0];
3964 $self->set_markup ("$item->[1] ⇓"); 4211 $self->set_markup ("$item->[1] ⇓");
3965 $self->set_tooltip ($item->[2]); 4212# $self->set_tooltip ($item->[2]);
3966} 4213}
3967 4214
3968sub set_value { 4215sub set_value {
3969 my ($self, $value) = @_; 4216 my ($self, $value) = @_;
3970 4217
… …
3972 4219
3973 $self->_set_value ($value); 4220 $self->_set_value ($value);
3974 $self->emit (changed => $value); 4221 $self->emit (changed => $value);
3975} 4222}
3976 4223
4224sub set_options {
4225 my ($self, $options) = @_;
4226
4227 $self->{options} = $options;
4228 $self->_set_value ($self->{value});
4229}
4230
3977############################################################################# 4231#############################################################################
3978 4232
3979package CFPlus::UI::Statusbox; 4233package DC::UI::Statusbox;
3980 4234
3981our @ISA = CFPlus::UI::VBox::; 4235our @ISA = DC::UI::VBox::;
3982 4236
3983sub new { 4237sub new {
3984 my $class = shift; 4238 my $class = shift;
3985 4239
3986 my $self = $class->SUPER::new ( 4240 my $self = $class->SUPER::new (
3987 fontsize => 0.8, 4241 fontsize => 0.8,
3988 @_, 4242 @_,
3989 ); 4243 );
3990 4244
3991 CFPlus::weaken (my $this = $self); 4245 DC::weaken (my $this = $self);
3992 4246
3993 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4247 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3994 4248
3995 $self 4249 $self
3996} 4250}
3997 4251
3998sub reorder { 4252sub reorder {
3999 my ($self) = @_; 4253 my ($self) = @_;
4000 my $NOW = Time::HiRes::time; 4254 my $NOW = EV::time;
4001 4255
4002 # freeze display when hovering over any label 4256 # freeze display when hovering over any label
4003 return if $CFPlus::UI::TOOLTIP->{owner} 4257 return if $DC::UI::TOOLTIP->{owner}
4004 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4258 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4005 values %{ $self->{item} }; 4259 values %{ $self->{item} };
4006 4260
4007 while (my ($k, $v) = each %{ $self->{item} }) { 4261 while (my ($k, $v) = each %{ $self->{item} }) {
4008 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4262 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4009 } 4263 }
4264
4265 $self->{timer}->set (1, 1);
4010 4266
4011 my @widgets; 4267 my @widgets;
4012 4268
4013 my @items = sort { 4269 my @items = sort {
4014 $a->{pri} <=> $b->{pri} 4270 $a->{pri} <=> $b->{pri}
4015 or $b->{id} <=> $a->{id} 4271 or $b->{id} <=> $a->{id}
4016 } values %{ $self->{item} }; 4272 } values %{ $self->{item} };
4017
4018 $self->{timer}->interval (1);
4019 4273
4020 my $count = 10 + 1; 4274 my $count = 10 + 1;
4021 for my $item (@items) { 4275 for my $item (@items) {
4022 last unless --$count; 4276 last unless --$count;
4023 4277
… …
4030 for ($short) { 4284 for ($short) {
4031 s/^\s+//; 4285 s/^\s+//;
4032 s/\s+/ /g; 4286 s/\s+/ /g;
4033 } 4287 }
4034 4288
4035 new CFPlus::UI::Label 4289 new DC::UI::Label
4036 markup => $short, 4290 markup => $short,
4037 tooltip => $item->{tooltip}, 4291 tooltip => $item->{tooltip},
4038 tooltip_font => $::FONT_PROP, 4292 tooltip_font => $::FONT_PROP,
4039 tooltip_width => 0.67, 4293 tooltip_width => 0.67,
4040 fontsize => $item->{fontsize} || $self->{fontsize}, 4294 fontsize => $item->{fontsize} || $self->{fontsize},
4041 max_w => $::WIDTH * 0.44, 4295 max_w => $::WIDTH * 0.44,
4296 align => 0,
4042 fg => [@{ $item->{fg} }], 4297 fg => [@{ $item->{fg} }],
4043 can_events => 1, 4298 can_events => 1,
4044 can_hover => 1 4299 can_hover => 1
4045 }; 4300 };
4046 4301
4047 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4302 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4048 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4303 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4049 $label->update; 4304 $label->update;
4050 $label->set_max_size (undef, $label->{req_h} * $diff) 4305 $label->set_max_size (undef, $label->{req_h} * $diff)
4051 if $diff < 1; 4306 if $diff < 1;
4052 $self->{timer}->interval (1/30); 4307 $self->{timer}->set (1/30, 1/30);
4053 } else { 4308 } else {
4054 $label->{fg}[3] = $item->{fg}[3] || 1; 4309 $label->{fg}[3] = $item->{fg}[3] || 1;
4055 } 4310 }
4056 4311
4057 push @widgets, $label; 4312 push @widgets, $label;
4058 } 4313 }
4314
4315 my $hash = join ",", @widgets;
4316 return if $hash eq $self->{last_widget_hash};
4317 $self->{last_widget_hash} = $hash;
4059 4318
4060 $self->clear; 4319 $self->clear;
4061 $self->SUPER::add (reverse @widgets); 4320 $self->SUPER::add (reverse @widgets);
4062} 4321}
4063 4322
… …
4119 $self->SUPER::destroy; 4378 $self->SUPER::destroy;
4120} 4379}
4121 4380
4122############################################################################# 4381#############################################################################
4123 4382
4124package CFPlus::UI::Root; 4383package DC::UI::Root;
4125 4384
4126our @ISA = CFPlus::UI::Container::; 4385our @ISA = DC::UI::Container::;
4127 4386
4128use List::Util qw(min max); 4387use List::Util qw(min max);
4129 4388
4130use CFPlus::OpenGL; 4389use DC::OpenGL;
4131 4390
4132sub new { 4391sub new {
4133 my $class = shift; 4392 my $class = shift;
4134 4393
4135 my $self = $class->SUPER::new ( 4394 my $self = $class->SUPER::new (
4136 visible => 1, 4395 visible => 1,
4137 @_, 4396 @_,
4138 ); 4397 );
4139 4398
4140 CFPlus::weaken ($self->{root} = $self); 4399 DC::weaken ($self->{root} = $self);
4141 4400
4142 $self 4401 $self
4143} 4402}
4144 4403
4145sub size_request { 4404sub size_request {
… …
4193} 4452}
4194 4453
4195sub update { 4454sub update {
4196 my ($self) = @_; 4455 my ($self) = @_;
4197 4456
4198 $::WANT_REFRESH++; 4457 $::WANT_REFRESH = 1;
4199} 4458}
4200 4459
4201sub add { 4460sub add {
4202 my ($self, @children) = @_; 4461 my ($self, @children) = @_;
4203 4462
… …
4270 4529
4271 delete $queue{$widget+0}; 4530 delete $queue{$widget+0};
4272 4531
4273 my ($w, $h) = $widget->size_request; 4532 my ($w, $h) = $widget->size_request;
4274 4533
4275 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4534 $w += $widget->{padding_x} * 2;
4276 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4535 $h += $widget->{padding_y} * 2;
4536
4537 $w = max $widget->{min_w}, $w;
4538 $h = max $widget->{min_h}, $h;
4277 4539
4278 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4540 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4279 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4541 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4280 4542
4281 $w = $widget->{force_w} if exists $widget->{force_w}; 4543 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4348 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4610 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4349 glMatrixMode GL_MODELVIEW; 4611 glMatrixMode GL_MODELVIEW;
4350 glLoadIdentity; 4612 glLoadIdentity;
4351 4613
4352 { 4614 {
4353 package CFPlus::UI::Base; 4615 package DC::UI::Base;
4354 4616
4355 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4617 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4356 (0, 0, $self->{w}, $self->{h}); 4618 (0, 0, $self->{w}, $self->{h});
4357 4619
4358 $self->_draw; 4620 $self->_draw;
4359 } 4621 }
4360} 4622}
4361 4623
4362############################################################################# 4624#############################################################################
4363 4625
4364package CFPlus::UI; 4626package DC::UI;
4365 4627
4366$ROOT = new CFPlus::UI::Root; 4628$ROOT = new DC::UI::Root;
4367$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4629$TOOLTIP = new DC::UI::Tooltip z => 900;
4368 4630
43691 46311
4370

Diff Legend

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