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.399 by root, Sat Jul 21 16:07:53 2007 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 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 { __widget_ref__ => $_[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) = @_;
… …
593 616
594# using global variables seems a bit hacky, but passing through all drawing 617# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 618# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 619our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 620
598sub draw { 621#sub draw {
599 my ($self) = @_; 622#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 623
645sub _draw { 624sub _draw {
646 my ($self) = @_; 625 my ($self) = @_;
647 626
648 warn "no draw defined for $self\n"; 627 warn "no draw defined for $self\n";
649} 628}
650 629
651my $cntx;#d#
652sub DESTROY { 630sub DESTROY {
653 my ($self) = @_; 631 my ($self) = @_;
654 632
655 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
656 634
635 local $@;
657 eval { $self->destroy }; 636 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 638
660 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
661} 640}
662 641
663############################################################################# 642#############################################################################
664 643
665package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
666 645
667our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
668 647
669use strict; 648use strict;
670use CFPlus::OpenGL; 649use DC::OpenGL;
671 650
672sub new { 651sub new {
673 my $class = shift; 652 my $class = shift;
674
675 # range [value, low, high, page]
676 653
677 $class->SUPER::new ( 654 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
680 @_ 657 @_
681 ) 658 )
682} 659}
683 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
684sub _draw { 668sub _draw {
685 my ($self) = @_; 669 my ($self) = @_;
686 670
687 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self && $self->{active_bg}
688 ? $self->{active_bg} 672 ? $self->{active_bg}
… …
692 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
693 677
694 glEnable GL_BLEND; 678 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 680 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 682 glDisable GL_BLEND;
706 } 683 }
707} 684}
708 685
709############################################################################# 686#############################################################################
710 687
711package CFPlus::UI::Empty; 688package DC::UI::Empty;
712 689
713our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
714 691
715sub new { 692sub new {
716 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
717 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
718} 695}
… …
725 702
726sub draw { } 703sub draw { }
727 704
728############################################################################# 705#############################################################################
729 706
730package CFPlus::UI::Container; 707package DC::UI::Container;
731 708
732our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
733 710
734sub new { 711sub new {
735 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
736 713
737 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
770 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
771 ]; 748 ];
772 749
773 $self->realloc; 750 $self->realloc;
774 751
752 $self->emit (c_add => \@widgets);
753
775 map $_+0, @widgets 754 map $_+0, @widgets
776} 755}
777 756
778sub children { 757sub children {
779 @{ $_[0]{children} } 758 @{ $_[0]{children} }
780} 759}
781 760
782sub remove { 761sub remove {
783 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
784 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
785 delete $child->{parent}; 767 delete $child->{parent};
786 $child->hide; 768 $child->hide;
787
788 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
789 771
790 $self->realloc; 772 $self->realloc;
791} 773}
792 774
793sub clear { 775sub clear {
… …
821} 803}
822 804
823sub _draw { 805sub _draw {
824 my ($self) = @_; 806 my ($self) = @_;
825 807
826 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
827} 809}
828 810
829############################################################################# 811#############################################################################
830 812
831package CFPlus::UI::Bin; 813package DC::UI::Bin;
832 814
833our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
834 816
835sub new { 817sub new {
836 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
837 819
838 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
839 821
840 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
841} 823}
842 824
843sub add { 825sub add {
844 my ($self, $child) = @_; 826 my ($self, $child) = @_;
845 827
846 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
847 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
848} 830}
849 831
850sub remove { 832sub remove {
851 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
852 834
853 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
854 836
855 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
856 unless @{$self->{children}}; 838 unless @{$self->{children}};
857} 839}
858 840
859sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
860 842
… …
869 851
870 1 852 1
871} 853}
872 854
873############################################################################# 855#############################################################################
874
875# back-buffered drawing area 856# back-buffered drawing area
876 857
877package CFPlus::UI::Window; 858package DC::UI::Window;
878 859
879our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
880 861
881use CFPlus::OpenGL; 862use DC::OpenGL;
882 863
883sub new { 864sub new {
884 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
885 866
886 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
908} 889}
909 890
910sub render_child { 891sub render_child {
911 my ($self) = @_; 892 my ($self) = @_;
912 893
913 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 894 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
914 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
915 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
916 897
917 { 898 {
918 package CFPlus::UI::Base; 899 package DC::UI::Base;
919 900
920 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
921 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
922 903
923 $self->_render; 904 $self->_render;
… …
940 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
941} 922}
942 923
943############################################################################# 924#############################################################################
944 925
945package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
946 927
947use List::Util qw(min max); 928use List::Util qw(min max);
948 929
949our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
950 931
951sub new { 932sub new {
952 my $class = shift; 933 my $class = shift;
953 934
954 $class->SUPER::new ( 935 $class->SUPER::new (
… …
996 $self->emit (changed => $x, $y); 977 $self->emit (changed => $x, $y);
997 $self->update; 978 $self->update;
998 } 979 }
999} 980}
1000 981
982sub set_center {
983 my ($self, $x, $y) = @_;
984
985 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
986}
987
988sub make_visible {
989 my ($self, $x, $y, $border) = @_;
990
991 if ( $x < $self->{view_x} + $self->{w} * $border
992 || $x > $self->{view_x} + $self->{w} * (1 - $border)
993 || $y < $self->{view_y} + $self->{h} * $border
994 || $y > $self->{view_y} + $self->{h} * (1 - $border)
995 ) {
996 $self->set_center ($x, $y);
997 }
998}
999
1001# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
1002sub coord2local { 1001sub coord2local {
1003 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
1004 1003
1005 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1004 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1022 ) { 1021 ) {
1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1024 } else { 1023 } else {
1025 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1026 } 1025 }
1027} 1026}
1028 1027
1029sub _render { 1028sub _render {
1030 my ($self) = @_; 1029 my ($self) = @_;
1031 1030
1032 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1031 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1033 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1032 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1034 1033
1035 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1036 1035
1037 $self->SUPER::_render; 1036 $self->SUPER::_render;
1038} 1037}
1039 1038
1040############################################################################# 1039#############################################################################
1041 1040
1042package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1043 1042
1044our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1045 1044
1046sub new { 1045sub new {
1047 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1048 1047
1049 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1050 1049
1051 my $self; 1050 my $self;
1052 1051
1053 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1054 col => 0, 1053 c_col => 0,
1055 row => 1, 1054 c_row => 1,
1056 vertical => 0, 1055 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1057 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1060 },
1062 ; 1061 ;
1063 1062
1064 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1065 col => 1, 1064 c_col => 1,
1066 row => 0, 1065 c_row => 0,
1067 vertical => 1, 1066 vertical => 1,
1068 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1069 on_changed => sub { 1068 on_changed => sub {
1070 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1081 col_expand => [1, 0], 1080 col_expand => [1, 0],
1082 row_expand => [1, 0], 1081 row_expand => [1, 0],
1083 %arg, 1082 %arg,
1084 ); 1083 );
1085 1084
1086 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new DC::UI::ViewPort
1087 col => 0, 1086 c_col => 0,
1088 row => 0, 1087 c_row => 0,
1089 expand => 1, 1088 expand => 1,
1090 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1092 on_changed => sub { 1091 on_changed => sub {
1093 my ($vp, $x, $y) = @_; 1092 my ($vp, $x, $y) = @_;
… …
1095 $vp->{parent}{hslider}->set_value ($x); 1094 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y); 1095 $vp->{parent}{vslider}->set_value ($y);
1097 1096
1098 0 1097 0
1099 }, 1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1100 ; 1104 ;
1101 1105
1102 $self->SUPER::add ($self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1103 1107
1104 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
… …
1110 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1111 1115
1112 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1113} 1117}
1114 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
1115sub update_slider { 1123sub update_slider {
1116 my ($self) = @_; 1124 my ($self) = @_;
1117 1125
1118 my $child = ($self->{vp} or return)->child; 1126 my $child = ($self->{vp} or return)->child;
1119 1127
1128 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1129 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1130 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1131
1123 my $visible = $w1 > $w2; 1132 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) { 1133 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible; 1134 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider}) 1135 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider}); 1136 : $self->SUPER::remove ($self->{hslider});
1137 }
1128 } 1138 }
1129 1139
1140 if ($self->{scroll_y}) {
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1141 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1142 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132 1143
1133 my $visible = $h1 > $h2; 1144 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) { 1145 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible; 1146 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider}) 1147 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider}); 1148 : $self->SUPER::remove ($self->{vslider});
1149 }
1138 } 1150 }
1139} 1151}
1140 1152
1141sub start_dragging { 1153sub start_dragging {
1142 my ($self, $ev) = @_; 1154 my ($self, $ev) = @_;
… …
1204 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1205} 1217}
1206 1218
1207############################################################################# 1219#############################################################################
1208 1220
1209package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1210 1222
1211our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1212 1224
1213use CFPlus::OpenGL; 1225use DC::OpenGL;
1214 1226
1215sub new { 1227sub new {
1216 my $class = shift; 1228 my $class = shift;
1217 1229
1218 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1228 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1229 1241
1230 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1232 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1233
1234 glBegin GL_QUADS;
1235 glVertex 0 , 0;
1236 glVertex 0 , $h;
1237 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1238 glVertex $w, 0;
1239 glEnd;
1240
1241 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1242 } 1247 }
1243 1248
1244 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1245} 1250}
1246 1251
1247############################################################################# 1252#############################################################################
1248 1253
1249package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1250 1255
1251our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1252 1257
1253use CFPlus::OpenGL; 1258use DC::OpenGL;
1254 1259
1255sub new { 1260sub new {
1256 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1257 1262
1258 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1259 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1260 align => 1, 1265 align => 1,
1261 valign => 0, 1266 valign => 0.5,
1262 text => $arg{label}, 1267 text => $arg{label},
1263 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1264 } 1269 }
1265 1270
1266 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1267 # label => "", 1272 # label => "",
1268 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1269 border => 0.8, 1274 border => 0.8,
1270 style => 'single', 1275 style => 'single',
1271 %arg, 1276 %arg,
1272 ); 1277 );
1273 1278
… …
1276 1281
1277sub add { 1282sub add {
1278 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1279 1284
1280 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1282} 1287}
1283 1288
1284sub border { 1289sub border {
1285 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1286} 1291}
… …
1326 my $border = $self->border; 1331 my $border = $self->border;
1327 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1328 1333
1329 $child->draw; 1334 $child->draw;
1330 1335
1331 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1332 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1333 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1334 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1336 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1344 } 1349 }
1345} 1350}
1346 1351
1347############################################################################# 1352#############################################################################
1348 1353
1349package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1350 1355
1351our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1352 1357
1353use CFPlus::OpenGL; 1358use DC::OpenGL;
1354 1359
1355my $bg = 1360my $bg =
1356 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1357 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1358 1363
1359my @border = 1364my @border =
1360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1361 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1366 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1362 1367
1363my @icon = 1368my @icon =
1364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1365 qw(x1_move.png x1_resize.png); 1370 qw(x1_move.png x1_resize.png);
1366 1371
1367sub new { 1372sub new {
1368 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1369 1374
1370 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1371 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1372 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1373 border => 0.6, 1378 border => 0.8,
1374 can_events => 1, 1379 can_events => 1,
1375 min_w => 64, 1380 min_w => 64,
1376 min_h => 32, 1381 min_h => 32,
1377 %arg, 1382 %arg,
1378 ); 1383 );
1379 1384
1380 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1381 align => 0, 1386 align => 0.5,
1382 valign => 1, 1387 valign => 1,
1383 text => $self->{title}, 1388 text => $self->{title},
1384 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1385 if exists $self->{title}; 1390 if exists $self->{title};
1386 1391
1387 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1388 $self->{close_button} = 1393 $self->{close_button} =
1389 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1390 path => 'x1_close.png', 1395 path => 'x1_close.png',
1391 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1392 1397
1393 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1394 } 1399 }
1395 1400
1396 $self 1401 $self
1397} 1402}
1398 1403
1399sub add { 1404sub add {
1400 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1401 1406
1402 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1403 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1404 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1405} 1410}
1406 1411
1407sub border { 1412sub border {
1408 int $_[0]{border} * $::FONTSIZE 1413 int $_[0]{border} * $::FONTSIZE
1414}
1415
1416sub get_max_wh {
1417 my ($self) = @_;
1418
1419 return ($self->{w}, $self->{h})
1420 if $self->{visible} && $self->{w};
1421
1422 $self->SUPER::get_max_wh
1409} 1423}
1410 1424
1411sub size_request { 1425sub size_request {
1412 my ($self) = @_; 1426 my ($self) = @_;
1413 1427
… …
1538 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1539 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1540 1554
1541 my $border = $self->border; 1555 my $border = $self->border;
1542 1556
1557 if ($border) {
1543 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1544 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1545 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1546 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1547 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1548 1563
1549 # move 1564 # move
1550 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1551 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1552 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1555 1570
1556 # resize 1571 # resize
1557 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1559 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1560 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1562 1578
1563 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1564 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1565 1581
1566 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1585 if $self->{close_button}; 1601 if $self->{close_button};
1586} 1602}
1587 1603
1588############################################################################# 1604#############################################################################
1589 1605
1590package CFPlus::UI::Table; 1606package DC::UI::Table;
1591 1607
1592our @ISA = CFPlus::UI::Container::; 1608our @ISA = DC::UI::Container::;
1593 1609
1594use List::Util qw(max sum); 1610use List::Util qw(max sum);
1595 1611
1596use CFPlus::OpenGL; 1612use DC::OpenGL;
1597 1613
1598sub new { 1614sub new {
1599 my $class = shift; 1615 my $class = shift;
1600 1616
1601 $class->SUPER::new ( 1617 $class->SUPER::new (
… …
1607 1623
1608sub add { 1624sub add {
1609 my ($self, @widgets) = @_; 1625 my ($self, @widgets) = @_;
1610 1626
1611 for my $child (@widgets) { 1627 for my $child (@widgets) {
1612 $child->{rowspan} ||= 1; 1628 $child->{c_rowspan} ||= 1;
1613 $child->{colspan} ||= 1; 1629 $child->{c_colspan} ||= 1;
1614 } 1630 }
1615 1631
1616 $self->SUPER::add (@widgets); 1632 $self->SUPER::add (@widgets);
1617} 1633}
1618 1634
… …
1622 my @widgets; 1638 my @widgets;
1623 1639
1624 while (@_) { 1640 while (@_) {
1625 my ($col, $row, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1626 1642
1627 $child->{row} = $row; 1643 $child->{c_row} = $row;
1628 $child->{col} = $col; 1644 $child->{c_col} = $col;
1629 1645
1630 push @widgets, $child; 1646 push @widgets, $child;
1631 } 1647 }
1632 1648
1633 $self->add (@widgets); 1649 $self->add (@widgets);
… …
1639 my (@w, @h); 1655 my (@w, @h);
1640 1656
1641 my @children = $self->children; 1657 my @children = $self->children;
1642 1658
1643 # first pass, columns 1659 # first pass, columns
1644 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1660 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1645 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1661 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1646 1662
1647 my $sw = sum @w[$c .. $c + $cs - 1]; 1663 my $sw = sum @w[$c .. $c + $cs - 1];
1648 1664
1649 if ($w > $sw) { 1665 if ($w > $sw) {
1650 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1666 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1651 } 1667 }
1652 } 1668 }
1653 1669
1654 # second pass, rows 1670 # second pass, rows
1655 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1656 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1657 1673
1658 my $sh = sum @h[$r .. $r + $rs - 1]; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1659 1675
1660 if ($h > $sh) { 1676 if ($h > $sh) {
1661 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1662 } 1678 }
1663 } 1679 }
1664 1680
1665 (\@w, \@h) 1681 (\@w, \@h)
1666} 1682}
… …
1689 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1690 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1691 1707
1692 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1693 1709
1694 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1695 1711
1696 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1697 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1698 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1699 1715
1700 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1701 1717
1702 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1703 1719
1704 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1705 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1706 1722
1707 for my $widget ($self->children) { 1723 for my $widget ($self->children) {
1708 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1724 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1709 1725
1710 $widget->configure ( 1726 $widget->configure (
1711 $x[$c], $y[$r], 1727 $x[$c], $y[$r],
1712 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1713 ); 1729 );
… …
1716 1 1732 1
1717} 1733}
1718 1734
1719############################################################################# 1735#############################################################################
1720 1736
1721package CFPlus::UI::Fixed; 1737package DC::UI::Fixed;
1722 1738
1723use List::Util qw(min max); 1739use List::Util qw(min max);
1724 1740
1725our @ISA = CFPlus::UI::Container::; 1741our @ISA = DC::UI::Container::;
1726
1727sub add {
1728 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1729
1730 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1731 $self->SUPER::add ($child);
1732}
1733 1742
1734sub _scale($$$) { 1743sub _scale($$$) {
1735 my ($mode, $val, $max) = @_; 1744 my ($rel, $val, $max) = @_;
1736 1745
1737 $mode eq "abs" ? $val 1746 $rel ? $val * $max : $val
1738 : $mode eq "rel" ? $val * $max
1739 : 0
1740} 1747}
1741 1748
1742sub size_request { 1749sub size_request {
1743 my ($self) = @_; 1750 my ($self) = @_;
1744 1751
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1752 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746 1753
1747 # determine overall size by querying abs widgets 1754 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) { 1755 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1756 unless ($child->{c_rel}) {
1757 my $x = $child->{c_x};
1758 my $y = $child->{c_y};
1750 1759
1751 if ($pos eq "abs") {
1752 $w = _scale $size, $w, $child->{req_w};
1753 $h = _scale $size, $h, $child->{req_h};
1754
1755 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1756 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1757 } 1762 }
1758 } 1763 }
1759 1764
1760 my $W = $x2 - $x1; 1765 my $W = $x2 - $x1;
1761 my $H = $y2 - $y1; 1766 my $H = $y2 - $y1;
1762 1767
1763 # now layout remaining widgets 1768 # now layout remaining widgets
1764 for my $child ($self->visible_children) { 1769 for my $child ($self->visible_children) {
1765 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1770 if ($child->{c_rel}) {
1771 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1772 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766 1773
1767 if ($pos ne "abs") {
1768 $x = _scale $pos, $x, $W;
1769 $y = _scale $pos, $x, $H;
1770 $w = _scale $size, $w, $child->{req_w};
1771 $h = _scale $size, $h, $child->{req_h};
1772
1773 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1774 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1775 } 1776 }
1776 } 1777 }
1777 1778
1778 my $W = $x2 - $x1; 1779 my $W = $x2 - $x1;
1779 my $H = $y2 - $y1; 1780 my $H = $y2 - $y1;
… …
1783 1784
1784sub invoke_size_allocate { 1785sub invoke_size_allocate {
1785 my ($self, $W, $H) = @_; 1786 my ($self, $W, $H) = @_;
1786 1787
1787 for my $child ($self->visible_children) { 1788 for my $child ($self->visible_children) {
1788 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1789 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1790 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1789 1791
1790 $x = _scale $pos, $x, $W; 1792 $x += $child->{c_halign} * $child->{req_w};
1791 $y = _scale $pos, $x, $H; 1793 $y += $child->{c_valign} * $child->{req_h};
1792 $w = _scale $size, $w, $child->{req_w};
1793 $h = _scale $size, $h, $child->{req_h};
1794 1794
1795 $child->configure ($x, $y, $w, $h); 1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1796 } 1796 }
1797 1797
1798 1 1798 1
1799} 1799}
1800 1800
1801############################################################################# 1801#############################################################################
1802 1802
1803package CFPlus::UI::Box; 1803package DC::UI::Box;
1804 1804
1805our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1806 1806
1807sub size_request { 1807sub size_request {
1808 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1809 1811
1810 $self->{vertical} 1812 $self->{vertical}
1811 ? ( 1813 ? (
1812 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1813 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1814 ) 1816 )
1815 : ( 1817 : (
1816 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1817 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1818 ) 1820 )
1819} 1821}
1820 1822
1821sub invoke_size_allocate { 1823sub invoke_size_allocate {
1822 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1843 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1844 for 0 .. $#children; 1846 for 0 .. $#children;
1845 } 1847 }
1846 } 1848 }
1847 1849
1848 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1849 1851
1850 my $pos = 0; 1852 my $pos = 0;
1851 for (0 .. $#children) { 1853 for (0 .. $#children) {
1852 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1853 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1855 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1858 1 1860 1
1859} 1861}
1860 1862
1861############################################################################# 1863#############################################################################
1862 1864
1863package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1864 1866
1865our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1866 1868
1867sub new { 1869sub new {
1868 my $class = shift; 1870 my $class = shift;
1869 1871
1870 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1873 ) 1875 )
1874} 1876}
1875 1877
1876############################################################################# 1878#############################################################################
1877 1879
1878package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1879 1881
1880our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1881 1883
1882sub new { 1884sub new {
1883 my $class = shift; 1885 my $class = shift;
1884 1886
1885 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1888 ) 1890 )
1889} 1891}
1890 1892
1891############################################################################# 1893#############################################################################
1892 1894
1893package CFPlus::UI::Label; 1895package DC::UI::Label;
1894 1896
1895our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1896 1898
1897use CFPlus::OpenGL; 1899use DC::OpenGL;
1898 1900
1899sub new { 1901sub new {
1900 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1901 1903
1902 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1907 #text => initial text 1909 #text => initial text
1908 #markup => initial narkup 1910 #markup => initial narkup
1909 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1910 #style => 0, # render flags 1912 #style => 0, # render flags
1911 ellipsise => 3, # end 1913 ellipsise => 3, # end
1912 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1913 fontsize => 1, 1915 fontsize => 1,
1914 align => -1, 1916 align => 0.5,
1915 valign => -1, 1917 valign => 0.5,
1916 padding_x => 2, 1918 padding_x => 4,
1917 padding_y => 2, 1919 padding_y => 2,
1918 can_events => 0, 1920 can_events => 0,
1919 %arg 1921 %arg
1920 ); 1922 );
1921 1923
1922 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1923 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1924 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1925 $self->{template} = $layout; 1927 $self->{template} = $layout;
1926 } 1928 }
1927 1929
1928 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1946 1948
1947 delete $self->{ox}; 1949 delete $self->{ox};
1948 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1949} 1951}
1950 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1951sub set_text { 1959sub set_text {
1952 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1953 1961
1954 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1955 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
… …
1978 1986
1979sub size_request { 1987sub size_request {
1980 my ($self) = @_; 1988 my ($self) = @_;
1981 1989
1982 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1983 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1984 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1985 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1986 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1987 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1988 1998
1989 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1990 2000
1991 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1992 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
1993 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
1994 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1995 2005
1996 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1997 2007
1998 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
2054 2064
2055 [$self->{layout}->size] 2065 [$self->{layout}->size]
2056 }; 2066 };
2057 2067
2058 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
2059 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2069 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2060 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2070 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2061 : ($self->{w} - $size->[0]) * 0.5);
2062 2071
2063 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2064 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2065 : ($self->{h} - $size->[1]) * 0.5);
2066 }; 2073 };
2067 2074
2068 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2075# unless ($self->{list}) {
2069 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2076# $self->{list} = DC::OpenGL::glGenList;
2070 2077# DC::OpenGL::glNewList $self->{list};
2071 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2079# DC::OpenGL::glEndList;
2080# }
2081#
2082# DC::OpenGL::glCallList $self->{list};
2083
2084 $self->{layout}->draw;
2072} 2085}
2086
2087#sub destroy {
2088# my ($self) = @_;
2089#
2090# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2091#
2092# $self->SUPER::destroy;
2093#}
2073 2094
2074############################################################################# 2095#############################################################################
2075 2096
2076package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
2077 2098
2078our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
2079 2100
2080use CFPlus::OpenGL; 2101use DC::OpenGL;
2081 2102
2082sub new { 2103sub new {
2083 my $class = shift; 2104 my $class = shift;
2084 2105
2085 $class->SUPER::new ( 2106 $class->SUPER::new (
2086 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2087 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
2088 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
2089 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
2090 can_hover => 1, 2113 can_hover => 1,
2091 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
2092 valign => 0, 2116 valign => 0.5,
2093 can_events => 1, 2117 can_events => 1,
2094 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
2095 #text => ... 2121 #text => ...
2096 #hidden => "*", 2122 #hidden => "*",
2097 @_ 2123 @_
2098 ) 2124 )
2099} 2125}
… …
2146 2172
2147 my $text = $self->get_text; 2173 my $text = $self->get_text;
2148 2174
2149 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2150 2176
2151 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2152 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2153 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2154 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2155 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2156 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2157 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2158 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2159 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2160 # what a hack 2186 # what a hack
2161 $self->{cursor} = 2187 $self->{cursor} =
2162 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2163 ? length $1 2189 ? length $1
2164 : 0; 2190 : 0;
2165 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2166 # uh, again 2192 # uh, again
2167 $self->{cursor} = 2193 $self->{cursor} =
2168 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2169 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2170 : length $self->{text}; 2196 : length $self->{text};
… …
2234 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2235 } 2261 }
2236 2262
2237 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2238 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2239 glBegin GL_QUADS;
2240 glVertex 0 , 0;
2241 glVertex 0 , $self->{h};
2242 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2243 glVertex $self->{w}, 0;
2244 glEnd;
2245 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2246 2267
2247 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2248 2269
2249 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
2251 2272
2252 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
2253 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
2254 utf8::encode $text; 2275 utf8::encode $text;
2255 2276
2256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2277 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2257 } 2278 }
2258 2279
2280 glColor_premultiply @{$self->{active_fg}};
2259 glBegin GL_LINES; 2281 glBegin GL_LINES;
2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2262 glEnd; 2284 glEnd;
2285
2286 glLineWidth 3;
2287 glColor @{$self->{active_outline}};
2288 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2289 glLineWidth 1;
2290
2291 } else {
2292 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2293 glBegin GL_LINE_STRIP;
2294 glVertex .5, $self->{h} * .5;
2295 glVertex .5, $self->{h} - 2.5;
2296 glVertex $self->{w} - .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} * .5;
2298 glEnd;
2263 } 2299 }
2264} 2300}
2265 2301
2266############################################################################# 2302#############################################################################
2267 2303
2268package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2269 2305
2270our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2271 2307
2272use CFPlus::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2273 2319
2274sub invoke_key_down { 2320sub invoke_key_down {
2275 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2276 2322
2277 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2283 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2284 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2285 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2286 $self->update; 2332 $self->update;
2287 2333
2288 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2289 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2290 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2291 } 2337 }
2292 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2293 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2295 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2296 } 2342 }
2297 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2298 } 2344 }
2299 2345
2300 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2301 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2302 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2303 2349
2304 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2305 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2306 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2307 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2308 } 2357 }
2309 2358
2310 } else { 2359 } else {
2311 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2312 } 2361 }
… …
2314 1 2363 1
2315} 2364}
2316 2365
2317############################################################################# 2366#############################################################################
2318 2367
2319package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2320 2369
2321our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2322 2371
2323use CFPlus::OpenGL; 2372use DC::OpenGL;
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 padding_y => 4,
2379
2380 @_
2381 )
2382}
2324 2383
2325sub move_cursor_ver { 2384sub move_cursor_ver {
2326 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2327 2386
2328 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2329 2388
2330 $y += $dy; 2389 $line += $dy;
2331 2390
2332 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2391 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2333 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2334 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2335 $self->update; 2394 $self->update;
2336 return; 2395 return;
2337 } 2396 }
… …
2340sub invoke_key_down { 2399sub invoke_key_down {
2341 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2342 2401
2343 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2344 2403
2345 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2346 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2347 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2348 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2349 } else { 2408 } else {
2350 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2351 } 2410 }
2352 2411
2353 1 2412 1
2354} 2413}
2355 2414
2356############################################################################# 2415#############################################################################
2357 2416
2358package CFPlus::UI::Button; 2417package DC::UI::ButtonBin;
2359 2418
2360our @ISA = CFPlus::UI::Label::; 2419our @ISA = DC::UI::Bin::;
2361 2420
2362use CFPlus::OpenGL; 2421use DC::OpenGL;
2363 2422
2364my @tex = 2423my @tex =
2365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2366 qw(b1_button_inactive.png b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2367 2426
2368sub new { 2427sub new {
2369 my $class = shift; 2428 my $class = shift;
2370 2429
2371 $class->SUPER::new ( 2430 $class->SUPER::new (
2431 can_hover => 1,
2432 align => 0.5,
2433 valign => 0.5,
2434 can_events => 1,
2435 @_
2436 )
2437}
2438
2439sub invoke_button_up {
2440 my ($self, $ev, $x, $y) = @_;
2441
2442 $self->emit ("activate")
2443 if $x >= 0 && $x < $self->{w}
2444 && $y >= 0 && $y < $self->{h};
2445
2446 1
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 glEnable GL_TEXTURE_2D;
2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2454 glColor 0, 0, 0, 1;
2455
2456 my $tex = $tex[$GRAB == $self];
2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2458
2459 glDisable GL_TEXTURE_2D;
2460
2461 $self->SUPER::_draw;
2462}
2463
2464#############################################################################
2465
2466package DC::UI::Button;
2467
2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
2471
2472my @tex =
2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2474 qw(b1_button_inactive.png b1_button_active.png);
2475
2476sub new {
2477 my $class = shift;
2478
2479 $class->SUPER::new (
2372 padding_x => 4, 2480 padding_x => 8,
2373 padding_y => 4, 2481 padding_y => 4,
2374 fg => [1.0, 1.0, 1.0], 2482 fg => [1.0, 1.0, 1.0],
2375 active_fg => [0.8, 0.8, 0.8], 2483 active_fg => [0.8, 0.8, 0.8],
2376 can_hover => 1, 2484 can_hover => 1,
2377 align => 0, 2485 align => 0.5,
2378 valign => 0, 2486 valign => 0.5,
2379 can_events => 1, 2487 can_events => 1,
2380 @_ 2488 @_
2381 ) 2489 )
2382} 2490}
2383 2491
… …
2408 $self->SUPER::_draw; 2516 $self->SUPER::_draw;
2409} 2517}
2410 2518
2411############################################################################# 2519#############################################################################
2412 2520
2413package CFPlus::UI::CheckBox; 2521package DC::UI::CheckBox;
2414 2522
2415our @ISA = CFPlus::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2416 2524
2417my @tex = 2525my @tex =
2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2419 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2420 2528
2421use CFPlus::OpenGL; 2529use DC::OpenGL;
2422 2530
2423sub new { 2531sub new {
2424 my $class = shift; 2532 my $class = shift;
2425 2533
2426 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2427 padding_x => 2, 2536 padding_x => 2,
2428 padding_y => 2, 2537 padding_y => 2,
2429 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2430 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2431 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2437} 2546}
2438 2547
2439sub size_request { 2548sub size_request {
2440 my ($self) = @_; 2549 my ($self) = @_;
2441 2550
2442 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2443} 2552}
2444 2553
2445sub toggle { 2554sub toggle {
2446 my ($self) = @_; 2555 my ($self) = @_;
2447 2556
… …
2466sub _draw { 2575sub _draw {
2467 my ($self) = @_; 2576 my ($self) = @_;
2468 2577
2469 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2470 2579
2471 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2472 2581
2473 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2474 2583
2475 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2584 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2476 2585
… …
2483 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2484} 2593}
2485 2594
2486############################################################################# 2595#############################################################################
2487 2596
2488package CFPlus::UI::Image; 2597package DC::UI::Image;
2489 2598
2490our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::Base::;
2491 2600
2492use CFPlus::OpenGL; 2601use DC::OpenGL;
2493 2602
2494our %texture_cache; 2603our %texture_cache;
2495 2604
2496sub new { 2605sub new {
2497 my $class = shift; 2606 my $class = shift;
2498 2607
2499 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2500 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2501 @_, 2611 @_,
2502 ); 2612 );
2503 2613
2504 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2505 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2506 2616
2507 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2508 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2509 2619
2510 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2511 2621
2512 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2513 2623
2514 $self 2624 $self
2515} 2625}
2516 2626
2517sub STORABLE_freeze { 2627sub STORABLE_freeze {
2518 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2519 2629
2520 $self->{path} 2630 $self->{path}
2521 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2522 2632
2523 $self->{path} 2633 $self->{path}
2524} 2634}
2525 2635
2526sub STORABLE_attach { 2636sub STORABLE_attach {
… …
2530} 2640}
2531 2641
2532sub size_request { 2642sub size_request {
2533 my ($self) = @_; 2643 my ($self) = @_;
2534 2644
2535 ($self->{tex}{w}, $self->{tex}{h}) 2645 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2536} 2646}
2537 2647
2538sub _draw { 2648sub _draw {
2539 my ($self) = @_; 2649 my ($self) = @_;
2540 2650
… …
2550 } 2660 }
2551 2661
2552 glEnable GL_TEXTURE_2D; 2662 glEnable GL_TEXTURE_2D;
2553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2554 2664
2555 $tex->draw_quad (0, 0, $w, $h); 2665 $tex->draw_quad_alpha (0, 0, $w, $h);
2556 2666
2557 glDisable GL_TEXTURE_2D; 2667 glDisable GL_TEXTURE_2D;
2558} 2668}
2559 2669
2560############################################################################# 2670#############################################################################
2561 2671
2562package CFPlus::UI::ImageButton; 2672package DC::UI::ImageButton;
2563 2673
2564our @ISA = CFPlus::UI::Image::; 2674our @ISA = DC::UI::Image::;
2565 2675
2566use CFPlus::OpenGL; 2676use DC::OpenGL;
2567 2677
2568my %textures; 2678my %textures;
2569 2679
2570sub new { 2680sub new {
2571 my $class = shift; 2681 my $class = shift;
… …
2574 padding_x => 4, 2684 padding_x => 4,
2575 padding_y => 4, 2685 padding_y => 4,
2576 fg => [1, 1, 1], 2686 fg => [1, 1, 1],
2577 active_fg => [0, 0, 1], 2687 active_fg => [0, 0, 1],
2578 can_hover => 1, 2688 can_hover => 1,
2579 align => 0, 2689 align => 0.5,
2580 valign => 0, 2690 valign => 0.5,
2581 can_events => 1, 2691 can_events => 1,
2582 @_ 2692 @_
2583 ); 2693 );
2584} 2694}
2585 2695
2696sub invoke_button_down {
2697 my ($self, $ev, $x, $y) = @_;
2698
2699 1
2700}
2701
2586sub invoke_button_up { 2702sub invoke_button_up {
2587 my ($self, $ev, $x, $y) = @_; 2703 my ($self, $ev, $x, $y) = @_;
2588 2704
2589 $self->emit ("activate") 2705 $self->emit ("activate")
2590 if $x >= 0 && $x < $self->{w} 2706 if $x >= 0 && $x < $self->{w}
… …
2593 1 2709 1
2594} 2710}
2595 2711
2596############################################################################# 2712#############################################################################
2597 2713
2598package CFPlus::UI::VGauge; 2714package DC::UI::VGauge;
2599 2715
2600our @ISA = CFPlus::UI::Base::; 2716our @ISA = DC::UI::Base::;
2601 2717
2602use List::Util qw(min max); 2718use List::Util qw(min max);
2603 2719
2604use CFPlus::OpenGL; 2720use DC::OpenGL;
2605 2721
2606my %tex = ( 2722my %tex = (
2607 food => [ 2723 food => [
2608 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2609 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2725 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2610 ], 2726 ],
2611 grace => [ 2727 grace => [
2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2728 map { new_from_resource DC::Texture $_, mipmap => 1 }
2613 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2729 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2614 ], 2730 ],
2615 hp => [ 2731 hp => [
2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2617 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2733 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2618 ], 2734 ],
2619 mana => [ 2735 mana => [
2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2621 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2737 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2622 ], 2738 ],
2623); 2739);
2624 2740
2625# eg. VGauge->new (gauge => 'food'), default gauge: food 2741# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2728 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2729} 2845}
2730 2846
2731############################################################################# 2847#############################################################################
2732 2848
2849package DC::UI::Progress;
2850
2851our @ISA = DC::UI::Label::;
2852
2853use DC::OpenGL;
2854
2855sub new {
2856 my ($class, %arg) = @_;
2857
2858 my $self = $class->SUPER::new (
2859 padding_x => 2,
2860 padding_y => 2,
2861 fg => [1, 1, 1],
2862 bg => [0, 0, 1, 0.2],
2863 bar => [0.7, 0.5, 0.1, 0.8],
2864 outline => [0.4, 0.3, 0],
2865 fontsize => 0.9,
2866 valign => 0.5,
2867 align => 0.5,
2868 can_events => 1,
2869 ellipsise => 1,
2870 label => "%d%%",
2871 %arg,
2872 );
2873
2874 $self->set_value ($arg{value} || -1);
2875
2876 $self
2877}
2878
2879sub set_label {
2880 my ($self, $label) = @_;
2881
2882 return if $self->{label} eq $label;
2883 $self->{label} = $label;
2884
2885 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2886}
2887
2888sub set_value {
2889 my ($self, $value) = @_;
2890
2891 if ($self->{value} ne $value) {
2892 $self->{value} = $value;
2893
2894 if ($value < 0) {
2895 $self->set_text ("-");
2896 } else {
2897 $self->set_text (sprintf $self->{label}, $value * 100);
2898 }
2899
2900 $self->update;
2901 }
2902}
2903
2904sub _draw {
2905 my ($self) = @_;
2906
2907 glEnable GL_BLEND;
2908 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2909
2910 my $px = $self->{padding_x};
2911 my $py = $self->{padding_y};
2912
2913 if ($self->{value} >= 0) {
2914 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2915
2916 glColor_premultiply @{$self->{bar}};
2917 glRect $px, $py, $s, $self->{h} - $py;
2918 glColor_premultiply @{$self->{bg}};
2919 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2920 }
2921
2922 glColor_premultiply @{$self->{outline}};
2923
2924 $px -= .5;
2925 $py -= .5;
2926
2927 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2928
2929 glDisable GL_BLEND;
2930
2931 {
2932 local $self->{bg}; # do not draw background
2933 $self->SUPER::_draw;
2934 }
2935}
2936
2937#############################################################################
2938
2939package DC::UI::ExperienceProgress;
2940
2941our @ISA = DC::UI::Progress::;
2942
2943sub new {
2944 my ($class, %arg) = @_;
2945
2946 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2947
2948 my $self = $class->SUPER::new (
2949 %arg,
2950 tooltip => sub {
2951 my ($self) = @_;
2952
2953 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2954 $tt,
2955 $self->{lvl},
2956 ::formsep ($self->{exp}),
2957 ::formsep ($self->{nxt}),
2958 ::formsep ($self->{nxt} - $self->{exp}),
2959 $self->_percent * 100,
2960 },
2961 );
2962
2963 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2964 if $::CONN;
2965
2966 $self
2967}
2968
2969sub DESTROY {
2970 my ($self) = @_;
2971
2972 delete $::CONN->{on_exp_update}{$self+0}
2973 if $::CONN;
2974
2975 $self->SUPER::DESTROY;
2976}
2977
2978sub _percent {
2979 my ($self) = @_;
2980
2981 my $table = $::CONN && $::CONN->{exp_table}
2982 or return -1;
2983
2984 my $l0 = $table->[$self->{lvl} - 1];
2985 my $l1 = $table->[$self->{lvl}];
2986
2987 $self->{nxt} = $l1;
2988
2989 ($self->{exp} - $l0) / ($l1 - $l0)
2990}
2991
2992sub set_value {
2993 my ($self, $lvl, $exp) = @_;
2994
2995 $self->{lvl} = $lvl;
2996 $self->{exp} = $exp;
2997
2998 $self->SUPER::set_value ($self->_percent);
2999}
3000
3001#############################################################################
3002
2733package CFPlus::UI::Gauge; 3003package DC::UI::Gauge;
2734 3004
2735our @ISA = CFPlus::UI::VBox::; 3005our @ISA = DC::UI::VBox::;
2736 3006
2737sub new { 3007sub new {
2738 my ($class, %arg) = @_; 3008 my ($class, %arg) = @_;
2739 3009
2740 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
… …
2742 can_hover => 1, 3012 can_hover => 1,
2743 can_events => 1, 3013 can_events => 1,
2744 %arg, 3014 %arg,
2745 ); 3015 );
2746 3016
2747 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3017 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2748 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3018 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2749 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3019 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2750 3020
2751 $self 3021 $self
2752} 3022}
2753 3023
2754sub set_fontsize { 3024sub set_fontsize {
… …
2775 $self->{value}->set_text ($val); 3045 $self->{value}->set_text ($val);
2776} 3046}
2777 3047
2778############################################################################# 3048#############################################################################
2779 3049
2780package CFPlus::UI::Slider; 3050package DC::UI::Slider;
2781 3051
2782use strict; 3052use strict;
2783 3053
2784use CFPlus::OpenGL; 3054use DC::OpenGL;
2785 3055
2786our @ISA = CFPlus::UI::DrawBG::; 3056our @ISA = DC::UI::DrawBG::;
2787 3057
2788my @tex = 3058my @tex =
2789 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3059 map { new_from_resource DC::Texture $_ }
2790 qw(s1_slider.png s1_slider_bg.png); 3060 qw(s1_slider.png s1_slider_bg.png);
2791 3061
2792sub new { 3062sub new {
2793 my $class = shift; 3063 my $class = shift;
2794 3064
… …
2831sub set_value { 3101sub set_value {
2832 my ($self, $value) = @_; 3102 my ($self, $value) = @_;
2833 3103
2834 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3104 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2835 3105
2836 $hi = $lo + 1 if $hi <= $lo; 3106 $hi = $lo if $hi < $lo;
2837 3107
2838 $page = $hi - $lo if $page > $hi - $lo; 3108 $value = $hi - $page if $value > $hi - $page;
2839
2840 $value = $lo if $value < $lo; 3109 $value = $lo if $value < $lo;
2841 $value = $hi - $page if $value > $hi - $page;
2842 3110
2843 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3111 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2844 if $unit; 3112 if $unit;
2845 3113
2846 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3114 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2862 3130
2863 $self->SUPER::invoke_button_down ($ev, $x, $y); 3131 $self->SUPER::invoke_button_down ($ev, $x, $y);
2864 3132
2865 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3133 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2866 3134
2867 $self->invoke_mouse_motion ($ev, $x, $y) 3135 $self->invoke_mouse_motion ($ev, $x, $y);
3136
3137 1
2868} 3138}
2869 3139
2870sub invoke_mouse_motion { 3140sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3141 my ($self, $ev, $x, $y) = @_;
2872 3142
… …
2888sub invoke_mouse_wheel { 3158sub invoke_mouse_wheel {
2889 my ($self, $ev) = @_; 3159 my ($self, $ev) = @_;
2890 3160
2891 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3161 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2892 3162
2893 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3163 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2894 3164
2895 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3165 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2896 3166
2897 ! ! $delta 3167 1
2898} 3168}
2899 3169
2900sub update { 3170sub update {
2901 my ($self) = @_; 3171 my ($self) = @_;
2902 3172
… …
2908 my ($self) = @_; 3178 my ($self) = @_;
2909 3179
2910 unless ($self->{knob_w}) { 3180 unless ($self->{knob_w}) {
2911 $self->set_value ($self->{range}[0]); 3181 $self->set_value ($self->{range}[0]);
2912 3182
2913 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3183 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2914 my $range = ($hi - $page - $lo) || 1e-100; 3184 my $range = ($hi - $page - $lo) || 1e-10;
2915 3185
2916 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3186 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2917 3187
2918 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3188 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2919 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3189 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2920 3190
2921 $value = ($value - $lo) / $range; 3191 $value = ($value - $lo) / $range;
… …
2951 glDisable GL_TEXTURE_2D; 3221 glDisable GL_TEXTURE_2D;
2952} 3222}
2953 3223
2954############################################################################# 3224#############################################################################
2955 3225
2956package CFPlus::UI::ValSlider; 3226package DC::UI::ValSlider;
2957 3227
2958our @ISA = CFPlus::UI::HBox::; 3228our @ISA = DC::UI::HBox::;
2959 3229
2960sub new { 3230sub new {
2961 my ($class, %arg) = @_; 3231 my ($class, %arg) = @_;
2962 3232
2963 my $range = delete $arg{range}; 3233 my $range = delete $arg{range};
2964 3234
2965 my $self = $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
2966 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3236 slider => (new DC::UI::Slider expand => 1, range => $range),
2967 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3237 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2968 to_value => sub { shift }, 3238 to_value => sub { shift },
2969 from_value => sub { shift }, 3239 from_value => sub { shift },
2970 %arg, 3240 %arg,
2971 ); 3241 );
2972 3242
… …
2992sub set_range { shift->{slider}->set_range (@_) } 3262sub set_range { shift->{slider}->set_range (@_) }
2993sub set_value { shift->{slider}->set_value (@_) } 3263sub set_value { shift->{slider}->set_value (@_) }
2994 3264
2995############################################################################# 3265#############################################################################
2996 3266
2997package CFPlus::UI::TextScroller; 3267package DC::UI::TextScroller;
2998 3268
2999our @ISA = CFPlus::UI::HBox::; 3269our @ISA = DC::UI::HBox::;
3000 3270
3001use CFPlus::OpenGL; 3271use DC::OpenGL;
3002 3272
3003sub new { 3273sub new {
3004 my $class = shift; 3274 my $class = shift;
3005 3275
3006 my $self = $class->SUPER::new ( 3276 my $self = $class->SUPER::new (
… …
3008 can_events => 1, 3278 can_events => 1,
3009 indent => 0, 3279 indent => 0,
3010 #font => default_font 3280 #font => default_font
3011 @_, 3281 @_,
3012 3282
3013 layout => (new CFPlus::Layout), 3283 layout => (new DC::Layout),
3014 par => [], 3284 par => [],
3015 max_par => 0, 3285 max_par => 0,
3016 height => 0, 3286 height => 0,
3017 children => [ 3287 children => [
3018 (new CFPlus::UI::Empty expand => 1), 3288 (new DC::UI::Empty expand => 1),
3019 (new CFPlus::UI::Slider vertical => 1), 3289 (new DC::UI::Slider vertical => 1),
3020 ], 3290 ],
3021 ); 3291 );
3022 3292
3023 $self->{children}[1]->connect (changed => sub { $self->update }); 3293 $self->{children}[1]->connect (changed => sub { $self->update });
3024 3294
… …
3033} 3303}
3034 3304
3035sub size_request { 3305sub size_request {
3036 my ($self) = @_; 3306 my ($self) = @_;
3037 3307
3038 my ($empty, $slider) = @{ $self->{children} }; 3308 my ($empty, $slider) = $self->visible_children;
3039 3309
3040 local $self->{children} = [$empty, $slider]; 3310 local $self->{children} = [$empty, $slider];
3041 $self->SUPER::size_request 3311 $self->SUPER::size_request
3042} 3312}
3043 3313
… …
3080 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3350 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3081 $layout->set_markup ($para->{markup}); 3351 $layout->set_markup ($para->{markup});
3082 3352
3083 $layout->set_shapes ( 3353 $layout->set_shapes (
3084 map 3354 map
3085 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3355 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3086 @{$para->{widget}} 3356 @{$para->{widget}}
3087 ); 3357 );
3088 3358
3089 $layout 3359 $layout
3090} 3360}
… …
3207 $ROOT->on_post_alloc ($self => sub { 3477 $ROOT->on_post_alloc ($self => sub {
3208 $self->force_uptodate; 3478 $self->force_uptodate;
3209 3479
3210 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3480 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3211 3481
3212 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3482 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3213 glClearColor 0, 0, 0, 0; 3483 glClearColor 0, 0, 0, 0;
3214 glClear GL_COLOR_BUFFER_BIT; 3484 glClear GL_COLOR_BUFFER_BIT;
3215 3485
3216 package CFPlus::UI::Base; 3486 package DC::UI::Base;
3217 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3487 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3218 (0, 0, $self->{w}, $self->{h}); 3488 (0, 0, $self->{w}, $self->{h});
3219 3489
3220 my $top = int $self->{children}[1]{range}[0]; 3490 my $top = int $self->{children}[1]{range}[0];
3221 3491
… …
3232 3502
3233 if ($y0 < $y + $h && $y < $y1) { 3503 if ($y0 < $y + $h && $y < $y1) {
3234 my $layout = $self->get_layout ($para); 3504 my $layout = $self->get_layout ($para);
3235 3505
3236 $layout->render ($para->{indent}, $y - $y0); 3506 $layout->render ($para->{indent}, $y - $y0);
3507 $layout->draw;
3237 3508
3238 if (my @w = @{ $para->{widget} }) { 3509 if (my @w = @{ $para->{widget} }) {
3239 my @s = $layout->get_shapes; 3510 my @s = $layout->get_shapes;
3240 3511
3241 for (@w) { 3512 for (@w) {
… …
3279 $self->{children}[1]->draw; 3550 $self->{children}[1]->draw;
3280} 3551}
3281 3552
3282############################################################################# 3553#############################################################################
3283 3554
3284package CFPlus::UI::Animator; 3555package DC::UI::Animator;
3285 3556
3286use CFPlus::OpenGL; 3557use DC::OpenGL;
3287 3558
3288our @ISA = CFPlus::UI::Bin::; 3559our @ISA = DC::UI::Bin::;
3289 3560
3290sub moveto { 3561sub moveto {
3291 my ($self, $x, $y) = @_; 3562 my ($self, $x, $y) = @_;
3292 3563
3293 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3564 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3321 glPopMatrix; 3592 glPopMatrix;
3322} 3593}
3323 3594
3324############################################################################# 3595#############################################################################
3325 3596
3326package CFPlus::UI::Flopper; 3597package DC::UI::Flopper;
3327 3598
3328our @ISA = CFPlus::UI::Button::; 3599our @ISA = DC::UI::Button::;
3329 3600
3330sub new { 3601sub new {
3331 my $class = shift; 3602 my $class = shift;
3332 3603
3333 my $self = $class->SUPER::new ( 3604 my $self = $class->SUPER::new (
… …
3345 $self->{other}->toggle_visibility; 3616 $self->{other}->toggle_visibility;
3346} 3617}
3347 3618
3348############################################################################# 3619#############################################################################
3349 3620
3350package CFPlus::UI::Tooltip; 3621package DC::UI::Tooltip;
3351 3622
3352our @ISA = CFPlus::UI::Bin::; 3623our @ISA = DC::UI::Bin::;
3353 3624
3354use CFPlus::OpenGL; 3625use DC::OpenGL;
3355 3626
3356sub new { 3627sub new {
3357 my $class = shift; 3628 my $class = shift;
3358 3629
3359 $class->SUPER::new ( 3630 $class->SUPER::new (
… …
3363} 3634}
3364 3635
3365sub set_tooltip_from { 3636sub set_tooltip_from {
3366 my ($self, $widget) = @_; 3637 my ($self, $widget) = @_;
3367 3638
3368 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3369 if $widget->{tooltip} =~ /^#(.*)$/;
3370
3371 my $tooltip = $widget->{tooltip}; 3639 my $tip = $widget->{tooltip};
3640 $tip = $tip->($widget) if "CODE" eq ref $tip;
3641
3642 $tip = DC::Pod::section_label tooltip => $1
3643 if $tip =~ /^#(.*)$/;
3372 3644
3373 if ($ENV{CFPLUS_DEBUG} & 2) { 3645 if ($ENV{CFPLUS_DEBUG} & 2) {
3374 $tooltip .= "\n\n" . (ref $widget) . "\n" 3646 $tip .= "\n\n" . (ref $widget) . "\n"
3375 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3647 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3376 . "req $widget->{req_w} $widget->{req_h}\n" 3648 . "req $widget->{req_w} $widget->{req_h}\n"
3377 . "visible $widget->{visible}"; 3649 . "visible $widget->{visible}";
3378 } 3650 }
3379 3651
3380 $tooltip =~ s/^\n+//; 3652 $tip =~ s/^\n+//;
3381 $tooltip =~ s/\n+$//; 3653 $tip =~ s/\n+$//;
3382 3654
3383 $self->add (new CFPlus::UI::Label 3655 $self->add (new DC::UI::Label
3656 fg => $DC::THEME{tooltip_fg},
3384 markup => $tooltip, 3657 markup => $tip,
3385 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3658 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3659 align => 0,
3386 fontsize => 0.8, 3660 fontsize => 0.8,
3387 style => 1, # FLAG_INVERSE 3661 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3388 ellipsise => 0, 3662 ellipsise => 0,
3389 font => ($widget->{tooltip_font} || $::FONT_PROP), 3663 font => ($widget->{tooltip_font} || $::FONT_PROP),
3390 ); 3664 );
3391} 3665}
3392 3666
… …
3427} 3701}
3428 3702
3429sub _draw { 3703sub _draw {
3430 my ($self) = @_; 3704 my ($self) = @_;
3431 3705
3432 glTranslate 0.375, 0.375;
3433
3434 my ($w, $h) = @$self{qw(w h)}; 3706 my ($w, $h) = @$self{qw(w h)};
3435 3707
3436 glColor 1, 0.8, 0.4; 3708 glColor @{ $DC::THEME{tooltip_bg} };
3437 glBegin GL_QUADS; 3709 glRect 0, 0, $w, $h;
3438 glVertex 0 , 0;
3439 glVertex 0 , $h;
3440 glVertex $w, $h;
3441 glVertex $w, 0;
3442 glEnd;
3443 3710
3444 glColor 0, 0, 0; 3711 glColor @{ $DC::THEME{tooltip_border} };
3445 glBegin GL_LINE_LOOP; 3712 glRect_lineloop .5, .5, $w + .5, $h + .5;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3713
3452 glTranslate 2 - 0.375, 2 - 0.375; 3714 glTranslate 2, 2;
3453 3715
3454 $self->SUPER::_draw; 3716 $self->SUPER::_draw;
3455} 3717}
3456 3718
3457############################################################################# 3719#############################################################################
3458 3720
3459package CFPlus::UI::Face; 3721package DC::UI::Face;
3460 3722
3461our @ISA = CFPlus::UI::DrawBG::; 3723our @ISA = DC::UI::DrawBG::;
3462 3724
3463use CFPlus::OpenGL; 3725use DC::OpenGL;
3464 3726
3465sub new { 3727sub new {
3466 my $class = shift; 3728 my $class = shift;
3467 3729
3468 my $self = $class->SUPER::new ( 3730 my $self = $class->SUPER::new (
… …
3471 aspect => 1, 3733 aspect => 1,
3472 can_events => 0, 3734 can_events => 0,
3473 @_, 3735 @_,
3474 ); 3736 );
3475 3737
3476 if ($self->{anim} && $self->{animspeed}) {
3477 CFPlus::weaken (my $widget = $self);
3478
3479 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3480 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3481 $self->{timer} = Event->timer (
3482 parked => 1,
3483 cb => sub {
3484 return unless $::CONN && $widget;
3485
3486 ++$widget->{frame};
3487 $widget->update_face;
3488 $widget->update;
3489
3490 $widget->update_timer;
3491 },
3492 );
3493
3494 $self->update_face;
3495 $self->update_timer; 3738 $self->update_anim;
3496 }
3497 3739
3498 $self 3740 $self
3499} 3741}
3500 3742
3501sub update_timer { 3743sub update_timer {
3502 my ($self) = @_; 3744 my ($self) = @_;
3503 3745
3504 return unless $self->{timer}; 3746 return unless $self->{timer};
3505 3747
3506 if ($self->{visible}) { 3748 if ($self->{visible}) {
3507 $self->{timer}->at (
3508 $self->{anim_start}
3509 + $self->{animspeed}
3510 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3511 );
3512 $self->{timer}->start; 3749 $self->{timer}->start;
3513 } else { 3750 } else {
3514 $self->{timer}->stop; 3751 $self->{timer}->stop;
3515 } 3752 }
3516} 3753}
3517 3754
3518sub update_face { 3755sub update_face {
3519 my ($self) = @_; 3756 my ($self) = @_;
3520 3757
3521 return unless $::CONN;
3522
3523 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3524 if ($anim && @$anim) {
3525 delete $self->{wait_face};
3526 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3527 }
3528 }
3529}
3530
3531sub size_request {
3532 my ($self) = @_;
3533
3534 if ($::CONN) { 3758 if ($::CONN) {
3535 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3759 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3536 if (my $tex = $::CONN->{texture}[$faceid]) { 3760 if ($anim && @$anim) {
3537 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3761 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3538 } else { 3762 delete $self->{face_change_cb};
3539 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3763
3540 $self->realloc; 3764 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3765 unless ($tex->{name} || $tex->{loading}) {
3766 $tex->upload (sub { $self->reconfigure });
3767 }
3541 }); 3768 }
3542 } 3769 }
3543 } 3770 }
3544 } 3771 }
3772}
3773
3774sub update_anim {
3775 my ($self) = @_;
3776
3777 if ($self->{anim} && $self->{animspeed}) {
3778 DC::weaken (my $widget = $self);
3779
3780 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3781 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3782 return unless $::CONN;
3783
3784 my $w = $widget
3785 or return;
3786
3787 ++$w->{frame};
3788 $w->update_face;
3789
3790 # somehow, $widget can go away
3791 $w->update;
3792 $w->update_timer;
3793 };
3794
3795 $self->update_face;
3796 $self->update_timer;
3797 } else {
3798 delete $self->{timer};
3799 }
3800}
3801
3802sub size_request {
3803 my ($self) = @_;
3804
3805 if ($::CONN) {
3806 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3807 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3808 if ($tex->{name}) {
3809 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3810 } elsif (!$tex->{loading}) {
3811 $tex->upload (sub { $self->reconfigure });
3812 }
3813 }
3814
3815 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3816 }
3817 }
3545 3818
3546 ($self->{size_w} || 8, $self->{size_h} || 8) 3819 ($self->{size_w} || 8, $self->{size_h} || 8)
3547} 3820}
3548 3821
3549sub update { 3822sub update {
… …
3552 return unless $self->{visible}; 3825 return unless $self->{visible};
3553 3826
3554 $self->SUPER::update; 3827 $self->SUPER::update;
3555} 3828}
3556 3829
3830sub set_face {
3831 my ($self, $face) = @_;
3832
3833 $self->{face} = $face;
3834 $self->reconfigure;
3835}
3836
3837sub set_anim {
3838 my ($self, $anim) = @_;
3839
3840 $self->{anim} = $anim;
3841 $self->update_anim;
3842}
3843
3844sub set_animspeed {
3845 my ($self, $animspeed) = @_;
3846
3847 $self->{animspeed} = $animspeed;
3848 $self->update_anim;
3849}
3850
3557sub invoke_visibility_change { 3851sub invoke_visibility_change {
3558 my ($self) = @_; 3852 my ($self) = @_;
3559 3853
3560 $self->update_timer; 3854 $self->update_timer;
3561 3855
… …
3563} 3857}
3564 3858
3565sub _draw { 3859sub _draw {
3566 my ($self) = @_; 3860 my ($self) = @_;
3567 3861
3568 return unless $::CONN;
3569
3570 $self->SUPER::_draw; 3862 $self->SUPER::_draw;
3571 3863
3572 my $faceid = $::CONN->{faceid}[$self->{face}] 3864 if (my $tex = $self->{tex}) {
3573 or return;
3574
3575 my $tex = $::CONN->{texture}[$faceid];
3576
3577 if ($tex) {
3578 glEnable GL_TEXTURE_2D; 3865 glEnable GL_TEXTURE_2D;
3579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3580 glColor 0, 0, 0, 1; 3867 glColor 0, 0, 0, 1;
3581 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3868 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3582 glDisable GL_TEXTURE_2D; 3869 glDisable GL_TEXTURE_2D;
… …
3592 $self->SUPER::destroy; 3879 $self->SUPER::destroy;
3593} 3880}
3594 3881
3595############################################################################# 3882#############################################################################
3596 3883
3597package CFPlus::UI::Buttonbar; 3884package DC::UI::Buttonbar;
3598 3885
3599our @ISA = CFPlus::UI::HBox::; 3886our @ISA = DC::UI::HBox::;
3600 3887
3601# TODO: should actually wrap buttons and other goodies. 3888# TODO: should actually wrap buttons and other goodies.
3602 3889
3603############################################################################# 3890#############################################################################
3604 3891
3605package CFPlus::UI::Menu; 3892package DC::UI::Menu;
3606 3893
3607our @ISA = CFPlus::UI::Toplevel::; 3894our @ISA = DC::UI::Toplevel::;
3608 3895
3609use CFPlus::OpenGL; 3896use DC::OpenGL;
3610 3897
3611sub new { 3898sub new {
3612 my $class = shift; 3899 my $class = shift;
3613 3900
3614 my $self = $class->SUPER::new ( 3901 my $self = $class->SUPER::new (
3615 items => [], 3902 items => [],
3616 z => 100, 3903 z => 100,
3617 @_, 3904 @_,
3618 ); 3905 );
3619 3906
3620 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3907 $self->add ($self->{vbox} = new DC::UI::VBox);
3621 3908
3622 for my $item (@{ $self->{items} }) { 3909 for my $item (@{ $self->{items} }) {
3623 my ($widget, $cb, $tooltip) = @$item; 3910 my ($widget, $cb, $tooltip) = @$item;
3624 3911
3625 # handle various types of items, only text for now 3912 # handle various types of items, only text for now
3626 if (!ref $widget) { 3913 if (!ref $widget) {
3627 if ($widget =~ /\t/) { 3914 if ($widget =~ /\t/) {
3628 my ($left, $right) = split /\t/, $widget, 2; 3915 my ($left, $right) = split /\t/, $widget, 2;
3629 3916
3630 $widget = new CFPlus::UI::HBox 3917 $widget = new DC::UI::HBox
3631 can_hover => 1, 3918 can_hover => 1,
3632 can_events => 1, 3919 can_events => 1,
3633 tooltip => $tooltip, 3920 tooltip => $tooltip,
3634 children => [ 3921 children => [
3635 (new CFPlus::UI::Label markup => $left, expand => 1), 3922 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3636 (new CFPlus::UI::Label markup => $right, align => +1), 3923 (new DC::UI::Label markup => $right, align => 1),
3637 ], 3924 ],
3638 ; 3925 ;
3639 3926
3640 } else { 3927 } else {
3641 $widget = new CFPlus::UI::Label 3928 $widget = new DC::UI::Label
3642 can_hover => 1, 3929 can_hover => 1,
3643 can_events => 1, 3930 can_events => 1,
3931 align => 0,
3644 markup => $widget, 3932 markup => $widget,
3645 tooltip => $tooltip; 3933 tooltip => $tooltip;
3646 } 3934 }
3647 } 3935 }
3648 3936
… …
3663 # maybe save $GRAB? must be careful about events... 3951 # maybe save $GRAB? must be careful about events...
3664 $GRAB = $self; 3952 $GRAB = $self;
3665 $self->{button} = $ev->{button}; 3953 $self->{button} = $ev->{button};
3666 3954
3667 $self->show; 3955 $self->show;
3668 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3956
3957 my $x = $ev->{x};
3958 my $y = $ev->{y};
3959
3960 $self->{root}->on_post_alloc ($self => sub {
3961 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3962 });
3963
3964 1 # so it can be used inside event handlers
3669} 3965}
3670 3966
3671sub invoke_mouse_motion { 3967sub invoke_mouse_motion {
3672 my ($self, $ev, $x, $y) = @_; 3968 my ($self, $ev, $x, $y) = @_;
3673 3969
… …
3694 1 3990 1
3695} 3991}
3696 3992
3697############################################################################# 3993#############################################################################
3698 3994
3699package CFPlus::UI::Multiplexer; 3995package DC::UI::Multiplexer;
3700 3996
3701our @ISA = CFPlus::UI::Container::; 3997our @ISA = DC::UI::Container::;
3702 3998
3703sub new { 3999sub new {
3704 my $class = shift; 4000 my $class = shift;
3705 4001
3706 my $self = $class->SUPER::new ( 4002 my $self = $class->SUPER::new (
3707 @_, 4003 @_,
3708 ); 4004 );
3709 4005
3710 $self->{current} = $self->{children}[0] 4006 $self->set_current_page (0);
3711 if @{ $self->{children} };
3712 4007
3713 $self 4008 $self
3714} 4009}
3715 4010
3716sub add { 4011sub add {
3717 my ($self, @widgets) = @_; 4012 my ($self, @widgets) = @_;
3718 4013
3719 $self->SUPER::add (@widgets); 4014 $self->SUPER::add (@widgets);
3720 4015
3721 $self->{current} = $self->{children}[0] 4016 $self->set_current_page (0)
3722 if @{ $self->{children} }; 4017 if @widgets == @{ $self->{children} };
3723} 4018}
3724 4019
3725sub get_current_page { 4020sub get_current_page {
3726 my ($self) = @_; 4021 my ($self) = @_;
3727 4022
… …
3733 4028
3734 my $widget = ref $page_or_widget 4029 my $widget = ref $page_or_widget
3735 ? $page_or_widget 4030 ? $page_or_widget
3736 : $self->{children}[$page_or_widget]; 4031 : $self->{children}[$page_or_widget];
3737 4032
4033 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4034
3738 $self->{current} = $widget; 4035 if (($self->{current} = $widget)) {
4036 $self->{current}->set_visible if $self->{current} && $self->{visible};
3739 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4037 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3740 4038
3741 $self->emit (page_changed => $self->{current}); 4039 $self->emit (page_changed => $self->{current});
4040 }
3742 4041
3743 $self->realloc; 4042 $self->realloc;
3744} 4043}
3745 4044
3746sub visible_children { 4045sub visible_children {
3747 $_[0]{current} 4046 $_[0]{current} || ()
3748} 4047}
3749 4048
3750sub size_request { 4049sub size_request {
3751 my ($self) = @_; 4050 my ($self) = @_;
3752 4051
4052 $self->{current}
3753 $self->{current}->size_request 4053 ? $self->{current}->size_request
4054 : (0, 0)
3754} 4055}
3755 4056
3756sub invoke_size_allocate { 4057sub invoke_size_allocate {
3757 my ($self, $w, $h) = @_; 4058 my ($self, $w, $h) = @_;
3758 4059
3759 $self->{current}->configure (0, 0, $w, $h); 4060 $self->{current}->configure (0, 0, $w, $h)
4061 if $self->{current};
3760 4062
3761 1 4063 1
3762} 4064}
3763 4065
3764sub _draw { 4066sub _draw {
3765 my ($self) = @_; 4067 my ($self) = @_;
3766 4068
3767 $self->{current}->draw; 4069 $self->{current}->draw
4070 if $self->{current};
3768} 4071}
3769 4072
3770############################################################################# 4073#############################################################################
3771 4074
3772package CFPlus::UI::Notebook; 4075package DC::UI::Notebook;
3773 4076
4077use DC::OpenGL;
4078
3774our @ISA = CFPlus::UI::VBox::; 4079our @ISA = DC::UI::VBox::;
3775 4080
3776sub new { 4081sub new {
3777 my $class = shift; 4082 my $class = shift;
3778 4083
3779 my $self = $class->SUPER::new ( 4084 my $self = $class->SUPER::new (
3780 buttonbar => (new CFPlus::UI::Buttonbar), 4085 buttonbar => (new DC::UI::Buttonbar),
3781 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4086 multiplexer => (new DC::UI::Multiplexer expand => 1),
4087 active_outline => [.7, .7, 0.2],
3782 # filter => # will be put between multiplexer and $self 4088 # filter => # will be put between multiplexer and $self
3783 @_, 4089 @_,
3784 ); 4090 );
3785 4091
3786 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4092 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3787 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4093 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3788 4094
4095 {
4096 Scalar::Util::weaken (my $wself = $self);
4097
4098 $self->{multiplexer}->connect (c_add => sub {
4099 my ($mplex, $widgets) = @_;
4100
4101 for my $child (@$widgets) {
4102 Scalar::Util::weaken $child;
4103 $child->{c_tab_} ||= do {
4104 my $tab =
4105 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4106 ? $child->{c_tab}
4107 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4108
4109 $tab->connect (activate => sub {
4110 $wself->set_current_page ($child);
4111 });
4112
4113 $tab
4114 };
4115
4116 $self->{buttonbar}->add ($child->{c_tab_});
4117 }
4118 });
4119
4120 $self->{multiplexer}->connect (c_remove => sub {
4121 my ($mplex, $widgets) = @_;
4122
4123 for my $child (@$widgets) {
4124 $wself->{buttonbar}->remove ($child->{c_tab_});
4125 }
4126 });
4127 }
4128
3789 $self 4129 $self
3790} 4130}
3791 4131
3792sub add { 4132sub add {
4133 my ($self, @widgets) = @_;
4134
4135 $self->{multiplexer}->add (@widgets)
4136}
4137
4138sub remove {
4139 my ($self, @widgets) = @_;
4140
4141 $self->{multiplexer}->remove (@widgets)
4142}
4143
4144sub pages {
4145 my ($self) = @_;
4146 $self->{multiplexer}->children
4147}
4148
4149sub page_index {
4150 my ($self, $widget) = @_;
4151
4152 my $i = 0;
4153 for ($self->pages) {
4154 if ($_ eq $widget) { return $i };
4155 $i++;
4156 }
4157
4158 undef
4159}
4160
4161sub add_tab {
3793 my ($self, $title, $widget, $tooltip) = @_; 4162 my ($self, $title, $widget, $tooltip) = @_;
3794 4163
3795 CFPlus::weaken $self; 4164 $title = [$title, $tooltip] unless ref $title;
4165 $widget->{c_tab} = $title;
3796 4166
3797 $self->{buttonbar}->add (new CFPlus::UI::Button
3798 markup => $title,
3799 tooltip => $tooltip,
3800 on_activate => sub { $self->set_current_page ($widget) },
3801 );
3802
3803 $self->{multiplexer}->add ($widget); 4167 $self->add ($widget);
3804} 4168}
3805 4169
3806sub get_current_page { 4170sub get_current_page {
3807 my ($self) = @_; 4171 my ($self) = @_;
3808 4172
… …
3814 4178
3815 $self->{multiplexer}->set_current_page ($page); 4179 $self->{multiplexer}->set_current_page ($page);
3816 $self->emit (page_changed => $self->{multiplexer}{current}); 4180 $self->emit (page_changed => $self->{multiplexer}{current});
3817} 4181}
3818 4182
4183sub _draw {
4184 my ($self) = @_;
4185
4186 $self->SUPER::_draw ();
4187
4188 if (my $cur = $self->{multiplexer}{current}) {
4189 if ($cur = $cur->{c_tab_}) {
4190 glTranslate $self->{buttonbar}{x} + $cur->{x},
4191 $self->{buttonbar}{y} + $cur->{y};
4192 glLineWidth 3;
4193 #glEnable GL_BLEND;
4194 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4195 glColor @{$self->{active_outline}};
4196 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4197 glLineWidth 1;
4198 #glDisable GL_BLEND;
4199 }
4200 }
4201}
4202
3819############################################################################# 4203#############################################################################
3820 4204
3821package CFPlus::UI::Selector; 4205package DC::UI::Selector;
3822 4206
3823use utf8; 4207use utf8;
3824 4208
3825our @ISA = CFPlus::UI::Button::; 4209our @ISA = DC::UI::Button::;
3826 4210
3827sub new { 4211sub new {
3828 my $class = shift; 4212 my $class = shift;
3829 4213
3830 my $self = $class->SUPER::new ( 4214 my $self = $class->SUPER::new (
… …
3847 my ($value, $title, $tooltip) = @$_; 4231 my ($value, $title, $tooltip) = @$_;
3848 4232
3849 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4233 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3850 } 4234 }
3851 4235
3852 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4236 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3853} 4237}
3854 4238
3855sub _set_value { 4239sub _set_value {
3856 my ($self, $value) = @_; 4240 my ($self, $value) = @_;
3857 4241
3858 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4242 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4243 $item ||= $self->{options}[0]
3859 or return; 4244 or return;
3860 4245
3861 $self->{value} = $item->[0]; 4246 $self->{value} = $item->[0];
3862 $self->set_markup ("$item->[1] ⇓"); 4247 $self->set_markup ("$item->[1] ⇓");
3863 $self->set_tooltip ($item->[2]); 4248# $self->set_tooltip ($item->[2]);
3864} 4249}
3865 4250
3866sub set_value { 4251sub set_value {
3867 my ($self, $value) = @_; 4252 my ($self, $value) = @_;
3868 4253
… …
3870 4255
3871 $self->_set_value ($value); 4256 $self->_set_value ($value);
3872 $self->emit (changed => $value); 4257 $self->emit (changed => $value);
3873} 4258}
3874 4259
4260sub set_options {
4261 my ($self, $options) = @_;
4262
4263 $self->{options} = $options;
4264 $self->_set_value ($self->{value});
4265}
4266
3875############################################################################# 4267#############################################################################
3876 4268
3877package CFPlus::UI::Statusbox; 4269package DC::UI::Statusbox;
3878 4270
3879our @ISA = CFPlus::UI::VBox::; 4271our @ISA = DC::UI::VBox::;
3880 4272
3881sub new { 4273sub new {
3882 my $class = shift; 4274 my $class = shift;
3883 4275
3884 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
3885 fontsize => 0.8, 4277 fontsize => 0.8,
3886 @_, 4278 @_,
3887 ); 4279 );
3888 4280
3889 CFPlus::weaken (my $this = $self); 4281 DC::weaken (my $this = $self);
3890 4282
3891 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4283 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3892 4284
3893 $self 4285 $self
3894} 4286}
3895 4287
3896sub reorder { 4288sub reorder {
3897 my ($self) = @_; 4289 my ($self) = @_;
3898 my $NOW = Time::HiRes::time; 4290 my $NOW = EV::time;
3899 4291
3900 # freeze display when hovering over any label 4292 # freeze display when hovering over any label
3901 return if $CFPlus::UI::TOOLTIP->{owner} 4293 return if $DC::UI::TOOLTIP->{owner}
3902 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4294 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3903 values %{ $self->{item} }; 4295 values %{ $self->{item} };
3904 4296
3905 while (my ($k, $v) = each %{ $self->{item} }) { 4297 while (my ($k, $v) = each %{ $self->{item} }) {
3906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4298 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3907 } 4299 }
4300
4301 $self->{timer}->set (1, 1);
3908 4302
3909 my @widgets; 4303 my @widgets;
3910 4304
3911 my @items = sort { 4305 my @items = sort {
3912 $a->{pri} <=> $b->{pri} 4306 $a->{pri} <=> $b->{pri}
3913 or $b->{id} <=> $a->{id} 4307 or $b->{id} <=> $a->{id}
3914 } values %{ $self->{item} }; 4308 } values %{ $self->{item} };
3915
3916 $self->{timer}->interval (1);
3917 4309
3918 my $count = 10 + 1; 4310 my $count = 10 + 1;
3919 for my $item (@items) { 4311 for my $item (@items) {
3920 last unless --$count; 4312 last unless --$count;
3921 4313
… …
3928 for ($short) { 4320 for ($short) {
3929 s/^\s+//; 4321 s/^\s+//;
3930 s/\s+/ /g; 4322 s/\s+/ /g;
3931 } 4323 }
3932 4324
3933 new CFPlus::UI::Label 4325 new DC::UI::Label
3934 markup => $short, 4326 markup => $short,
3935 tooltip => $item->{tooltip}, 4327 tooltip => $item->{tooltip},
3936 tooltip_font => $::FONT_PROP, 4328 tooltip_font => $::FONT_PROP,
3937 tooltip_width => 0.67, 4329 tooltip_width => 0.67,
3938 fontsize => $item->{fontsize} || $self->{fontsize}, 4330 fontsize => $item->{fontsize} || $self->{fontsize},
3939 max_w => $::WIDTH * 0.44, 4331 max_w => $::WIDTH * 0.44,
4332 align => 0,
3940 fg => [@{ $item->{fg} }], 4333 fg => [@{ $item->{fg} }],
3941 can_events => 1, 4334 can_events => 1,
3942 can_hover => 1 4335 can_hover => 1
3943 }; 4336 };
3944 4337
3945 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4338 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3946 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4339 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3947 $label->update; 4340 $label->update;
3948 $label->set_max_size (undef, $label->{req_h} * $diff) 4341 $label->set_max_size (undef, $label->{req_h} * $diff)
3949 if $diff < 1; 4342 if $diff < 1;
3950 $self->{timer}->interval (1/30); 4343 $self->{timer}->set (1/30, 1/30);
3951 } else { 4344 } else {
3952 $label->{fg}[3] = $item->{fg}[3] || 1; 4345 $label->{fg}[3] = $item->{fg}[3] || 1;
3953 } 4346 }
3954 4347
3955 push @widgets, $label; 4348 push @widgets, $label;
3956 } 4349 }
4350
4351 my $hash = join ",", @widgets;
4352 return if $hash eq $self->{last_widget_hash};
4353 $self->{last_widget_hash} = $hash;
3957 4354
3958 $self->clear; 4355 $self->clear;
3959 $self->SUPER::add (reverse @widgets); 4356 $self->SUPER::add (reverse @widgets);
3960} 4357}
3961 4358
… …
4017 $self->SUPER::destroy; 4414 $self->SUPER::destroy;
4018} 4415}
4019 4416
4020############################################################################# 4417#############################################################################
4021 4418
4022package CFPlus::UI::Root; 4419package DC::UI::Root;
4023 4420
4024our @ISA = CFPlus::UI::Container::; 4421our @ISA = DC::UI::Container::;
4025 4422
4026use List::Util qw(min max); 4423use List::Util qw(min max);
4027 4424
4028use CFPlus::OpenGL; 4425use DC::OpenGL;
4029 4426
4030sub new { 4427sub new {
4031 my $class = shift; 4428 my $class = shift;
4032 4429
4033 my $self = $class->SUPER::new ( 4430 my $self = $class->SUPER::new (
4034 visible => 1, 4431 visible => 1,
4035 @_, 4432 @_,
4036 ); 4433 );
4037 4434
4038 CFPlus::weaken ($self->{root} = $self); 4435 DC::weaken ($self->{root} = $self);
4039 4436
4040 $self 4437 $self
4041} 4438}
4042 4439
4043sub size_request { 4440sub size_request {
… …
4091} 4488}
4092 4489
4093sub update { 4490sub update {
4094 my ($self) = @_; 4491 my ($self) = @_;
4095 4492
4096 $::WANT_REFRESH++; 4493 $::WANT_REFRESH = 1;
4097} 4494}
4098 4495
4099sub add { 4496sub add {
4100 my ($self, @children) = @_; 4497 my ($self, @children) = @_;
4101 4498
… …
4138 while ($self->{refresh_hook}) { 4535 while ($self->{refresh_hook}) {
4139 $_->() 4536 $_->()
4140 for values %{delete $self->{refresh_hook}}; 4537 for values %{delete $self->{refresh_hook}};
4141 } 4538 }
4142 4539
4143 if ($self->{realloc}) { 4540 while ($self->{realloc}) {
4144 my %queue; 4541 my %queue;
4145 my @queue; 4542 my @queue;
4146 my $widget; 4543 my $widget;
4147 4544
4148 outer: 4545 outer:
… …
4168 4565
4169 delete $queue{$widget+0}; 4566 delete $queue{$widget+0};
4170 4567
4171 my ($w, $h) = $widget->size_request; 4568 my ($w, $h) = $widget->size_request;
4172 4569
4173 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4570 $w += $widget->{padding_x} * 2;
4174 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4571 $h += $widget->{padding_y} * 2;
4572
4573 $w = max $widget->{min_w}, $w;
4574 $h = max $widget->{min_h}, $h;
4175 4575
4176 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4576 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4177 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4577 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4178 4578
4179 $w = $widget->{force_w} if exists $widget->{force_w}; 4579 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4195 } 4595 }
4196 } 4596 }
4197 4597
4198 delete $self->{realloc}{$widget+0}; 4598 delete $self->{realloc}{$widget+0};
4199 } 4599 }
4200 }
4201 4600
4202 while (my $size_alloc = delete $self->{size_alloc}) { 4601 while (my $size_alloc = delete $self->{size_alloc}) {
4203 my @queue = sort { $b->{visible} <=> $a->{visible} } 4602 my @queue = sort { $a->{visible} <=> $b->{visible} }
4204 values %$size_alloc; 4603 values %$size_alloc;
4205 4604
4206 while () { 4605 while () {
4207 my $widget = pop @queue || last; 4606 my $widget = pop @queue || last;
4208 4607
4209 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4608 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4210 4609
4211 $w = 0 if $w < 0;
4212 $h = 0 if $h < 0;
4213
4214 $w = max $widget->{min_w}, $w; 4610 $w = max $widget->{min_w}, $w;
4215 $h = max $widget->{min_h}, $h; 4611 $h = max $widget->{min_h}, $h;
4216 4612
4217# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4613# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4218# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4614# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4219 4615
4220 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4616 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4221 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4617 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4222 4618
4223 $w = int $w + 0.5; 4619 $w = int $w + 0.5;
4224 $h = int $h + 0.5; 4620 $h = int $h + 0.5;
4225 4621
4226 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4622 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4227 $widget->{old_w} = $widget->{w}; 4623 $widget->{old_w} = $widget->{w};
4228 $widget->{old_h} = $widget->{h}; 4624 $widget->{old_h} = $widget->{h};
4229 4625
4230 $widget->{w} = $w; 4626 $widget->{w} = $w;
4231 $widget->{h} = $h; 4627 $widget->{h} = $h;
4232 4628
4233 $widget->emit (size_allocate => $w, $h); 4629 $widget->emit (size_allocate => $w, $h);
4630 }
4234 } 4631 }
4235 } 4632 }
4236 } 4633 }
4237 4634
4238 while ($self->{post_alloc_hook}) { 4635 while ($self->{post_alloc_hook}) {
… …
4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4646 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4250 glMatrixMode GL_MODELVIEW; 4647 glMatrixMode GL_MODELVIEW;
4251 glLoadIdentity; 4648 glLoadIdentity;
4252 4649
4253 { 4650 {
4254 package CFPlus::UI::Base; 4651 package DC::UI::Base;
4255 4652
4256 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4653 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4257 (0, 0, $self->{w}, $self->{h}); 4654 (0, 0, $self->{w}, $self->{h});
4258 4655
4259 $self->_draw; 4656 $self->_draw;
4260 } 4657 }
4261} 4658}
4262 4659
4263############################################################################# 4660#############################################################################
4264 4661
4265package CFPlus::UI; 4662package DC::UI;
4266 4663
4267$ROOT = new CFPlus::UI::Root; 4664$ROOT = new DC::UI::Root;
4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4665$TOOLTIP = new DC::UI::Tooltip z => 900;
4269 4666
42701 46671
4271

Diff Legend

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