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.403 by root, Sat Jul 21 21:25:23 2007 UTC vs.
Revision 1.474 by root, Sun Jan 11 22:11:23 2009 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use Guard ();
9
10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
… …
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
… …
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200 199
201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use strict;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
… …
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __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
651sub DESTROY { 630sub DESTROY {
652 my ($self) = @_; 631 my ($self) = @_;
653 632
654 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
655 634
635 local $@;
656 eval { $self->destroy }; 636 eval { $self->destroy };
657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658 638
659 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
660} 640}
661 641
662############################################################################# 642#############################################################################
663 643
664package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
665 645
666our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
667 647
668use strict; 648use strict;
669use CFPlus::OpenGL; 649use DC::OpenGL;
670 650
671sub new { 651sub new {
672 my $class = shift; 652 my $class = shift;
673
674 # range [value, low, high, page]
675 653
676 $class->SUPER::new ( 654 $class->SUPER::new (
677 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
678 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
679 @_ 657 @_
… …
691 my ($w, $h) = @$self{qw(w h)}; 669 my ($w, $h) = @$self{qw(w h)};
692 670
693 glEnable GL_BLEND; 671 glEnable GL_BLEND;
694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695 glColor_premultiply @$color; 673 glColor_premultiply @$color;
696
697 glBegin GL_QUADS;
698 glVertex 0 , 0;
699 glVertex 0 , $h;
700 glVertex $w, $h; 674 glRect 0, 0, $w, $h;
701 glVertex $w, 0;
702 glEnd;
703
704 glDisable GL_BLEND; 675 glDisable GL_BLEND;
705 } 676 }
706} 677}
707 678
708############################################################################# 679#############################################################################
709 680
710package CFPlus::UI::Empty; 681package DC::UI::Empty;
711 682
712our @ISA = CFPlus::UI::Base::; 683our @ISA = DC::UI::Base::;
713 684
714sub new { 685sub new {
715 my ($class, %arg) = @_; 686 my ($class, %arg) = @_;
716 $class->SUPER::new (can_events => 0, %arg); 687 $class->SUPER::new (can_events => 0, %arg);
717} 688}
… …
724 695
725sub draw { } 696sub draw { }
726 697
727############################################################################# 698#############################################################################
728 699
729package CFPlus::UI::Container; 700package DC::UI::Container;
730 701
731our @ISA = CFPlus::UI::Base::; 702our @ISA = DC::UI::Base::;
732 703
733sub new { 704sub new {
734 my ($class, %arg) = @_; 705 my ($class, %arg) = @_;
735 706
736 my $children = delete $arg{children}; 707 my $children = delete $arg{children};
… …
769 @{$self->{children}}, @widgets 740 @{$self->{children}}, @widgets
770 ]; 741 ];
771 742
772 $self->realloc; 743 $self->realloc;
773 744
745 $self->emit (c_add => \@widgets);
746
774 map $_+0, @widgets 747 map $_+0, @widgets
775} 748}
776 749
777sub children { 750sub children {
778 @{ $_[0]{children} } 751 @{ $_[0]{children} }
779} 752}
780 753
781sub remove { 754sub remove {
782 my ($self, $child) = @_; 755 my ($self, @widgets) = @_;
783 756
757 $self->emit (c_remove => \@widgets);
758
759 for my $child (@widgets) {
784 delete $child->{parent}; 760 delete $child->{parent};
785 $child->hide; 761 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 762 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
763 }
788 764
789 $self->realloc; 765 $self->realloc;
790} 766}
791 767
792sub clear { 768sub clear {
… …
820} 796}
821 797
822sub _draw { 798sub _draw {
823 my ($self) = @_; 799 my ($self) = @_;
824 800
825 $_->draw for @{$self->{children}}; 801 $_->draw for $self->visible_children;
826} 802}
827 803
828############################################################################# 804#############################################################################
829 805
830package CFPlus::UI::Bin; 806package DC::UI::Bin;
831 807
832our @ISA = CFPlus::UI::Container::; 808our @ISA = DC::UI::Container::;
833 809
834sub new { 810sub new {
835 my ($class, %arg) = @_; 811 my ($class, %arg) = @_;
836 812
837 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 813 my $child = (delete $arg{child}) || new DC::UI::Empty::;
838 814
839 $class->SUPER::new (children => [$child], %arg) 815 $class->SUPER::new (children => [$child], %arg)
840} 816}
841 817
842sub add { 818sub add {
843 my ($self, $child) = @_; 819 my ($self, $child) = @_;
844 820
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 821 $self->clear;
846 $self->SUPER::add ($child); 822 $self->SUPER::add ($child);
847} 823}
848 824
849sub remove { 825sub remove {
850 my ($self, $widget) = @_; 826 my ($self, $widget) = @_;
851 827
852 $self->SUPER::remove ($widget); 828 $self->SUPER::remove ($widget);
853 829
854 $self->{children} = [new CFPlus::UI::Empty] 830 $self->{children} = [new DC::UI::Empty]
855 unless @{$self->{children}}; 831 unless @{$self->{children}};
856} 832}
857 833
858sub child { $_[0]->{children}[0] } 834sub child { $_[0]->{children}[0] }
859 835
… …
868 844
869 1 845 1
870} 846}
871 847
872############################################################################# 848#############################################################################
873
874# back-buffered drawing area 849# back-buffered drawing area
875 850
876package CFPlus::UI::Window; 851package DC::UI::Window;
877 852
878our @ISA = CFPlus::UI::Bin::; 853our @ISA = DC::UI::Bin::;
879 854
880use CFPlus::OpenGL; 855use DC::OpenGL;
881 856
882sub new { 857sub new {
883 my ($class, %arg) = @_; 858 my ($class, %arg) = @_;
884 859
885 my $self = $class->SUPER::new (%arg); 860 my $self = $class->SUPER::new (%arg);
… …
907} 882}
908 883
909sub render_child { 884sub render_child {
910 my ($self) = @_; 885 my ($self) = @_;
911 886
912 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 887 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
913 glClearColor 0, 0, 0, 0; 888 glClearColor 0, 0, 0, 0;
914 glClear GL_COLOR_BUFFER_BIT; 889 glClear GL_COLOR_BUFFER_BIT;
915 890
916 { 891 {
917 package CFPlus::UI::Base; 892 package DC::UI::Base;
918 893
919 local ($draw_x, $draw_y, $draw_w, $draw_h) = 894 local ($draw_x, $draw_y, $draw_w, $draw_h) =
920 (0, 0, $self->{w}, $self->{h}); 895 (0, 0, $self->{w}, $self->{h});
921 896
922 $self->_render; 897 $self->_render;
… …
939 glDisable GL_TEXTURE_2D; 914 glDisable GL_TEXTURE_2D;
940} 915}
941 916
942############################################################################# 917#############################################################################
943 918
944package CFPlus::UI::ViewPort; 919package DC::UI::ViewPort;
945 920
946use List::Util qw(min max); 921use List::Util qw(min max);
947 922
948our @ISA = CFPlus::UI::Window::; 923our @ISA = DC::UI::Window::;
949 924
950sub new { 925sub new {
951 my $class = shift; 926 my $class = shift;
952 927
953 $class->SUPER::new ( 928 $class->SUPER::new (
… …
995 $self->emit (changed => $x, $y); 970 $self->emit (changed => $x, $y);
996 $self->update; 971 $self->update;
997 } 972 }
998} 973}
999 974
975sub set_center {
976 my ($self, $x, $y) = @_;
977
978 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
979}
980
981sub make_visible {
982 my ($self, $x, $y, $border) = @_;
983
984 if ( $x < $self->{view_x} + $self->{w} * $border
985 || $x > $self->{view_x} + $self->{w} * (1 - $border)
986 || $y < $self->{view_y} + $self->{h} * $border
987 || $y > $self->{view_y} + $self->{h} * (1 - $border)
988 ) {
989 $self->set_center ($x, $y);
990 }
991}
992
1000# hmm, this does not work for topleft of $self... but we should not ask for that 993# hmm, this does not work for topleft of $self... but we should not ask for that
1001sub coord2local { 994sub coord2local {
1002 my ($self, $x, $y) = @_; 995 my ($self, $x, $y) = @_;
1003 996
1004 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 997 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1012 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1013 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1021 ) { 1014 ) {
1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1015 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1023 } else { 1016 } else {
1024 $self->CFPlus::UI::Base::find_widget ($x, $y) 1017 $self->DC::UI::Base::find_widget ($x, $y)
1025 } 1018 }
1026} 1019}
1027 1020
1028sub _render { 1021sub _render {
1029 my ($self) = @_; 1022 my ($self) = @_;
1030 1023
1031 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1024 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1032 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1025 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1033 1026
1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1027 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1035 1028
1036 $self->SUPER::_render; 1029 $self->SUPER::_render;
1037} 1030}
1038 1031
1039############################################################################# 1032#############################################################################
1040 1033
1041package CFPlus::UI::ScrolledWindow; 1034package DC::UI::ScrolledWindow;
1042 1035
1043our @ISA = CFPlus::UI::Table::; 1036our @ISA = DC::UI::Table::;
1044 1037
1045sub new { 1038sub new {
1046 my ($class, %arg) = @_; 1039 my ($class, %arg) = @_;
1047 1040
1048 my $child = delete $arg{child}; 1041 my $child = delete $arg{child};
1049 1042
1050 my $self; 1043 my $self;
1051 1044
1052 my $hslider = new CFPlus::UI::Slider 1045 my $hslider = new DC::UI::Slider
1053 col => 0, 1046 c_col => 0,
1054 row => 1, 1047 c_row => 1,
1055 vertical => 0, 1048 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub { 1050 on_changed => sub {
1058 $self->{hpos} = $_[1]; 1051 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 }, 1053 },
1061 ; 1054 ;
1062 1055
1063 my $vslider = new CFPlus::UI::Slider 1056 my $vslider = new DC::UI::Slider
1064 col => 1, 1057 c_col => 1,
1065 row => 0, 1058 c_row => 0,
1066 vertical => 1, 1059 vertical => 1,
1067 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
1068 on_changed => sub { 1061 on_changed => sub {
1069 $self->{vpos} = $_[1]; 1062 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 col_expand => [1, 0], 1073 col_expand => [1, 0],
1081 row_expand => [1, 0], 1074 row_expand => [1, 0],
1082 %arg, 1075 %arg,
1083 ); 1076 );
1084 1077
1085 $self->{vp} = new CFPlus::UI::ViewPort 1078 $self->{vp} = new DC::UI::ViewPort
1086 col => 0, 1079 c_col => 0,
1087 row => 0, 1080 c_row => 0,
1088 expand => 1, 1081 expand => 1,
1089 scroll_x => $self->{scroll_x}, 1082 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y}, 1083 scroll_y => $self->{scroll_y},
1091 on_changed => sub { 1084 on_changed => sub {
1092 my ($vp, $x, $y) = @_; 1085 my ($vp, $x, $y) = @_;
… …
1114 my ($self, $widget) = @_; 1107 my ($self, $widget) = @_;
1115 1108
1116 $self->{vp}->add ($self->{child} = $widget); 1109 $self->{vp}->add ($self->{child} = $widget);
1117} 1110}
1118 1111
1112sub set_offset { shift->{vp}->set_offset (@_) }
1113sub set_center { shift->{vp}->set_center (@_) }
1114sub make_visible { shift->{vp}->make_visible (@_) }
1115
1119sub update_slider { 1116sub update_slider {
1120 my ($self) = @_; 1117 my ($self) = @_;
1121 1118
1122 my $child = ($self->{vp} or return)->child; 1119 my $child = ($self->{vp} or return)->child;
1123 1120
… …
1212 $self->SUPER::invoke_size_allocate ($w, $h) 1209 $self->SUPER::invoke_size_allocate ($w, $h)
1213} 1210}
1214 1211
1215############################################################################# 1212#############################################################################
1216 1213
1217package CFPlus::UI::Frame; 1214package DC::UI::Frame;
1218 1215
1219our @ISA = CFPlus::UI::Bin::; 1216our @ISA = DC::UI::Bin::;
1220 1217
1221use CFPlus::OpenGL; 1218use DC::OpenGL;
1222 1219
1223sub new { 1220sub new {
1224 my $class = shift; 1221 my $class = shift;
1225 1222
1226 $class->SUPER::new ( 1223 $class->SUPER::new (
… …
1236 my ($w, $h) = @$self{qw(w h)}; 1233 my ($w, $h) = @$self{qw(w h)};
1237 1234
1238 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
1239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1240 glColor_premultiply @{ $self->{bg} }; 1237 glColor_premultiply @{ $self->{bg} };
1241
1242 glBegin GL_QUADS;
1243 glVertex 0 , 0;
1244 glVertex 0 , $h;
1245 glVertex $w, $h; 1238 glRect 0, 0, $w, $h;
1246 glVertex $w, 0;
1247 glEnd;
1248
1249 glDisable GL_BLEND; 1239 glDisable GL_BLEND;
1250 } 1240 }
1251 1241
1252 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1253} 1243}
1254 1244
1255############################################################################# 1245#############################################################################
1256 1246
1257package CFPlus::UI::FancyFrame; 1247package DC::UI::FancyFrame;
1258 1248
1259our @ISA = CFPlus::UI::Bin::; 1249our @ISA = DC::UI::Bin::;
1260 1250
1261use CFPlus::OpenGL; 1251use DC::OpenGL;
1262 1252
1263sub new { 1253sub new {
1264 my ($class, %arg) = @_; 1254 my ($class, %arg) = @_;
1265 1255
1266 if ((exists $arg{label}) && !ref $arg{label}) { 1256 if ((exists $arg{label}) && !ref $arg{label}) {
1267 $arg{label} = new CFPlus::UI::Label 1257 $arg{label} = new DC::UI::Label
1268 align => 1, 1258 align => 1,
1269 valign => 0, 1259 valign => 0.5,
1270 text => $arg{label}, 1260 text => $arg{label},
1271 fontsize => ($arg{border} || 0.8) * 0.75; 1261 fontsize => ($arg{border} || 0.8) * 0.75;
1272 } 1262 }
1273 1263
1274 my $self = $class->SUPER::new ( 1264 my $self = $class->SUPER::new (
1275 # label => "", 1265 # label => "",
1276 fg => [0.6, 0.3, 0.1], 1266 fg => undef,
1277 border => 0.8, 1267 border => 0.8,
1278 style => 'single', 1268 style => 'single',
1279 %arg, 1269 %arg,
1280 ); 1270 );
1281 1271
… …
1284 1274
1285sub add { 1275sub add {
1286 my ($self, @widgets) = @_; 1276 my ($self, @widgets) = @_;
1287 1277
1288 $self->SUPER::add (@widgets); 1278 $self->SUPER::add (@widgets);
1289 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1279 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1290} 1280}
1291 1281
1292sub border { 1282sub border {
1293 int $_[0]{border} * $::FONTSIZE 1283 int $_[0]{border} * $::FONTSIZE
1294} 1284}
… …
1334 my $border = $self->border; 1324 my $border = $self->border;
1335 my ($w, $h) = ($self->{w}, $self->{h}); 1325 my ($w, $h) = ($self->{w}, $self->{h});
1336 1326
1337 $child->draw; 1327 $child->draw;
1338 1328
1339 glColor @{$self->{fg}}; 1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1340 glBegin GL_LINE_STRIP; 1330 glBegin GL_LINE_STRIP;
1341 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1342 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1343 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1344 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1352 } 1342 }
1353} 1343}
1354 1344
1355############################################################################# 1345#############################################################################
1356 1346
1357package CFPlus::UI::Toplevel; 1347package DC::UI::Toplevel;
1358 1348
1359our @ISA = CFPlus::UI::Bin::; 1349our @ISA = DC::UI::Bin::;
1360 1350
1361use CFPlus::OpenGL; 1351use DC::OpenGL;
1362 1352
1363my $bg = 1353my $bg =
1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1365 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1366 1356
1367my @border = 1357my @border =
1368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1358 map { new_from_resource DC::Texture $_, mipmap => 1 }
1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1370 1360
1371my @icon = 1361my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png); 1363 qw(x1_move.png x1_resize.png);
1374 1364
1375sub new { 1365sub new {
1376 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1377 1367
1378 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1379 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1380 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1381 border => 0.6, 1371 border => 0.8,
1382 can_events => 1, 1372 can_events => 1,
1383 min_w => 64, 1373 min_w => 64,
1384 min_h => 32, 1374 min_h => 32,
1385 %arg, 1375 %arg,
1386 ); 1376 );
1387 1377
1388 $self->{title_widget} = new CFPlus::UI::Label 1378 $self->{title_widget} = new DC::UI::Label
1389 align => 0, 1379 align => 0.5,
1390 valign => 1, 1380 valign => 1,
1391 text => $self->{title}, 1381 text => $self->{title},
1392 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1393 if exists $self->{title}; 1383 if exists $self->{title};
1394 1384
1395 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1396 $self->{close_button} = 1386 $self->{close_button} =
1397 new CFPlus::UI::ImageButton 1387 new DC::UI::ImageButton
1398 path => 'x1_close.png', 1388 path => 'x1_close.png',
1399 on_activate => sub { $self->emit ("delete") }; 1389 on_activate => sub { $self->emit ("delete") };
1400 1390
1401 $self->CFPlus::UI::Container::add ($self->{close_button}); 1391 $self->DC::UI::Container::add ($self->{close_button});
1402 } 1392 }
1403 1393
1404 $self 1394 $self
1405} 1395}
1406 1396
1407sub add { 1397sub add {
1408 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1409 1399
1410 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1411 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1401 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1412 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1402 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1413} 1403}
1414 1404
1415sub border { 1405sub border {
1416 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1407}
1408
1409sub get_max_wh {
1410 my ($self) = @_;
1411
1412 return ($self->{w}, $self->{h})
1413 if $self->{visible} && $self->{w};
1414
1415 $self->SUPER::get_max_wh
1417} 1416}
1418 1417
1419sub size_request { 1418sub size_request {
1420 my ($self) = @_; 1419 my ($self) = @_;
1421 1420
… …
1546 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1548 1547
1549 my $border = $self->border; 1548 my $border = $self->border;
1550 1549
1550 if ($border) {
1551 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556 1556
1557 # move 1557 # move
1558 my $w2 = ($w - $border) * .5; 1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5; 1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563 1563
1564 # resize 1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button}; 1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1570 1571
1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1572 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1573 1574
1574 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
… …
1593 if $self->{close_button}; 1594 if $self->{close_button};
1594} 1595}
1595 1596
1596############################################################################# 1597#############################################################################
1597 1598
1598package CFPlus::UI::Table; 1599package DC::UI::Table;
1599 1600
1600our @ISA = CFPlus::UI::Container::; 1601our @ISA = DC::UI::Container::;
1601 1602
1602use List::Util qw(max sum); 1603use List::Util qw(max sum);
1603 1604
1604use CFPlus::OpenGL; 1605use DC::OpenGL;
1605 1606
1606sub new { 1607sub new {
1607 my $class = shift; 1608 my $class = shift;
1608 1609
1609 $class->SUPER::new ( 1610 $class->SUPER::new (
… …
1615 1616
1616sub add { 1617sub add {
1617 my ($self, @widgets) = @_; 1618 my ($self, @widgets) = @_;
1618 1619
1619 for my $child (@widgets) { 1620 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1; 1621 $child->{c_rowspan} ||= 1;
1621 $child->{colspan} ||= 1; 1622 $child->{c_colspan} ||= 1;
1622 } 1623 }
1623 1624
1624 $self->SUPER::add (@widgets); 1625 $self->SUPER::add (@widgets);
1625} 1626}
1626 1627
… …
1630 my @widgets; 1631 my @widgets;
1631 1632
1632 while (@_) { 1633 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, (); 1634 my ($col, $row, $child) = splice @_, 0, 3, ();
1634 1635
1635 $child->{row} = $row; 1636 $child->{c_row} = $row;
1636 $child->{col} = $col; 1637 $child->{c_col} = $col;
1637 1638
1638 push @widgets, $child; 1639 push @widgets, $child;
1639 } 1640 }
1640 1641
1641 $self->add (@widgets); 1642 $self->add (@widgets);
… …
1647 my (@w, @h); 1648 my (@w, @h);
1648 1649
1649 my @children = $self->children; 1650 my @children = $self->children;
1650 1651
1651 # first pass, columns 1652 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1653 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1654 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1654 1655
1655 my $sw = sum @w[$c .. $c + $cs - 1]; 1656 my $sw = sum @w[$c .. $c + $cs - 1];
1656 1657
1657 if ($w > $sw) { 1658 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1659 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 } 1660 }
1660 } 1661 }
1661 1662
1662 # second pass, rows 1663 # second pass, rows
1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1664 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1665 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1665 1666
1666 my $sh = sum @h[$r .. $r + $rs - 1]; 1667 my $sh = sum @h[$r .. $r + $rs - 1];
1667 1668
1668 if ($h > $sh) { 1669 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1670 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1670 } 1671 }
1671 } 1672 }
1672 1673
1673 (\@w, \@h) 1674 (\@w, \@h)
1674} 1675}
… …
1697 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1698 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1699 1700
1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1701 1702
1702 CFPlus::UI::harmonize $ws; 1703 DC::UI::harmonize $ws;
1703 1704
1704 my @row_expand = @{$self->{row_expand}}; 1705 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand; 1706 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1; 1707 my $row_expand = (sum @row_expand) || 1;
1707 1708
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709 1710
1710 CFPlus::UI::harmonize $hs; 1711 DC::UI::harmonize $hs;
1711 1712
1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1713 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1714 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1715
1715 for my $widget ($self->children) { 1716 for my $widget ($self->children) {
1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1717 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1717 1718
1718 $widget->configure ( 1719 $widget->configure (
1719 $x[$c], $y[$r], 1720 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1721 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 ); 1722 );
… …
1724 1 1725 1
1725} 1726}
1726 1727
1727############################################################################# 1728#############################################################################
1728 1729
1729package CFPlus::UI::Fixed; 1730package DC::UI::Fixed;
1730 1731
1731use List::Util qw(min max); 1732use List::Util qw(min max);
1732 1733
1733our @ISA = CFPlus::UI::Container::; 1734our @ISA = DC::UI::Container::;
1734
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741 1735
1742sub _scale($$$) { 1736sub _scale($$$) {
1743 my ($mode, $val, $max) = @_; 1737 my ($rel, $val, $max) = @_;
1744 1738
1745 $mode eq "abs" ? $val 1739 $rel ? $val * $max : $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748} 1740}
1749 1741
1750sub size_request { 1742sub size_request {
1751 my ($self) = @_; 1743 my ($self) = @_;
1752 1744
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754 1746
1755 # determine overall size by querying abs widgets 1747 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) { 1748 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1749 unless ($child->{c_rel}) {
1750 my $x = $child->{c_x};
1751 my $y = $child->{c_y};
1758 1752
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 } 1755 }
1766 } 1756 }
1767 1757
1768 my $W = $x2 - $x1; 1758 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1; 1759 my $H = $y2 - $y1;
1770 1760
1771 # now layout remaining widgets 1761 # now layout remaining widgets
1772 for my $child ($self->visible_children) { 1762 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1763 if ($child->{c_rel}) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1774 1766
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783 } 1769 }
1784 } 1770 }
1785 1771
1786 my $W = $x2 - $x1; 1772 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1; 1773 my $H = $y2 - $y1;
… …
1791 1777
1792sub invoke_size_allocate { 1778sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_; 1779 my ($self, $W, $H) = @_;
1794 1780
1795 for my $child ($self->visible_children) { 1781 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1782 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1783 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1797 1784
1798 $x = _scale $pos, $x, $W; 1785 $x += $child->{c_halign} * $child->{req_w};
1799 $y = _scale $pos, $x, $H; 1786 $y += $child->{c_valign} * $child->{req_h};
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1802 1787
1803 $child->configure ($x, $y, $w, $h); 1788 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804 } 1789 }
1805 1790
1806 1 1791 1
1807} 1792}
1808 1793
1809############################################################################# 1794#############################################################################
1810 1795
1811package CFPlus::UI::Box; 1796package DC::UI::Box;
1812 1797
1813our @ISA = CFPlus::UI::Container::; 1798our @ISA = DC::UI::Container::;
1814 1799
1815sub size_request { 1800sub size_request {
1816 my ($self) = @_; 1801 my ($self) = @_;
1802
1803 my @children = $self->visible_children;
1817 1804
1818 $self->{vertical} 1805 $self->{vertical}
1819 ? ( 1806 ? (
1820 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1807 (List::Util::max map $_->{req_w}, @children),
1821 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1808 (List::Util::sum map $_->{req_h}, @children),
1822 ) 1809 )
1823 : ( 1810 : (
1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1811 (List::Util::sum map $_->{req_w}, @children),
1825 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1812 (List::Util::max map $_->{req_h}, @children),
1826 ) 1813 )
1827} 1814}
1828 1815
1829sub invoke_size_allocate { 1816sub invoke_size_allocate {
1830 my ($self, $w, $h) = @_; 1817 my ($self, $w, $h) = @_;
… …
1851 $req[$_] += $space * $children[$_]{expand} 1838 $req[$_] += $space * $children[$_]{expand}
1852 for 0 .. $#children; 1839 for 0 .. $#children;
1853 } 1840 }
1854 } 1841 }
1855 1842
1856 CFPlus::UI::harmonize \@req; 1843 DC::UI::harmonize \@req;
1857 1844
1858 my $pos = 0; 1845 my $pos = 0;
1859 for (0 .. $#children) { 1846 for (0 .. $#children) {
1860 my $alloc = $req[$_]; 1847 my $alloc = $req[$_];
1861 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1848 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1866 1 1853 1
1867} 1854}
1868 1855
1869############################################################################# 1856#############################################################################
1870 1857
1871package CFPlus::UI::HBox; 1858package DC::UI::HBox;
1872 1859
1873our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1874 1861
1875sub new { 1862sub new {
1876 my $class = shift; 1863 my $class = shift;
1877 1864
1878 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1881 ) 1868 )
1882} 1869}
1883 1870
1884############################################################################# 1871#############################################################################
1885 1872
1886package CFPlus::UI::VBox; 1873package DC::UI::VBox;
1887 1874
1888our @ISA = CFPlus::UI::Box::; 1875our @ISA = DC::UI::Box::;
1889 1876
1890sub new { 1877sub new {
1891 my $class = shift; 1878 my $class = shift;
1892 1879
1893 $class->SUPER::new ( 1880 $class->SUPER::new (
… …
1896 ) 1883 )
1897} 1884}
1898 1885
1899############################################################################# 1886#############################################################################
1900 1887
1901package CFPlus::UI::Label; 1888package DC::UI::Label;
1902 1889
1903our @ISA = CFPlus::UI::DrawBG::; 1890our @ISA = DC::UI::DrawBG::;
1904 1891
1905use CFPlus::OpenGL; 1892use DC::OpenGL;
1906 1893
1907sub new { 1894sub new {
1908 my ($class, %arg) = @_; 1895 my ($class, %arg) = @_;
1909 1896
1910 my $self = $class->SUPER::new ( 1897 my $self = $class->SUPER::new (
… …
1915 #text => initial text 1902 #text => initial text
1916 #markup => initial narkup 1903 #markup => initial narkup
1917 #max_w => maximum pixel width 1904 #max_w => maximum pixel width
1918 #style => 0, # render flags 1905 #style => 0, # render flags
1919 ellipsise => 3, # end 1906 ellipsise => 3, # end
1920 layout => (new CFPlus::Layout), 1907 layout => (new DC::Layout),
1921 fontsize => 1, 1908 fontsize => 1,
1922 align => -1, 1909 align => 0.5,
1923 valign => -1, 1910 valign => 0.5,
1924 padding_x => 2, 1911 padding_x => 4,
1925 padding_y => 2, 1912 padding_y => 2,
1926 can_events => 0, 1913 can_events => 0,
1927 %arg 1914 %arg
1928 ); 1915 );
1929 1916
1930 if (exists $self->{template}) { 1917 if (exists $self->{template}) {
1931 my $layout = new CFPlus::Layout; 1918 my $layout = new DC::Layout;
1932 $layout->set_text (delete $self->{template}); 1919 $layout->set_text (delete $self->{template});
1933 $self->{template} = $layout; 1920 $self->{template} = $layout;
1934 } 1921 }
1935 1922
1936 if (exists $self->{markup}) { 1923 if (exists $self->{markup}) {
… …
1954 1941
1955 delete $self->{ox}; 1942 delete $self->{ox};
1956 $self->SUPER::realloc; 1943 $self->SUPER::realloc;
1957} 1944}
1958 1945
1946sub clear {
1947 my ($self) = @_;
1948
1949 $self->set_text ("");
1950}
1951
1959sub set_text { 1952sub set_text {
1960 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1961 1954
1962 return if $self->{text} eq "T$text"; 1955 return if $self->{text} eq "T$text";
1963 $self->{text} = "T$text"; 1956 $self->{text} = "T$text";
… …
1986 1979
1987sub size_request { 1980sub size_request {
1988 my ($self) = @_; 1981 my ($self) = @_;
1989 1982
1990 $self->{size_req} ||= do { 1983 $self->{size_req} ||= do {
1984 my ($max_w, $max_h) = $self->get_max_wh;
1985
1991 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1992 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($max_w);
1993 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1994 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1995 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1996 1991
1997 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1998 1993
1999 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
2000 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
2001 $self->{template}->set_width ($self->{max_w} || -1); 1996 $self->{template}->set_width ($max_w);
2002 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2003 1998
2004 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
2005 2000
2006 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
2062 2057
2063 [$self->{layout}->size] 2058 [$self->{layout}->size]
2064 }; 2059 };
2065 2060
2066 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
2067 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2068 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2063 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2069 : ($self->{w} - $size->[0]) * 0.5);
2070 2064
2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2073 : ($self->{h} - $size->[1]) * 0.5);
2074 }; 2066 };
2075 2067
2076 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2068# unless ($self->{list}) {
2077 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2069# $self->{list} = DC::OpenGL::glGenList;
2078 2070# DC::OpenGL::glNewList $self->{list};
2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2071# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2072# DC::OpenGL::glEndList;
2073# }
2074#
2075# DC::OpenGL::glCallList $self->{list};
2076
2077 $self->{layout}->draw;
2080} 2078}
2079
2080#sub destroy {
2081# my ($self) = @_;
2082#
2083# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2084#
2085# $self->SUPER::destroy;
2086#}
2081 2087
2082############################################################################# 2088#############################################################################
2083 2089
2084package CFPlus::UI::EntryBase; 2090package DC::UI::EntryBase;
2085 2091
2086our @ISA = CFPlus::UI::Label::; 2092our @ISA = DC::UI::Label::;
2087 2093
2088use CFPlus::OpenGL; 2094use DC::OpenGL;
2089 2095
2090sub new { 2096sub new {
2091 my $class = shift; 2097 my $class = shift;
2092 2098
2093 $class->SUPER::new ( 2099 $class->SUPER::new (
2094 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
2095 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2102 outline => undef,
2096 active_bg => [1, 1, 1, 0.5], 2103 active_bg => [0, 0, 1, .2],
2097 active_fg => [0, 0, 0], 2104 active_fg => [1, 1, 1],
2105 active_outline => [1, 1, 0],
2098 can_hover => 1, 2106 can_hover => 1,
2099 can_focus => 1, 2107 can_focus => 1,
2108 align => 0,
2100 valign => 0, 2109 valign => 0.5,
2101 can_events => 1, 2110 can_events => 1,
2102 ellipsise => 0, 2111 ellipsise => 0,
2112 padding_x => 4,
2113 padding_y => 2,
2103 #text => ... 2114 #text => ...
2104 #hidden => "*", 2115 #hidden => "*",
2105 @_ 2116 @_
2106 ) 2117 )
2107} 2118}
… …
2154 2165
2155 my $text = $self->get_text; 2166 my $text = $self->get_text;
2156 2167
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2168 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2158 2169
2159 if ($uni == 8) { 2170 if ($sym == DC::SDLK_BACKSPACE) {
2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2161 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
2162 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
2163 } elsif ($sym == CFPlus::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
2164 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
2165 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
2166 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2167 } elsif ($sym == CFPlus::SDLK_HOME) { 2178 } elsif ($sym == DC::SDLK_HOME) {
2168 # what a hack 2179 # what a hack
2169 $self->{cursor} = 2180 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2181 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1 2182 ? length $1
2172 : 0; 2183 : 0;
2173 } elsif ($sym == CFPlus::SDLK_END) { 2184 } elsif ($sym == DC::SDLK_END) {
2174 # uh, again 2185 # uh, again
2175 $self->{cursor} = 2186 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2187 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1 2188 ? $self->{cursor} + length $1
2178 : length $self->{text}; 2189 : length $self->{text};
… …
2242 glColor_premultiply @{$self->{bg}}; 2253 glColor_premultiply @{$self->{bg}};
2243 } 2254 }
2244 2255
2245 glEnable GL_BLEND; 2256 glEnable GL_BLEND;
2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2257 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glBegin GL_QUADS;
2248 glVertex 0 , 0;
2249 glVertex 0 , $self->{h};
2250 glVertex $self->{w}, $self->{h}; 2258 glRect 0, 0, $self->{w}, $self->{h};
2251 glVertex $self->{w}, 0;
2252 glEnd;
2253 glDisable GL_BLEND; 2259 glDisable GL_BLEND;
2254 2260
2255 $self->SUPER::_draw; 2261 $self->SUPER::_draw;
2256 2262
2257 #TODO: force update every cursor change :( 2263 #TODO: force update every cursor change :(
… …
2259 2265
2260 unless (exists $self->{cur_h}) { 2266 unless (exists $self->{cur_h}) {
2261 my $text = substr $self->{text}, 0, $self->{cursor}; 2267 my $text = substr $self->{text}, 0, $self->{cursor};
2262 utf8::encode $text; 2268 utf8::encode $text;
2263 2269
2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2265 } 2271 }
2266 2272
2273 glColor_premultiply @{$self->{active_fg}};
2267 glBegin GL_LINES; 2274 glBegin GL_LINES;
2268 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2270 glEnd; 2277 glEnd;
2278
2279 glLineWidth 3;
2280 glColor @{$self->{active_outline}};
2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2282 glLineWidth 1;
2283
2284 } else {
2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2286 glBegin GL_LINE_STRIP;
2287 glVertex .5, $self->{h} * .5;
2288 glVertex .5, $self->{h} - 2.5;
2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2290 glVertex $self->{w} - .5, $self->{h} * .5;
2291 glEnd;
2271 } 2292 }
2272} 2293}
2273 2294
2274############################################################################# 2295#############################################################################
2275 2296
2276package CFPlus::UI::Entry; 2297package DC::UI::Entry;
2277 2298
2278our @ISA = CFPlus::UI::EntryBase::; 2299our @ISA = DC::UI::EntryBase::;
2279 2300
2280use CFPlus::OpenGL; 2301use DC::OpenGL;
2302
2303sub new {
2304 my $class = shift;
2305
2306 $class->SUPER::new (
2307 history_pointer => -1,
2308 @_
2309 )
2310}
2311
2281 2312
2282sub invoke_key_down { 2313sub invoke_key_down {
2283 my ($self, $ev) = @_; 2314 my ($self, $ev) = @_;
2284 2315
2285 my $sym = $ev->{sym}; 2316 my $sym = $ev->{sym};
… …
2291 $self->{history_pointer} = -1; 2322 $self->{history_pointer} = -1;
2292 $self->{history_saveback} = ''; 2323 $self->{history_saveback} = '';
2293 $self->emit (activate => $txt); 2324 $self->emit (activate => $txt);
2294 $self->update; 2325 $self->update;
2295 2326
2296 } elsif ($sym == CFPlus::SDLK_UP) { 2327 } elsif ($sym == DC::SDLK_UP) {
2297 if ($self->{history_pointer} < 0) { 2328 if ($self->{history_pointer} < 0) {
2298 $self->{history_saveback} = $self->get_text; 2329 $self->{history_saveback} = $self->get_text;
2299 } 2330 }
2300 if (@{$self->{history} || []} > 0) { 2331 if (@{$self->{history} || []} > 0) {
2301 $self->{history_pointer}++; 2332 $self->{history_pointer}++;
… …
2303 $self->{history_pointer} = @{$self->{history} || []} - 1; 2334 $self->{history_pointer} = @{$self->{history} || []} - 1;
2304 } 2335 }
2305 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2336 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2306 } 2337 }
2307 2338
2308 } elsif ($sym == CFPlus::SDLK_DOWN) { 2339 } elsif ($sym == DC::SDLK_DOWN) {
2309 $self->{history_pointer}--; 2340 $self->{history_pointer}--;
2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2341 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2311 2342
2312 if ($self->{history_pointer} >= 0) { 2343 if ($self->{history_pointer} >= 0) {
2313 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2314 } else { 2345 } else {
2346 if (defined $self->{history_saveback}) {
2315 $self->set_text ($self->{history_saveback}); 2347 $self->set_text ($self->{history_saveback});
2348 $self->{history_saveback} = undef;
2349 }
2316 } 2350 }
2317 2351
2318 } else { 2352 } else {
2319 return $self->SUPER::invoke_key_down ($ev) 2353 return $self->SUPER::invoke_key_down ($ev)
2320 } 2354 }
… …
2322 1 2356 1
2323} 2357}
2324 2358
2325############################################################################# 2359#############################################################################
2326 2360
2327package CFPlus::UI::TextEdit; 2361package DC::UI::TextEdit;
2328 2362
2329our @ISA = CFPlus::UI::EntryBase::; 2363our @ISA = DC::UI::EntryBase::;
2330 2364
2331use CFPlus::OpenGL; 2365use DC::OpenGL;
2366
2367sub new {
2368 my $class = shift;
2369
2370 $class->SUPER::new (
2371 padding_y => 4,
2372
2373 @_
2374 )
2375}
2332 2376
2333sub move_cursor_ver { 2377sub move_cursor_ver {
2334 my ($self, $dy) = @_; 2378 my ($self, $dy) = @_;
2335 2379
2336 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2380 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2337 2381
2338 $y += $dy; 2382 $line += $dy;
2339 2383
2340 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2384 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2341 $self->{cursor} = $index; 2385 $self->{cursor} = $index;
2342 delete $self->{cur_h}; 2386 delete $self->{cur_h};
2343 $self->update; 2387 $self->update;
2344 return; 2388 return;
2345 } 2389 }
… …
2348sub invoke_key_down { 2392sub invoke_key_down {
2349 my ($self, $ev) = @_; 2393 my ($self, $ev) = @_;
2350 2394
2351 my $sym = $ev->{sym}; 2395 my $sym = $ev->{sym};
2352 2396
2353 if ($sym == CFPlus::SDLK_UP) { 2397 if ($sym == DC::SDLK_UP) {
2354 $self->move_cursor_ver (-1); 2398 $self->move_cursor_ver (-1);
2355 } elsif ($sym == CFPlus::SDLK_DOWN) { 2399 } elsif ($sym == DC::SDLK_DOWN) {
2356 $self->move_cursor_ver (+1); 2400 $self->move_cursor_ver (+1);
2357 } else { 2401 } else {
2358 return $self->SUPER::invoke_key_down ($ev) 2402 return $self->SUPER::invoke_key_down ($ev)
2359 } 2403 }
2360 2404
2361 1 2405 1
2362} 2406}
2363 2407
2364############################################################################# 2408#############################################################################
2365 2409
2366package CFPlus::UI::Button; 2410package DC::UI::ButtonBin;
2367 2411
2368our @ISA = CFPlus::UI::Label::; 2412our @ISA = DC::UI::Bin::;
2369 2413
2370use CFPlus::OpenGL; 2414use DC::OpenGL;
2371 2415
2372my @tex = 2416my @tex =
2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2374 qw(b1_button_inactive.png b1_button_active.png); 2418 qw(b1_button_inactive.png b1_button_active.png);
2375 2419
2376sub new { 2420sub new {
2377 my $class = shift; 2421 my $class = shift;
2378 2422
2379 $class->SUPER::new ( 2423 $class->SUPER::new (
2424 can_hover => 1,
2425 align => 0.5,
2426 valign => 0.5,
2427 can_events => 1,
2428 @_
2429 )
2430}
2431
2432sub invoke_button_up {
2433 my ($self, $ev, $x, $y) = @_;
2434
2435 $self->emit ("activate")
2436 if $x >= 0 && $x < $self->{w}
2437 && $y >= 0 && $y < $self->{h};
2438
2439 1
2440}
2441
2442sub _draw {
2443 my ($self) = @_;
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2451
2452 glDisable GL_TEXTURE_2D;
2453
2454 $self->SUPER::_draw;
2455}
2456
2457#############################################################################
2458
2459package DC::UI::Button;
2460
2461our @ISA = DC::UI::Label::;
2462
2463use DC::OpenGL;
2464
2465my @tex =
2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2467 qw(b1_button_inactive.png b1_button_active.png);
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2380 padding_x => 4, 2473 padding_x => 8,
2381 padding_y => 4, 2474 padding_y => 4,
2382 fg => [1.0, 1.0, 1.0], 2475 fg => [1.0, 1.0, 1.0],
2383 active_fg => [0.8, 0.8, 0.8], 2476 active_fg => [0.8, 0.8, 0.8],
2384 can_hover => 1, 2477 can_hover => 1,
2385 align => 0, 2478 align => 0.5,
2386 valign => 0, 2479 valign => 0.5,
2387 can_events => 1, 2480 can_events => 1,
2388 @_ 2481 @_
2389 ) 2482 )
2390} 2483}
2391 2484
… …
2416 $self->SUPER::_draw; 2509 $self->SUPER::_draw;
2417} 2510}
2418 2511
2419############################################################################# 2512#############################################################################
2420 2513
2421package CFPlus::UI::CheckBox; 2514package DC::UI::CheckBox;
2422 2515
2423our @ISA = CFPlus::UI::DrawBG::; 2516our @ISA = DC::UI::DrawBG::;
2424 2517
2425my @tex = 2518my @tex =
2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2427 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2428 2521
2429use CFPlus::OpenGL; 2522use DC::OpenGL;
2430 2523
2431sub new { 2524sub new {
2432 my $class = shift; 2525 my $class = shift;
2433 2526
2434 $class->SUPER::new ( 2527 $class->SUPER::new (
2528 fontsize => 1,
2435 padding_x => 2, 2529 padding_x => 2,
2436 padding_y => 2, 2530 padding_y => 2,
2437 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2438 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2439 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
… …
2445} 2539}
2446 2540
2447sub size_request { 2541sub size_request {
2448 my ($self) = @_; 2542 my ($self) = @_;
2449 2543
2450 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2451} 2545}
2452 2546
2453sub toggle { 2547sub toggle {
2454 my ($self) = @_; 2548 my ($self) = @_;
2455 2549
… …
2474sub _draw { 2568sub _draw {
2475 my ($self) = @_; 2569 my ($self) = @_;
2476 2570
2477 $self->SUPER::_draw; 2571 $self->SUPER::_draw;
2478 2572
2479 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2573 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2480 2574
2481 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2482 2576
2483 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2577 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2484 2578
… …
2491 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2492} 2586}
2493 2587
2494############################################################################# 2588#############################################################################
2495 2589
2496package CFPlus::UI::Image; 2590package DC::UI::Image;
2497 2591
2498our @ISA = CFPlus::UI::Base::; 2592our @ISA = DC::UI::Base::;
2499 2593
2500use CFPlus::OpenGL; 2594use DC::OpenGL;
2501 2595
2502our %texture_cache; 2596our %texture_cache;
2503 2597
2504sub new { 2598sub new {
2505 my $class = shift; 2599 my $class = shift;
2506 2600
2507 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2508 can_events => 0, 2602 can_events => 0,
2603 scale => 1,
2509 @_, 2604 @_,
2510 ); 2605 );
2511 2606
2512 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2514 2609
2515 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2517 2612
2518 CFPlus::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2519 2614
2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2521 2616
2522 $self 2617 $self
2523} 2618}
2524 2619
2525sub STORABLE_freeze { 2620sub STORABLE_freeze {
2526 my ($self, $cloning) = @_; 2621 my ($self, $cloning) = @_;
2527 2622
2528 $self->{path} 2623 $self->{path}
2529 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2624 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2530 2625
2531 $self->{path} 2626 $self->{path}
2532} 2627}
2533 2628
2534sub STORABLE_attach { 2629sub STORABLE_attach {
… …
2538} 2633}
2539 2634
2540sub size_request { 2635sub size_request {
2541 my ($self) = @_; 2636 my ($self) = @_;
2542 2637
2543 ($self->{tex}{w}, $self->{tex}{h}) 2638 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2544} 2639}
2545 2640
2546sub _draw { 2641sub _draw {
2547 my ($self) = @_; 2642 my ($self) = @_;
2548 2643
… …
2558 } 2653 }
2559 2654
2560 glEnable GL_TEXTURE_2D; 2655 glEnable GL_TEXTURE_2D;
2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562 2657
2563 $tex->draw_quad (0, 0, $w, $h); 2658 $tex->draw_quad_alpha (0, 0, $w, $h);
2564 2659
2565 glDisable GL_TEXTURE_2D; 2660 glDisable GL_TEXTURE_2D;
2566} 2661}
2567 2662
2568############################################################################# 2663#############################################################################
2569 2664
2570package CFPlus::UI::ImageButton; 2665package DC::UI::ImageButton;
2571 2666
2572our @ISA = CFPlus::UI::Image::; 2667our @ISA = DC::UI::Image::;
2573 2668
2574use CFPlus::OpenGL; 2669use DC::OpenGL;
2575 2670
2576my %textures; 2671my %textures;
2577 2672
2578sub new { 2673sub new {
2579 my $class = shift; 2674 my $class = shift;
… …
2582 padding_x => 4, 2677 padding_x => 4,
2583 padding_y => 4, 2678 padding_y => 4,
2584 fg => [1, 1, 1], 2679 fg => [1, 1, 1],
2585 active_fg => [0, 0, 1], 2680 active_fg => [0, 0, 1],
2586 can_hover => 1, 2681 can_hover => 1,
2587 align => 0, 2682 align => 0.5,
2588 valign => 0, 2683 valign => 0.5,
2589 can_events => 1, 2684 can_events => 1,
2590 @_ 2685 @_
2591 ); 2686 );
2592} 2687}
2593 2688
2689sub invoke_button_down {
2690 my ($self, $ev, $x, $y) = @_;
2691
2692 1
2693}
2694
2594sub invoke_button_up { 2695sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_; 2696 my ($self, $ev, $x, $y) = @_;
2596 2697
2597 $self->emit ("activate") 2698 $self->emit ("activate")
2598 if $x >= 0 && $x < $self->{w} 2699 if $x >= 0 && $x < $self->{w}
… …
2601 1 2702 1
2602} 2703}
2603 2704
2604############################################################################# 2705#############################################################################
2605 2706
2606package CFPlus::UI::VGauge; 2707package DC::UI::VGauge;
2607 2708
2608our @ISA = CFPlus::UI::Base::; 2709our @ISA = DC::UI::Base::;
2609 2710
2610use List::Util qw(min max); 2711use List::Util qw(min max);
2611 2712
2612use CFPlus::OpenGL; 2713use DC::OpenGL;
2613 2714
2614my %tex = ( 2715my %tex = (
2615 food => [ 2716 food => [
2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2618 ], 2719 ],
2619 grace => [ 2720 grace => [
2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2621 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2722 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2622 ], 2723 ],
2623 hp => [ 2724 hp => [
2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2626 ], 2727 ],
2627 mana => [ 2728 mana => [
2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2729 map { new_from_resource DC::Texture $_, mipmap => 1 }
2629 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2730 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2630 ], 2731 ],
2631); 2732);
2632 2733
2633# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2736 glDisable GL_TEXTURE_2D; 2837 glDisable GL_TEXTURE_2D;
2737} 2838}
2738 2839
2739############################################################################# 2840#############################################################################
2740 2841
2842package DC::UI::Progress;
2843
2844our @ISA = DC::UI::Label::;
2845
2846use DC::OpenGL;
2847
2848sub new {
2849 my ($class, %arg) = @_;
2850
2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2854 fg => [1, 1, 1],
2855 bg => [0, 0, 1, 0.2],
2856 bar => [0.7, 0.5, 0.1, 0.8],
2857 outline => [0.4, 0.3, 0],
2858 fontsize => 0.9,
2859 valign => 0.5,
2860 align => 0.5,
2861 can_events => 1,
2862 ellipsise => 1,
2863 label => "%d%%",
2864 %arg,
2865 );
2866
2867 $self->set_value ($arg{value} || -1);
2868
2869 $self
2870}
2871
2872sub set_label {
2873 my ($self, $label) = @_;
2874
2875 return if $self->{label} eq $label;
2876 $self->{label} = $label;
2877
2878 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2879}
2880
2881sub set_value {
2882 my ($self, $value) = @_;
2883
2884 if ($self->{value} ne $value) {
2885 $self->{value} = $value;
2886
2887 if ($value < 0) {
2888 $self->set_text ("-");
2889 } else {
2890 $self->set_text (sprintf $self->{label}, $value * 100);
2891 }
2892
2893 $self->update;
2894 }
2895}
2896
2897sub _draw {
2898 my ($self) = @_;
2899
2900 glEnable GL_BLEND;
2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2906 if ($self->{value} >= 0) {
2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2908
2909 glColor_premultiply @{$self->{bar}};
2910 glRect $px, $py, $s, $self->{h} - $py;
2911 glColor_premultiply @{$self->{bg}};
2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2913 }
2914
2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2921
2922 glDisable GL_BLEND;
2923
2924 {
2925 local $self->{bg}; # do not draw background
2926 $self->SUPER::_draw;
2927 }
2928}
2929
2930#############################################################################
2931
2932package DC::UI::ExperienceProgress;
2933
2934our @ISA = DC::UI::Progress::;
2935
2936sub new {
2937 my ($class, %arg) = @_;
2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2941 my $self = $class->SUPER::new (
2942 %arg,
2943 tooltip => sub {
2944 my ($self) = @_;
2945
2946 sprintf "%slevel %d\n%s points\n%s next level\n%s to go / %d%%",
2947 $tt,
2948 $self->{lvl},
2949 ::formsep ($self->{exp}),
2950 ::formsep ($self->{nxt}),
2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2953 },
2954 );
2955
2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2957 if $::CONN;
2958
2959 $self
2960}
2961
2962sub DESTROY {
2963 my ($self) = @_;
2964
2965 delete $::CONN->{on_exp_update}{$self+0}
2966 if $::CONN;
2967
2968 $self->SUPER::DESTROY;
2969}
2970
2971sub _percent {
2972 my ($self) = @_;
2973
2974 my $table = $::CONN && $::CONN->{exp_table}
2975 or return -1;
2976
2977 my $l0 = $table->[$self->{lvl} - 1];
2978 my $l1 = $table->[$self->{lvl}];
2979
2980 $self->{nxt} = $l1;
2981
2982 ($self->{exp} - $l0) / ($l1 - $l0)
2983}
2984
2985sub set_value {
2986 my ($self, $lvl, $exp) = @_;
2987
2988 $self->{lvl} = $lvl;
2989 $self->{exp} = $exp;
2990
2991 $self->SUPER::set_value ($self->_percent);
2992}
2993
2994#############################################################################
2995
2741package CFPlus::UI::Gauge; 2996package DC::UI::Gauge;
2742 2997
2743our @ISA = CFPlus::UI::VBox::; 2998our @ISA = DC::UI::VBox::;
2744 2999
2745sub new { 3000sub new {
2746 my ($class, %arg) = @_; 3001 my ($class, %arg) = @_;
2747 3002
2748 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
… …
2750 can_hover => 1, 3005 can_hover => 1,
2751 can_events => 1, 3006 can_events => 1,
2752 %arg, 3007 %arg,
2753 ); 3008 );
2754 3009
2755 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3010 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2756 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3011 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2757 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3012 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2758 3013
2759 $self 3014 $self
2760} 3015}
2761 3016
2762sub set_fontsize { 3017sub set_fontsize {
… …
2783 $self->{value}->set_text ($val); 3038 $self->{value}->set_text ($val);
2784} 3039}
2785 3040
2786############################################################################# 3041#############################################################################
2787 3042
2788package CFPlus::UI::Slider; 3043package DC::UI::Slider;
2789 3044
2790use strict; 3045use strict;
2791 3046
2792use CFPlus::OpenGL; 3047use DC::OpenGL;
2793 3048
2794our @ISA = CFPlus::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
2795 3050
2796my @tex = 3051my @tex =
2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
2798 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
2799 3054
2800sub new { 3055sub new {
2801 my $class = shift; 3056 my $class = shift;
2802 3057
… …
2839sub set_value { 3094sub set_value {
2840 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
2841 3096
2842 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2843 3098
2844 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
2845 3100
2846 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
2847
2848 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
2849 $value = $hi - $page if $value > $hi - $page;
2850 3103
2851 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2852 if $unit; 3105 if $unit;
2853 3106
2854 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2870 3123
2871 $self->SUPER::invoke_button_down ($ev, $x, $y); 3124 $self->SUPER::invoke_button_down ($ev, $x, $y);
2872 3125
2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3126 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874 3127
2875 $self->invoke_mouse_motion ($ev, $x, $y) 3128 $self->invoke_mouse_motion ($ev, $x, $y);
3129
3130 1
2876} 3131}
2877 3132
2878sub invoke_mouse_motion { 3133sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3134 my ($self, $ev, $x, $y) = @_;
2880 3135
… …
2896sub invoke_mouse_wheel { 3151sub invoke_mouse_wheel {
2897 my ($self, $ev) = @_; 3152 my ($self, $ev) = @_;
2898 3153
2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3154 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2900 3155
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3156 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2902 3157
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3158 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904 3159
2905 ! ! $delta 3160 1
2906} 3161}
2907 3162
2908sub update { 3163sub update {
2909 my ($self) = @_; 3164 my ($self) = @_;
2910 3165
… …
2916 my ($self) = @_; 3171 my ($self) = @_;
2917 3172
2918 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
2919 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
2920 3175
2921 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2922 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
2923 3178
2924 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3179 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2925 3180
2926 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3181 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2927 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2928 3183
2929 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
… …
2959 glDisable GL_TEXTURE_2D; 3214 glDisable GL_TEXTURE_2D;
2960} 3215}
2961 3216
2962############################################################################# 3217#############################################################################
2963 3218
2964package CFPlus::UI::ValSlider; 3219package DC::UI::ValSlider;
2965 3220
2966our @ISA = CFPlus::UI::HBox::; 3221our @ISA = DC::UI::HBox::;
2967 3222
2968sub new { 3223sub new {
2969 my ($class, %arg) = @_; 3224 my ($class, %arg) = @_;
2970 3225
2971 my $range = delete $arg{range}; 3226 my $range = delete $arg{range};
2972 3227
2973 my $self = $class->SUPER::new ( 3228 my $self = $class->SUPER::new (
2974 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3229 slider => (new DC::UI::Slider expand => 1, range => $range),
2975 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3230 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2976 to_value => sub { shift }, 3231 to_value => sub { shift },
2977 from_value => sub { shift }, 3232 from_value => sub { shift },
2978 %arg, 3233 %arg,
2979 ); 3234 );
2980 3235
… …
3000sub set_range { shift->{slider}->set_range (@_) } 3255sub set_range { shift->{slider}->set_range (@_) }
3001sub set_value { shift->{slider}->set_value (@_) } 3256sub set_value { shift->{slider}->set_value (@_) }
3002 3257
3003############################################################################# 3258#############################################################################
3004 3259
3005package CFPlus::UI::TextScroller; 3260package DC::UI::TextScroller;
3006 3261
3007our @ISA = CFPlus::UI::HBox::; 3262our @ISA = DC::UI::HBox::;
3008 3263
3009use CFPlus::OpenGL; 3264use DC::OpenGL;
3010 3265
3011sub new { 3266sub new {
3012 my $class = shift; 3267 my $class = shift;
3013 3268
3014 my $self = $class->SUPER::new ( 3269 my $self = $class->SUPER::new (
… …
3016 can_events => 1, 3271 can_events => 1,
3017 indent => 0, 3272 indent => 0,
3018 #font => default_font 3273 #font => default_font
3019 @_, 3274 @_,
3020 3275
3021 layout => (new CFPlus::Layout), 3276 layout => (new DC::Layout),
3022 par => [], 3277 par => [],
3023 max_par => 0, 3278 max_par => 0,
3024 height => 0, 3279 height => 0,
3025 children => [ 3280 children => [
3026 (new CFPlus::UI::Empty expand => 1), 3281 (new DC::UI::Empty expand => 1),
3027 (new CFPlus::UI::Slider vertical => 1), 3282 (new DC::UI::Slider vertical => 1),
3028 ], 3283 ],
3029 ); 3284 );
3030 3285
3031 $self->{children}[1]->connect (changed => sub { $self->update }); 3286 $self->{children}[1]->connect (changed => sub { $self->update });
3032 3287
… …
3041} 3296}
3042 3297
3043sub size_request { 3298sub size_request {
3044 my ($self) = @_; 3299 my ($self) = @_;
3045 3300
3046 my ($empty, $slider) = @{ $self->{children} }; 3301 my ($empty, $slider) = $self->visible_children;
3047 3302
3048 local $self->{children} = [$empty, $slider]; 3303 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request 3304 $self->SUPER::size_request
3050} 3305}
3051 3306
… …
3088 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3343 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3089 $layout->set_markup ($para->{markup}); 3344 $layout->set_markup ($para->{markup});
3090 3345
3091 $layout->set_shapes ( 3346 $layout->set_shapes (
3092 map 3347 map
3093 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3348 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3094 @{$para->{widget}} 3349 @{$para->{widget}}
3095 ); 3350 );
3096 3351
3097 $layout 3352 $layout
3098} 3353}
… …
3215 $ROOT->on_post_alloc ($self => sub { 3470 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate; 3471 $self->force_uptodate;
3217 3472
3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3473 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3219 3474
3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3475 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3221 glClearColor 0, 0, 0, 0; 3476 glClearColor 0, 0, 0, 0;
3222 glClear GL_COLOR_BUFFER_BIT; 3477 glClear GL_COLOR_BUFFER_BIT;
3223 3478
3224 package CFPlus::UI::Base; 3479 package DC::UI::Base;
3225 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3480 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226 (0, 0, $self->{w}, $self->{h}); 3481 (0, 0, $self->{w}, $self->{h});
3227 3482
3228 my $top = int $self->{children}[1]{range}[0]; 3483 my $top = int $self->{children}[1]{range}[0];
3229 3484
… …
3240 3495
3241 if ($y0 < $y + $h && $y < $y1) { 3496 if ($y0 < $y + $h && $y < $y1) {
3242 my $layout = $self->get_layout ($para); 3497 my $layout = $self->get_layout ($para);
3243 3498
3244 $layout->render ($para->{indent}, $y - $y0); 3499 $layout->render ($para->{indent}, $y - $y0);
3500 $layout->draw;
3245 3501
3246 if (my @w = @{ $para->{widget} }) { 3502 if (my @w = @{ $para->{widget} }) {
3247 my @s = $layout->get_shapes; 3503 my @s = $layout->get_shapes;
3248 3504
3249 for (@w) { 3505 for (@w) {
… …
3287 $self->{children}[1]->draw; 3543 $self->{children}[1]->draw;
3288} 3544}
3289 3545
3290############################################################################# 3546#############################################################################
3291 3547
3292package CFPlus::UI::Animator; 3548package DC::UI::Animator;
3293 3549
3294use CFPlus::OpenGL; 3550use DC::OpenGL;
3295 3551
3296our @ISA = CFPlus::UI::Bin::; 3552our @ISA = DC::UI::Bin::;
3297 3553
3298sub moveto { 3554sub moveto {
3299 my ($self, $x, $y) = @_; 3555 my ($self, $x, $y) = @_;
3300 3556
3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3557 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3329 glPopMatrix; 3585 glPopMatrix;
3330} 3586}
3331 3587
3332############################################################################# 3588#############################################################################
3333 3589
3334package CFPlus::UI::Flopper; 3590package DC::UI::Flopper;
3335 3591
3336our @ISA = CFPlus::UI::Button::; 3592our @ISA = DC::UI::Button::;
3337 3593
3338sub new { 3594sub new {
3339 my $class = shift; 3595 my $class = shift;
3340 3596
3341 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3353 $self->{other}->toggle_visibility; 3609 $self->{other}->toggle_visibility;
3354} 3610}
3355 3611
3356############################################################################# 3612#############################################################################
3357 3613
3358package CFPlus::UI::Tooltip; 3614package DC::UI::Tooltip;
3359 3615
3360our @ISA = CFPlus::UI::Bin::; 3616our @ISA = DC::UI::Bin::;
3361 3617
3362use CFPlus::OpenGL; 3618use DC::OpenGL;
3363 3619
3364sub new { 3620sub new {
3365 my $class = shift; 3621 my $class = shift;
3366 3622
3367 $class->SUPER::new ( 3623 $class->SUPER::new (
… …
3371} 3627}
3372 3628
3373sub set_tooltip_from { 3629sub set_tooltip_from {
3374 my ($self, $widget) = @_; 3630 my ($self, $widget) = @_;
3375 3631
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
3378
3379 my $tooltip = $widget->{tooltip}; 3632 my $tip = $widget->{tooltip};
3633 $tip = $tip->($widget) if "CODE" eq ref $tip;
3634
3635 $tip = DC::Pod::section_label tooltip => $1
3636 if $tip =~ /^#(.*)$/;
3380 3637
3381 if ($ENV{CFPLUS_DEBUG} & 2) { 3638 if ($ENV{CFPLUS_DEBUG} & 2) {
3382 $tooltip .= "\n\n" . (ref $widget) . "\n" 3639 $tip .= "\n\n" . (ref $widget) . "\n"
3383 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3640 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3384 . "req $widget->{req_w} $widget->{req_h}\n" 3641 . "req $widget->{req_w} $widget->{req_h}\n"
3385 . "visible $widget->{visible}"; 3642 . "visible $widget->{visible}";
3386 } 3643 }
3387 3644
3388 $tooltip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
3389 $tooltip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
3390 3647
3391 $self->add (new CFPlus::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
3392 markup => $tooltip, 3650 markup => $tip,
3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3652 align => 0,
3394 fontsize => 0.8, 3653 fontsize => 0.8,
3395 style => 1, # FLAG_INVERSE 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3396 ellipsise => 0, 3655 ellipsise => 0,
3397 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
3398 ); 3657 );
3399} 3658}
3400 3659
… …
3435} 3694}
3436 3695
3437sub _draw { 3696sub _draw {
3438 my ($self) = @_; 3697 my ($self) = @_;
3439 3698
3440 glTranslate 0.375, 0.375;
3441
3442 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
3443 3700
3444 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
3445 glBegin GL_QUADS; 3702 glRect 0, 0, $w, $h;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3703
3452 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
3453 glBegin GL_LINE_LOOP; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
3454 glVertex 0 , 0;
3455 glVertex 0 , $h;
3456 glVertex $w, $h;
3457 glVertex $w, 0;
3458 glEnd;
3459 3706
3460 glTranslate 2 - 0.375, 2 - 0.375; 3707 glTranslate 2, 2;
3461 3708
3462 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
3463} 3710}
3464 3711
3465############################################################################# 3712#############################################################################
3466 3713
3467package CFPlus::UI::Face; 3714package DC::UI::Face;
3468 3715
3469our @ISA = CFPlus::UI::DrawBG::; 3716our @ISA = DC::UI::DrawBG::;
3470 3717
3471use CFPlus::OpenGL; 3718use DC::OpenGL;
3472 3719
3473sub new { 3720sub new {
3474 my $class = shift; 3721 my $class = shift;
3475 3722
3476 my $self = $class->SUPER::new ( 3723 my $self = $class->SUPER::new (
… …
3480 can_events => 0, 3727 can_events => 0,
3481 @_, 3728 @_,
3482 ); 3729 );
3483 3730
3484 if ($self->{anim} && $self->{animspeed}) { 3731 if ($self->{anim} && $self->{animspeed}) {
3485 CFPlus::weaken (my $widget = $self); 3732 DC::weaken (my $widget = $self);
3486 3733
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3734 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3735 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3489 $self->{timer} = Event->timer (
3490 parked => 1,
3491 cb => sub {
3492 return unless $::CONN && $widget; 3736 return unless $::CONN;
3493 3737
3738 my $w = $widget
3739 or return;
3740
3494 ++$widget->{frame}; 3741 ++$w->{frame};
3495 $widget->update_face; 3742 $w->update_face;
3743
3744 # somehow, $widget can go away
3496 $widget->update; 3745 $w->update;
3497
3498 $widget->update_timer; 3746 $w->update_timer;
3499 },
3500 ); 3747 };
3501 3748
3502 $self->update_face; 3749 $self->update_face;
3503 $self->update_timer; 3750 $self->update_timer;
3504 } 3751 }
3505 3752
… …
3510 my ($self) = @_; 3757 my ($self) = @_;
3511 3758
3512 return unless $self->{timer}; 3759 return unless $self->{timer};
3513 3760
3514 if ($self->{visible}) { 3761 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start; 3762 $self->{timer}->start;
3521 } else { 3763 } else {
3522 $self->{timer}->stop; 3764 $self->{timer}->stop;
3523 } 3765 }
3524} 3766}
3525 3767
3526sub update_face { 3768sub update_face {
3527 my ($self) = @_; 3769 my ($self) = @_;
3528 3770
3529 return unless $::CONN; 3771 if ($::CONN) {
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3772 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) { 3773 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3774 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3775 delete $self->{face_change_cb};
3776
3535 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3777 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3778 unless ($tex->{name} || $tex->{loading}) {
3779 $tex->upload (sub { $self->reconfigure });
3780 }
3781 }
3782 }
3536 } 3783 }
3537 } 3784 }
3538} 3785}
3539 3786
3540sub size_request { 3787sub size_request {
3541 my ($self) = @_; 3788 my ($self) = @_;
3542 3789
3543 if ($::CONN) { 3790 if ($::CONN) {
3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3791 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3545 if (my $tex = $::CONN->{texture}[$faceid]) { 3792 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex; 3793 if ($tex->{name}) {
3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3794 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3548 } else { 3795 } elsif (!$tex->{loading}) {
3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3796 $tex->upload (sub { $self->reconfigure });
3550 $self->realloc;
3551 }); 3797 }
3552 } 3798 }
3799
3800 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3553 } 3801 }
3554 } 3802 }
3555 3803
3556 ($self->{size_w} || 8, $self->{size_h} || 8) 3804 ($self->{size_w} || 8, $self->{size_h} || 8)
3557} 3805}
… …
3595 $self->SUPER::destroy; 3843 $self->SUPER::destroy;
3596} 3844}
3597 3845
3598############################################################################# 3846#############################################################################
3599 3847
3600package CFPlus::UI::Buttonbar; 3848package DC::UI::Buttonbar;
3601 3849
3602our @ISA = CFPlus::UI::HBox::; 3850our @ISA = DC::UI::HBox::;
3603 3851
3604# TODO: should actually wrap buttons and other goodies. 3852# TODO: should actually wrap buttons and other goodies.
3605 3853
3606############################################################################# 3854#############################################################################
3607 3855
3608package CFPlus::UI::Menu; 3856package DC::UI::Menu;
3609 3857
3610our @ISA = CFPlus::UI::Toplevel::; 3858our @ISA = DC::UI::Toplevel::;
3611 3859
3612use CFPlus::OpenGL; 3860use DC::OpenGL;
3613 3861
3614sub new { 3862sub new {
3615 my $class = shift; 3863 my $class = shift;
3616 3864
3617 my $self = $class->SUPER::new ( 3865 my $self = $class->SUPER::new (
3618 items => [], 3866 items => [],
3619 z => 100, 3867 z => 100,
3620 @_, 3868 @_,
3621 ); 3869 );
3622 3870
3623 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3871 $self->add ($self->{vbox} = new DC::UI::VBox);
3624 3872
3625 for my $item (@{ $self->{items} }) { 3873 for my $item (@{ $self->{items} }) {
3626 my ($widget, $cb, $tooltip) = @$item; 3874 my ($widget, $cb, $tooltip) = @$item;
3627 3875
3628 # handle various types of items, only text for now 3876 # handle various types of items, only text for now
3629 if (!ref $widget) { 3877 if (!ref $widget) {
3630 if ($widget =~ /\t/) { 3878 if ($widget =~ /\t/) {
3631 my ($left, $right) = split /\t/, $widget, 2; 3879 my ($left, $right) = split /\t/, $widget, 2;
3632 3880
3633 $widget = new CFPlus::UI::HBox 3881 $widget = new DC::UI::HBox
3634 can_hover => 1, 3882 can_hover => 1,
3635 can_events => 1, 3883 can_events => 1,
3636 tooltip => $tooltip, 3884 tooltip => $tooltip,
3637 children => [ 3885 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1), 3886 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1), 3887 (new DC::UI::Label markup => $right, align => 1),
3640 ], 3888 ],
3641 ; 3889 ;
3642 3890
3643 } else { 3891 } else {
3644 $widget = new CFPlus::UI::Label 3892 $widget = new DC::UI::Label
3645 can_hover => 1, 3893 can_hover => 1,
3646 can_events => 1, 3894 can_events => 1,
3895 align => 0,
3647 markup => $widget, 3896 markup => $widget,
3648 tooltip => $tooltip; 3897 tooltip => $tooltip;
3649 } 3898 }
3650 } 3899 }
3651 3900
… …
3666 # maybe save $GRAB? must be careful about events... 3915 # maybe save $GRAB? must be careful about events...
3667 $GRAB = $self; 3916 $GRAB = $self;
3668 $self->{button} = $ev->{button}; 3917 $self->{button} = $ev->{button};
3669 3918
3670 $self->show; 3919 $self->show;
3671 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3920
3921 my $x = $ev->{x};
3922 my $y = $ev->{y};
3923
3924 $self->{root}->on_post_alloc ($self => sub {
3925 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3926 });
3927
3928 1 # so it can be used inside event handlers
3672} 3929}
3673 3930
3674sub invoke_mouse_motion { 3931sub invoke_mouse_motion {
3675 my ($self, $ev, $x, $y) = @_; 3932 my ($self, $ev, $x, $y) = @_;
3676 3933
… …
3697 1 3954 1
3698} 3955}
3699 3956
3700############################################################################# 3957#############################################################################
3701 3958
3702package CFPlus::UI::Multiplexer; 3959package DC::UI::Multiplexer;
3703 3960
3704our @ISA = CFPlus::UI::Container::; 3961our @ISA = DC::UI::Container::;
3705 3962
3706sub new { 3963sub new {
3707 my $class = shift; 3964 my $class = shift;
3708 3965
3709 my $self = $class->SUPER::new ( 3966 my $self = $class->SUPER::new (
3710 @_, 3967 @_,
3711 ); 3968 );
3712 3969
3713 $self->{current} = $self->{children}[0] 3970 $self->set_current_page (0);
3714 if @{ $self->{children} };
3715 3971
3716 $self 3972 $self
3717} 3973}
3718 3974
3719sub add { 3975sub add {
3720 my ($self, @widgets) = @_; 3976 my ($self, @widgets) = @_;
3721 3977
3722 $self->SUPER::add (@widgets); 3978 $self->SUPER::add (@widgets);
3723 3979
3724 $self->{current} = $self->{children}[0] 3980 $self->set_current_page (0)
3725 if @{ $self->{children} }; 3981 if @widgets == @{ $self->{children} };
3726} 3982}
3727 3983
3728sub get_current_page { 3984sub get_current_page {
3729 my ($self) = @_; 3985 my ($self) = @_;
3730 3986
… …
3736 3992
3737 my $widget = ref $page_or_widget 3993 my $widget = ref $page_or_widget
3738 ? $page_or_widget 3994 ? $page_or_widget
3739 : $self->{children}[$page_or_widget]; 3995 : $self->{children}[$page_or_widget];
3740 3996
3997 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3998
3741 $self->{current} = $widget; 3999 if (($self->{current} = $widget)) {
4000 $self->{current}->set_visible if $self->{current} && $self->{visible};
3742 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4001 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3743 4002
3744 $self->emit (page_changed => $self->{current}); 4003 $self->emit (page_changed => $self->{current});
4004 }
3745 4005
3746 $self->realloc; 4006 $self->realloc;
3747} 4007}
3748 4008
3749sub visible_children { 4009sub visible_children {
3750 $_[0]{current} 4010 $_[0]{current} || ()
3751} 4011}
3752 4012
3753sub size_request { 4013sub size_request {
3754 my ($self) = @_; 4014 my ($self) = @_;
3755 4015
4016 $self->{current}
3756 $self->{current}->size_request 4017 ? $self->{current}->size_request
4018 : (0, 0)
3757} 4019}
3758 4020
3759sub invoke_size_allocate { 4021sub invoke_size_allocate {
3760 my ($self, $w, $h) = @_; 4022 my ($self, $w, $h) = @_;
3761 4023
3762 $self->{current}->configure (0, 0, $w, $h); 4024 $self->{current}->configure (0, 0, $w, $h)
4025 if $self->{current};
3763 4026
3764 1 4027 1
3765} 4028}
3766 4029
3767sub _draw { 4030sub _draw {
3768 my ($self) = @_; 4031 my ($self) = @_;
3769 4032
3770 $self->{current}->draw; 4033 $self->{current}->draw
4034 if $self->{current};
3771} 4035}
3772 4036
3773############################################################################# 4037#############################################################################
3774 4038
3775package CFPlus::UI::Notebook; 4039package DC::UI::Notebook;
3776 4040
4041use DC::OpenGL;
4042
3777our @ISA = CFPlus::UI::VBox::; 4043our @ISA = DC::UI::VBox::;
3778 4044
3779sub new { 4045sub new {
3780 my $class = shift; 4046 my $class = shift;
3781 4047
3782 my $self = $class->SUPER::new ( 4048 my $self = $class->SUPER::new (
3783 buttonbar => (new CFPlus::UI::Buttonbar), 4049 buttonbar => (new DC::UI::Buttonbar),
3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4050 multiplexer => (new DC::UI::Multiplexer expand => 1),
4051 active_outline => [.7, .7, 0.2],
3785 # filter => # will be put between multiplexer and $self 4052 # filter => # will be put between multiplexer and $self
3786 @_, 4053 @_,
3787 ); 4054 );
3788 4055
3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3790 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3791 4058
4059 {
4060 Scalar::Util::weaken (my $wself = $self);
4061
4062 $self->{multiplexer}->connect (c_add => sub {
4063 my ($mplex, $widgets) = @_;
4064
4065 for my $child (@$widgets) {
4066 Scalar::Util::weaken $child;
4067 $child->{c_tab_} ||= do {
4068 my $tab =
4069 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4070 ? $child->{c_tab}
4071 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4072
4073 $tab->connect (activate => sub {
4074 $wself->set_current_page ($child);
4075 });
4076
4077 $tab
4078 };
4079
4080 $self->{buttonbar}->add ($child->{c_tab_});
4081 }
4082 });
4083
4084 $self->{multiplexer}->connect (c_remove => sub {
4085 my ($mplex, $widgets) = @_;
4086
4087 for my $child (@$widgets) {
4088 $wself->{buttonbar}->remove ($child->{c_tab_});
4089 }
4090 });
4091 }
4092
3792 $self 4093 $self
3793} 4094}
3794 4095
3795sub add { 4096sub add {
4097 my ($self, @widgets) = @_;
4098
4099 $self->{multiplexer}->add (@widgets)
4100}
4101
4102sub remove {
4103 my ($self, @widgets) = @_;
4104
4105 $self->{multiplexer}->remove (@widgets)
4106}
4107
4108sub pages {
4109 my ($self) = @_;
4110 $self->{multiplexer}->children
4111}
4112
4113sub page_index {
4114 my ($self, $widget) = @_;
4115
4116 my $i = 0;
4117 for ($self->pages) {
4118 if ($_ eq $widget) { return $i };
4119 $i++;
4120 }
4121
4122 undef
4123}
4124
4125sub add_tab {
3796 my ($self, $title, $widget, $tooltip) = @_; 4126 my ($self, $title, $widget, $tooltip) = @_;
3797 4127
3798 CFPlus::weaken $self; 4128 $title = [$title, $tooltip] unless ref $title;
4129 $widget->{c_tab} = $title;
3799 4130
3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3801 markup => $title,
3802 tooltip => $tooltip,
3803 on_activate => sub { $self->set_current_page ($widget) },
3804 );
3805
3806 $self->{multiplexer}->add ($widget); 4131 $self->add ($widget);
3807} 4132}
3808 4133
3809sub get_current_page { 4134sub get_current_page {
3810 my ($self) = @_; 4135 my ($self) = @_;
3811 4136
… …
3817 4142
3818 $self->{multiplexer}->set_current_page ($page); 4143 $self->{multiplexer}->set_current_page ($page);
3819 $self->emit (page_changed => $self->{multiplexer}{current}); 4144 $self->emit (page_changed => $self->{multiplexer}{current});
3820} 4145}
3821 4146
4147sub _draw {
4148 my ($self) = @_;
4149
4150 $self->SUPER::_draw ();
4151
4152 if (my $cur = $self->{multiplexer}{current}) {
4153 if ($cur = $cur->{c_tab_}) {
4154 glTranslate $self->{buttonbar}{x} + $cur->{x},
4155 $self->{buttonbar}{y} + $cur->{y};
4156 glLineWidth 3;
4157 #glEnable GL_BLEND;
4158 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4159 glColor @{$self->{active_outline}};
4160 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4161 glLineWidth 1;
4162 #glDisable GL_BLEND;
4163 }
4164 }
4165}
4166
3822############################################################################# 4167#############################################################################
3823 4168
3824package CFPlus::UI::Selector; 4169package DC::UI::Selector;
3825 4170
3826use utf8; 4171use utf8;
3827 4172
3828our @ISA = CFPlus::UI::Button::; 4173our @ISA = DC::UI::Button::;
3829 4174
3830sub new { 4175sub new {
3831 my $class = shift; 4176 my $class = shift;
3832 4177
3833 my $self = $class->SUPER::new ( 4178 my $self = $class->SUPER::new (
… …
3850 my ($value, $title, $tooltip) = @$_; 4195 my ($value, $title, $tooltip) = @$_;
3851 4196
3852 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4197 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3853 } 4198 }
3854 4199
3855 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4200 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3856} 4201}
3857 4202
3858sub _set_value { 4203sub _set_value {
3859 my ($self, $value) = @_; 4204 my ($self, $value) = @_;
3860 4205
3861 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4206 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4207 $item ||= $self->{options}[0]
3862 or return; 4208 or return;
3863 4209
3864 $self->{value} = $item->[0]; 4210 $self->{value} = $item->[0];
3865 $self->set_markup ("$item->[1] ⇓"); 4211 $self->set_markup ("$item->[1] ⇓");
3866 $self->set_tooltip ($item->[2]); 4212# $self->set_tooltip ($item->[2]);
3867} 4213}
3868 4214
3869sub set_value { 4215sub set_value {
3870 my ($self, $value) = @_; 4216 my ($self, $value) = @_;
3871 4217
… …
3873 4219
3874 $self->_set_value ($value); 4220 $self->_set_value ($value);
3875 $self->emit (changed => $value); 4221 $self->emit (changed => $value);
3876} 4222}
3877 4223
4224sub set_options {
4225 my ($self, $options) = @_;
4226
4227 $self->{options} = $options;
4228 $self->_set_value ($self->{value});
4229}
4230
3878############################################################################# 4231#############################################################################
3879 4232
3880package CFPlus::UI::Statusbox; 4233package DC::UI::Statusbox;
3881 4234
3882our @ISA = CFPlus::UI::VBox::; 4235our @ISA = DC::UI::VBox::;
3883 4236
3884sub new { 4237sub new {
3885 my $class = shift; 4238 my $class = shift;
3886 4239
3887 my $self = $class->SUPER::new ( 4240 my $self = $class->SUPER::new (
3888 fontsize => 0.8, 4241 fontsize => 0.8,
3889 @_, 4242 @_,
3890 ); 4243 );
3891 4244
3892 CFPlus::weaken (my $this = $self); 4245 DC::weaken (my $this = $self);
3893 4246
3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4247 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3895 4248
3896 $self 4249 $self
3897} 4250}
3898 4251
3899sub reorder { 4252sub reorder {
3900 my ($self) = @_; 4253 my ($self) = @_;
3901 my $NOW = Time::HiRes::time; 4254 my $NOW = EV::time;
3902 4255
3903 # freeze display when hovering over any label 4256 # freeze display when hovering over any label
3904 return if $CFPlus::UI::TOOLTIP->{owner} 4257 return if $DC::UI::TOOLTIP->{owner}
3905 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4258 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3906 values %{ $self->{item} }; 4259 values %{ $self->{item} };
3907 4260
3908 while (my ($k, $v) = each %{ $self->{item} }) { 4261 while (my ($k, $v) = each %{ $self->{item} }) {
3909 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4262 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3910 } 4263 }
4264
4265 $self->{timer}->set (1, 1);
3911 4266
3912 my @widgets; 4267 my @widgets;
3913 4268
3914 my @items = sort { 4269 my @items = sort {
3915 $a->{pri} <=> $b->{pri} 4270 $a->{pri} <=> $b->{pri}
3916 or $b->{id} <=> $a->{id} 4271 or $b->{id} <=> $a->{id}
3917 } values %{ $self->{item} }; 4272 } values %{ $self->{item} };
3918
3919 $self->{timer}->interval (1);
3920 4273
3921 my $count = 10 + 1; 4274 my $count = 10 + 1;
3922 for my $item (@items) { 4275 for my $item (@items) {
3923 last unless --$count; 4276 last unless --$count;
3924 4277
… …
3931 for ($short) { 4284 for ($short) {
3932 s/^\s+//; 4285 s/^\s+//;
3933 s/\s+/ /g; 4286 s/\s+/ /g;
3934 } 4287 }
3935 4288
3936 new CFPlus::UI::Label 4289 new DC::UI::Label
3937 markup => $short, 4290 markup => $short,
3938 tooltip => $item->{tooltip}, 4291 tooltip => $item->{tooltip},
3939 tooltip_font => $::FONT_PROP, 4292 tooltip_font => $::FONT_PROP,
3940 tooltip_width => 0.67, 4293 tooltip_width => 0.67,
3941 fontsize => $item->{fontsize} || $self->{fontsize}, 4294 fontsize => $item->{fontsize} || $self->{fontsize},
3942 max_w => $::WIDTH * 0.44, 4295 max_w => $::WIDTH * 0.44,
4296 align => 0,
3943 fg => [@{ $item->{fg} }], 4297 fg => [@{ $item->{fg} }],
3944 can_events => 1, 4298 can_events => 1,
3945 can_hover => 1 4299 can_hover => 1
3946 }; 4300 };
3947 4301
3948 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4302 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3949 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4303 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3950 $label->update; 4304 $label->update;
3951 $label->set_max_size (undef, $label->{req_h} * $diff) 4305 $label->set_max_size (undef, $label->{req_h} * $diff)
3952 if $diff < 1; 4306 if $diff < 1;
3953 $self->{timer}->interval (1/30); 4307 $self->{timer}->set (1/30, 1/30);
3954 } else { 4308 } else {
3955 $label->{fg}[3] = $item->{fg}[3] || 1; 4309 $label->{fg}[3] = $item->{fg}[3] || 1;
3956 } 4310 }
3957 4311
3958 push @widgets, $label; 4312 push @widgets, $label;
3959 } 4313 }
4314
4315 my $hash = join ",", @widgets;
4316 return if $hash eq $self->{last_widget_hash};
4317 $self->{last_widget_hash} = $hash;
3960 4318
3961 $self->clear; 4319 $self->clear;
3962 $self->SUPER::add (reverse @widgets); 4320 $self->SUPER::add (reverse @widgets);
3963} 4321}
3964 4322
… …
4020 $self->SUPER::destroy; 4378 $self->SUPER::destroy;
4021} 4379}
4022 4380
4023############################################################################# 4381#############################################################################
4024 4382
4025package CFPlus::UI::Root; 4383package DC::UI::Root;
4026 4384
4027our @ISA = CFPlus::UI::Container::; 4385our @ISA = DC::UI::Container::;
4028 4386
4029use List::Util qw(min max); 4387use List::Util qw(min max);
4030 4388
4031use CFPlus::OpenGL; 4389use DC::OpenGL;
4032 4390
4033sub new { 4391sub new {
4034 my $class = shift; 4392 my $class = shift;
4035 4393
4036 my $self = $class->SUPER::new ( 4394 my $self = $class->SUPER::new (
4037 visible => 1, 4395 visible => 1,
4038 @_, 4396 @_,
4039 ); 4397 );
4040 4398
4041 CFPlus::weaken ($self->{root} = $self); 4399 DC::weaken ($self->{root} = $self);
4042 4400
4043 $self 4401 $self
4044} 4402}
4045 4403
4046sub size_request { 4404sub size_request {
… …
4094} 4452}
4095 4453
4096sub update { 4454sub update {
4097 my ($self) = @_; 4455 my ($self) = @_;
4098 4456
4099 $::WANT_REFRESH++; 4457 $::WANT_REFRESH = 1;
4100} 4458}
4101 4459
4102sub add { 4460sub add {
4103 my ($self, @children) = @_; 4461 my ($self, @children) = @_;
4104 4462
… …
4171 4529
4172 delete $queue{$widget+0}; 4530 delete $queue{$widget+0};
4173 4531
4174 my ($w, $h) = $widget->size_request; 4532 my ($w, $h) = $widget->size_request;
4175 4533
4176 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4534 $w += $widget->{padding_x} * 2;
4177 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4535 $h += $widget->{padding_y} * 2;
4536
4537 $w = max $widget->{min_w}, $w;
4538 $h = max $widget->{min_h}, $h;
4178 4539
4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4540 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4541 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4181 4542
4182 $w = $widget->{force_w} if exists $widget->{force_w}; 4543 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4610 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4250 glMatrixMode GL_MODELVIEW; 4611 glMatrixMode GL_MODELVIEW;
4251 glLoadIdentity; 4612 glLoadIdentity;
4252 4613
4253 { 4614 {
4254 package CFPlus::UI::Base; 4615 package DC::UI::Base;
4255 4616
4256 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4617 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4257 (0, 0, $self->{w}, $self->{h}); 4618 (0, 0, $self->{w}, $self->{h});
4258 4619
4259 $self->_draw; 4620 $self->_draw;
4260 } 4621 }
4261} 4622}
4262 4623
4263############################################################################# 4624#############################################################################
4264 4625
4265package CFPlus::UI; 4626package DC::UI;
4266 4627
4267$ROOT = new CFPlus::UI::Root; 4628$ROOT = new DC::UI::Root;
4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4629$TOOLTIP = new DC::UI::Tooltip z => 900;
4269 4630
42701 46311
4271

Diff Legend

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