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.387 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.478 by root, Tue Dec 22 00:35:44 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 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
119
120 $ev->{dx} = $shift ? $delta : 0;
121 $ev->{dy} = $shift ? 0 : $delta;
122
120 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
121 } else { 124 } else {
122 $GRAB->emit (button_down => $ev) 125 $GRAB->emit (button_down => $ev)
123 } 126 }
124 } 127 }
… …
138 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 142 $grab->update if $grab;
140 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
141 144
142 check_hover $widget; 145 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
144 } 147 }
145} 148}
146 149
147sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
148 my ($ev) = @_; 151 my ($ev) = @_;
… …
188# call when resolution changes etc. 191# call when resolution changes etc.
189sub rescale_widgets { 192sub rescale_widgets {
190 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
191 194
192 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
193 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196 199
197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
210 reconfigure_widgets; 213 reconfigure_widgets;
211} 214}
212 215
213############################################################################# 216#############################################################################
214 217
215package CFPlus::UI::Event; 218package DC::UI::Event;
216 219
217sub xy { 220sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 222}
220 223
221############################################################################# 224#############################################################################
222 225
223package CFPlus::UI::Base; 226package DC::UI::Base;
224 227
225use strict; 228use strict;
226 229
227use CFPlus::OpenGL; 230use DC::OpenGL;
228 231
229sub new { 232sub new {
230 my $class = shift; 233 my $class = shift;
231 234
232 my $self = bless { 235 my $self = bless {
… …
237 h => undef, 240 h => undef,
238 can_events => 1, 241 can_events => 1,
239 @_ 242 @_
240 }, $class; 243 }, $class;
241 244
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 246
244 for (keys %$self) { 247 for (keys %$self) {
245 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
247 } 250 }
248 } 251 }
249 252
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 258
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 261
259 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
269 $self->emit ("destroy"); 272 $self->emit ("destroy");
270 %$self = (); 273 %$self = ();
271} 274}
272 275
273sub TO_JSON { 276sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
275} 278}
276 279
277sub show { 280sub show {
278 my ($self) = @_; 281 my ($self) = @_;
279 282
280 return if $self->{parent}; 283 return if $self->{parent};
281 284
282 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
283} 286}
284 287
285sub set_visible { 288sub set_visible {
286 my ($self) = @_; 289 my ($self) = @_;
287 290
288 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
289 295
290 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
292 298
293 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
294 300
295 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
296 302
297 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
298} 304}
299 305
300sub set_invisible { 306sub set_invisible {
301 my ($self) = @_; 307 my ($self) = @_;
302 308
… …
308 delete $self->{root}; 314 delete $self->{root};
309 315
310 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
312 318
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
315 321
316 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
318} 324}
… …
337sub hide { 343sub hide {
338 my ($self) = @_; 344 my ($self) = @_;
339 345
340 $self->set_invisible; 346 $self->set_invisible;
341 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 351 $parent->remove ($self);
343 if $self->{parent}; 352 }
344} 353}
345 354
346sub move_abs { 355sub move_abs {
347 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
348 357
… …
360 $self->{force_h} = $h; 369 $self->{force_h} = $h;
361 370
362 $self->realloc; 371 $self->realloc;
363} 372}
364 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
365sub size_request { 392sub size_request {
366 require Carp; 393 require Carp;
367 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
368} 395}
369 396
… …
375 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
376 403
377 if ($self->{aspect}) { 404 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
379 406
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 409
383 # use alignment to adjust x, y 410 # use alignment to adjust x, y
384 411
385 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
427 454
428 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
429 456
430 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
431 458
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 462 }
436} 463}
437 464
438# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
439sub coord2local { 466sub coord2local {
440 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
441 468
442 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
443 470
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 472}
446 473
447# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
448sub coord2global { 475sub coord2global {
449 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
450 477
451 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
452 479
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 481}
455 482
456sub invoke_focus_in { 483sub invoke_focus_in {
… …
505sub connect { 532sub connect {
506 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
507 534
508 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
509 536
510 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
513 } 540 }
514} 541}
515 542
… …
553# in .xs 580# in .xs
554 581
555sub set_parent { 582sub set_parent {
556 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
557 584
558 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
559 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
560} 587}
561 588
562sub realloc { 589sub realloc {
563 my ($self) = @_; 590 my ($self) = @_;
… …
589 616
590# 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
591# functions seems pointless. 618# functions seems pointless.
592our ($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
593 620
594sub draw { 621#sub draw {
595 my ($self) = @_; 622#CFPlus.xs
596
597 return unless $self->{h} && $self->{w};
598
599 # update screen rectangle
600 local $draw_x = $draw_x + $self->{x};
601 local $draw_y = $draw_y + $self->{y};
602
603 # skip widgets that are entirely outside the drawing area
604 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
605 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
606
607 glPushMatrix;
608 glTranslate $self->{x}, $self->{y}, 0;
609
610 if ($self == $HOVER && $self->{can_hover}) {
611 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
612 glEnable GL_BLEND;
613 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
614 glBegin GL_QUADS;
615 glVertex 0 , 0;
616 glVertex $self->{w}, 0;
617 glVertex $self->{w}, $self->{h};
618 glVertex 0 , $self->{h};
619 glEnd;
620 glDisable GL_BLEND;
621 }
622
623 if ($ENV{CFPLUS_DEBUG} & 1) {
624 glPushMatrix;
625 glColor 1, 1, 0, 1;
626 glTranslate 0.375, 0.375;
627 glBegin GL_LINE_LOOP;
628 glVertex 0 , 0;
629 glVertex $self->{w} - 1, 0;
630 glVertex $self->{w} - 1, $self->{h} - 1;
631 glVertex 0 , $self->{h} - 1;
632 glEnd;
633 glPopMatrix;
634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
635 }
636
637 $self->_draw;
638 glPopMatrix;
639}
640 623
641sub _draw { 624sub _draw {
642 my ($self) = @_; 625 my ($self) = @_;
643 626
644 warn "no draw defined for $self\n"; 627 warn "no draw defined for $self\n";
645} 628}
646 629
647my $cntx;#d#
648sub DESTROY { 630sub DESTROY {
649 my ($self) = @_; 631 my ($self) = @_;
650 632
651 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
652 634
635 local $@;
653 eval { $self->destroy }; 636 eval { $self->destroy };
654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655 638
656 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
657} 640}
658 641
659############################################################################# 642#############################################################################
660 643
661package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
662 645
663our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
664 647
665use strict; 648use strict;
666use CFPlus::OpenGL; 649use DC::OpenGL;
667 650
668sub new { 651sub new {
669 my $class = shift; 652 my $class = shift;
670
671 # range [value, low, high, page]
672 653
673 $class->SUPER::new ( 654 $class->SUPER::new (
674 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
675 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
676 @_ 657 @_
677 ) 658 )
678} 659}
679 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
680sub _draw { 668sub _draw {
681 my ($self) = @_; 669 my ($self) = @_;
682 670
683 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self
684 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
685 : $self->{bg}; 673 : $self->{bg};
686 674
687 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
688 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
689 677
690 glEnable GL_BLEND; 678 glEnable GL_BLEND;
691 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
692 glColor_premultiply @$color; 680 glColor_premultiply @$color;
693
694 glBegin GL_QUADS;
695 glVertex 0 , 0;
696 glVertex 0 , $h;
697 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
698 glVertex $w, 0;
699 glEnd;
700
701 glDisable GL_BLEND; 682 glDisable GL_BLEND;
702 } 683 }
703} 684}
704 685
705############################################################################# 686#############################################################################
706 687
707package CFPlus::UI::Empty; 688package DC::UI::Empty;
708 689
709our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
710 691
711sub new { 692sub new {
712 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
713 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
714} 695}
… …
721 702
722sub draw { } 703sub draw { }
723 704
724############################################################################# 705#############################################################################
725 706
726package CFPlus::UI::Container; 707package DC::UI::Container;
727 708
728our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
729 710
730sub new { 711sub new {
731 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
732 713
733 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
737 can_events => 0, 718 can_events => 0,
738 %arg, 719 %arg,
739 ); 720 );
740 721
741 $self->add (@$children) 722 $self->add (@$children)
742 if $children; 723 if $children && @$children;
743 724
744 $self 725 $self
745} 726}
746 727
747sub realloc { 728sub realloc {
… …
756 my ($self, @widgets) = @_; 737 my ($self, @widgets) = @_;
757 738
758 $_->set_parent ($self) 739 $_->set_parent ($self)
759 for @widgets; 740 for @widgets;
760 741
742 # TODO: only do this in widgets that need it, e.g. root, fixed
761 use sort 'stable'; 743 use sort 'stable';
762 744
763 $self->{children} = [ 745 $self->{children} = [
764 sort { $a->{z} <=> $b->{z} } 746 sort { $a->{z} <=> $b->{z} }
765 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
766 ]; 748 ];
767 749
768 $self->realloc; 750 $self->realloc;
751
752 $self->emit (c_add => \@widgets);
753
754 map $_+0, @widgets
769} 755}
770 756
771sub children { 757sub children {
772 @{ $_[0]{children} } 758 @{ $_[0]{children} }
773} 759}
774 760
775sub remove { 761sub remove {
776 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
777 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
778 delete $child->{parent}; 767 delete $child->{parent};
779 $child->hide; 768 $child->hide;
780
781 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
782 771
783 $self->realloc; 772 $self->realloc;
784} 773}
785 774
786sub clear { 775sub clear {
787 my ($self) = @_; 776 my ($self) = @_;
788 777
789 my $children = delete $self->{children}; 778 my $children = $self->{children};
790 $self->{children} = []; 779 $self->{children} = [];
791 780
792 for (@$children) { 781 for (@$children) {
793 delete $_->{parent}; 782 delete $_->{parent};
794 $_->hide; 783 $_->hide;
… …
814} 803}
815 804
816sub _draw { 805sub _draw {
817 my ($self) = @_; 806 my ($self) = @_;
818 807
819 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
820} 809}
821 810
822############################################################################# 811#############################################################################
823 812
824package CFPlus::UI::Bin; 813package DC::UI::Bin;
825 814
826our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
827 816
828sub new { 817sub new {
829 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
830 819
831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
832 821
833 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
834} 823}
835 824
836sub add { 825sub add {
837 my ($self, $child) = @_; 826 my ($self, $child) = @_;
838 827
839 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
840 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
841} 830}
842 831
843sub remove { 832sub remove {
844 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
845 834
846 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
847 836
848 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
849 unless @{$self->{children}}; 838 unless @{$self->{children}};
850} 839}
851 840
852sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
853 842
… …
862 851
863 1 852 1
864} 853}
865 854
866############################################################################# 855#############################################################################
867
868# back-buffered drawing area 856# back-buffered drawing area
869 857
870package CFPlus::UI::Window; 858package DC::UI::Window;
871 859
872our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
873 861
874use CFPlus::OpenGL; 862use DC::OpenGL;
875 863
876sub new { 864sub new {
877 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
878 866
879 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
901} 889}
902 890
903sub render_child { 891sub render_child {
904 my ($self) = @_; 892 my ($self) = @_;
905 893
906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 894 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
907 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
908 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
909 897
910 { 898 {
911 package CFPlus::UI::Base; 899 package DC::UI::Base;
912 900
913 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
914 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
915 903
916 $self->_render; 904 $self->_render;
… …
933 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
934} 922}
935 923
936############################################################################# 924#############################################################################
937 925
938package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
939 927
940use List::Util qw(min max); 928use List::Util qw(min max);
941 929
942our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
943 931
944sub new { 932sub new {
945 my $class = shift; 933 my $class = shift;
946 934
947 $class->SUPER::new ( 935 $class->SUPER::new (
… …
954sub size_request { 942sub size_request {
955 my ($self) = @_; 943 my ($self) = @_;
956 944
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 946
959 $w = 10 if $self->{scroll_x}; 947 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 948 $h = 1 if $self->{scroll_y};
961 949
962 ($w, $h) 950 ($w, $h)
963} 951}
964 952
965sub invoke_size_allocate { 953sub invoke_size_allocate {
… …
986 $self->{view_x} = $x; 974 $self->{view_x} = $x;
987 $self->{view_y} = $y; 975 $self->{view_y} = $y;
988 976
989 $self->emit (changed => $x, $y); 977 $self->emit (changed => $x, $y);
990 $self->update; 978 $self->update;
979 }
980}
981
982sub set_center {
983 my ($self, $x, $y) = @_;
984
985 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
986}
987
988sub make_visible {
989 my ($self, $x, $y, $border) = @_;
990
991 if ( $x < $self->{view_x} + $self->{w} * $border
992 || $x > $self->{view_x} + $self->{w} * (1 - $border)
993 || $y < $self->{view_y} + $self->{h} * $border
994 || $y > $self->{view_y} + $self->{h} * (1 - $border)
995 ) {
996 $self->set_center ($x, $y);
991 } 997 }
992} 998}
993 999
994# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
995sub coord2local { 1001sub coord2local {
… …
1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1015 ) { 1021 ) {
1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1017 } else { 1023 } else {
1018 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1019 } 1025 }
1020} 1026}
1021 1027
1022sub _render { 1028sub _render {
1023 my ($self) = @_; 1029 my ($self) = @_;
1024 1030
1025 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1031 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1032 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1027 1033
1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1029 1035
1030 $self->SUPER::_render; 1036 $self->SUPER::_render;
1031} 1037}
1032 1038
1033############################################################################# 1039#############################################################################
1034 1040
1035package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1036 1042
1037our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1038 1044
1039sub new { 1045sub new {
1040 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1041 1047
1042 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1043 1049
1044 my $self; 1050 my $self;
1045 1051
1046 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1053 c_col => 0,
1054 c_row => 1,
1047 vertical => 0, 1055 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub { 1057 on_changed => sub {
1050 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1060 },
1053 ; 1061 ;
1054 1062
1055 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1064 c_col => 1,
1065 c_row => 0,
1056 vertical => 1, 1066 vertical => 1,
1057 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1068 on_changed => sub {
1059 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1070 col_expand => [1, 0], 1080 col_expand => [1, 0],
1071 row_expand => [1, 0], 1081 row_expand => [1, 0],
1072 %arg, 1082 %arg,
1073 ); 1083 );
1074 1084
1075 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new DC::UI::ViewPort
1086 c_col => 0,
1087 c_row => 0,
1076 expand => 1, 1088 expand => 1,
1077 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1079 on_changed => sub { 1091 on_changed => sub {
1080 my ($vp, $x, $y) = @_; 1092 my ($vp, $x, $y) = @_;
… …
1082 $vp->{parent}{hslider}->set_value ($x); 1094 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y); 1095 $vp->{parent}{vslider}->set_value ($y);
1084 1096
1085 0 1097 0
1086 }, 1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1087 ; 1104 ;
1088 1105
1089 $self->SUPER::add_at (0, 0, $self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1090 1107
1091 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1092 1109
1093 $self 1110 $self
1094} 1111}
1095
1096#TODO# update range on size_allocate depending on child
1097 1112
1098sub add { 1113sub add {
1099 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1100 1115
1101 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1102} 1117}
1103 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
1104sub update_slider { 1123sub update_slider {
1105 my ($self) = @_; 1124 my ($self) = @_;
1106 1125
1107 my $child = ($self->{vp} or return)->child; 1126 my $child = ($self->{vp} or return)->child;
1108 1127
1128 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1129 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1130 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111 1131
1112 my $visible = $w1 > $w2; 1132 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) { 1133 if ($visible != $self->{hslider_visible}) {
1134 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1135 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->{hslider}->hide; 1136 : $self->SUPER::remove ($self->{hslider});
1137 }
1116 } 1138 }
1117 1139
1140 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1141 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1142 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 1143
1121 my $visible = $h1 > $h2; 1144 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) { 1145 if ($visible != $self->{vslider_visible}) {
1146 $self->{vslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1147 $visible ? $self->SUPER::add ($self->{vslider})
1124 : $self->{vslider}->hide; 1148 : $self->SUPER::remove ($self->{vslider});
1149 }
1150 }
1151}
1152
1153sub start_dragging {
1154 my ($self, $ev) = @_;
1155
1156 $self->grab_focus;
1157
1158 my $ox = $self->{vp}{view_x};
1159 my $oy = $self->{vp}{view_y};
1160
1161 $self->{motion} = sub {
1162 my ($ev, $x, $y) = @_;
1163
1164 $ox -= $ev->{xrel};
1165 $oy -= $ev->{yrel};
1166
1167 $self->{vp}->set_offset ($ox, $oy);
1125 } 1168 };
1126}
1127
1128sub update {
1129 my ($self) = @_;
1130
1131 $self->update_slider;
1132 $self->SUPER::update;
1133} 1169}
1134 1170
1135sub invoke_mouse_wheel { 1171sub invoke_mouse_wheel {
1136 my ($self, $ev) = @_; 1172 my ($self, $ev) = @_;
1137 1173
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev); 1174 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1175 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1141 1176
1142 1 1177 1
1143} 1178}
1144 1179
1145sub invoke_button_down { 1180sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1147 1182
1148 if ($ev->{button} == 2) { 1183 if ($ev->{button} == 2) {
1149 $self->grab_focus; 1184 $self->start_dragging ($ev);
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1160
1161 return 1; 1185 return 1;
1162 } 1186 }
1163 1187
1164 0 1188 0
1165} 1189}
… …
1192 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1193} 1217}
1194 1218
1195############################################################################# 1219#############################################################################
1196 1220
1197package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1198 1222
1199our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1200 1224
1201use CFPlus::OpenGL; 1225use DC::OpenGL;
1202 1226
1203sub new { 1227sub new {
1204 my $class = shift; 1228 my $class = shift;
1205 1229
1206 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1216 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1217 1241
1218 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1220 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1221
1222 glBegin GL_QUADS;
1223 glVertex 0 , 0;
1224 glVertex 0 , $h;
1225 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1226 glVertex $w, 0;
1227 glEnd;
1228
1229 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1230 } 1247 }
1231 1248
1232 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1233} 1250}
1234 1251
1235############################################################################# 1252#############################################################################
1236 1253
1237package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1238 1255
1239our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1240 1257
1241use CFPlus::OpenGL; 1258use DC::OpenGL;
1242 1259
1243sub new { 1260sub new {
1244 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1245 1262
1246 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1248 align => 1, 1265 align => 1,
1249 valign => 0, 1266 valign => 0.5,
1250 text => $arg{label}, 1267 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1252 } 1269 }
1253 1270
1254 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1255 # label => "", 1272 # label => "",
1256 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1257 border => 0.8, 1274 border => 0.8,
1258 style => 'single', 1275 style => 'single',
1259 %arg, 1276 %arg,
1260 ); 1277 );
1261 1278
… …
1264 1281
1265sub add { 1282sub add {
1266 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1267 1284
1268 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1270} 1287}
1271 1288
1272sub border { 1289sub border {
1273 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1274} 1291}
… …
1314 my $border = $self->border; 1331 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1316 1333
1317 $child->draw; 1334 $child->draw;
1318 1335
1319 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1320 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1332 } 1349 }
1333} 1350}
1334 1351
1335############################################################################# 1352#############################################################################
1336 1353
1337package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1338 1355
1339our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1340 1357
1341use CFPlus::OpenGL; 1358use DC::OpenGL;
1342 1359
1343my $bg = 1360my $bg =
1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1345 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1346 1363
1347my @border = 1364my @border =
1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1366 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350 1367
1351my @icon = 1368my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png); 1370 qw(x1_move.png x1_resize.png);
1354 1371
1355sub new { 1372sub new {
1356 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1357 1374
1358 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1359 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1360 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1361 border => 0.6, 1378 border => 0.8,
1362 can_events => 1, 1379 can_events => 1,
1363 min_w => 64, 1380 min_w => 64,
1364 min_h => 32, 1381 min_h => 32,
1365 %arg, 1382 %arg,
1366 ); 1383 );
1367 1384
1368 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1369 align => 0, 1386 align => 0.5,
1370 valign => 1, 1387 valign => 1,
1371 text => $self->{title}, 1388 text => $self->{title},
1372 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1373 if exists $self->{title}; 1390 if exists $self->{title};
1374 1391
1375 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1376 $self->{close_button} = 1393 $self->{close_button} =
1377 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1378 path => 'x1_close.png', 1395 path => 'x1_close.png',
1379 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1380 1397
1381 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1382 } 1399 }
1383 1400
1384 $self 1401 $self
1385} 1402}
1386 1403
1387sub add { 1404sub add {
1388 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1389 1406
1390 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1393} 1410}
1394 1411
1395sub border { 1412sub border {
1396 int $_[0]{border} * $::FONTSIZE 1413 int $_[0]{border} * $::FONTSIZE
1414}
1415
1416sub get_max_wh {
1417 my ($self) = @_;
1418
1419 return ($self->{w}, $self->{h})
1420 if $self->{visible} && $self->{w};
1421
1422 $self->SUPER::get_max_wh
1397} 1423}
1398 1424
1399sub size_request { 1425sub size_request {
1400 my ($self) = @_; 1426 my ($self) = @_;
1401 1427
… …
1526 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528 1554
1529 my $border = $self->border; 1555 my $border = $self->border;
1530 1556
1557 if ($border) {
1531 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536 1563
1537 # move 1564 # move
1538 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543 1570
1544 # resize 1571 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1550 1578
1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1552 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1553 1581
1554 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1573 if $self->{close_button}; 1601 if $self->{close_button};
1574} 1602}
1575 1603
1576############################################################################# 1604#############################################################################
1577 1605
1578package CFPlus::UI::Table; 1606package DC::UI::Table;
1579 1607
1580our @ISA = CFPlus::UI::Base::; 1608our @ISA = DC::UI::Container::;
1581 1609
1582use List::Util qw(max sum); 1610use List::Util qw(max sum);
1583 1611
1584use CFPlus::OpenGL; 1612use DC::OpenGL;
1585 1613
1586sub new { 1614sub new {
1587 my $class = shift; 1615 my $class = shift;
1588 1616
1589 $class->SUPER::new ( 1617 $class->SUPER::new (
1590 children => [],
1591 col_expand => [], 1618 col_expand => [],
1592 row_expand => [], 1619 row_expand => [],
1593 @_, 1620 @_,
1594 ) 1621 )
1595} 1622}
1596 1623
1597sub children {
1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1599}
1600
1601# TODO: store row/col info in child widget and use standard add/del
1602sub add { 1624sub add {
1603 my $self = shift; 1625 my ($self, @widgets) = @_;
1604 1626
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1627 for my $child (@widgets) {
1606 $self->add_at (@_); 1628 $child->{c_rowspan} ||= 1;
1629 $child->{c_colspan} ||= 1;
1630 }
1631
1632 $self->SUPER::add (@widgets);
1607} 1633}
1608 1634
1609sub add_at { 1635sub add_at {
1610 my $self = shift; 1636 my $self = shift;
1611 1637
1638 my @widgets;
1639
1612 while (@_) { 1640 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1614 1642
1615 $child->set_parent ($self); 1643 $child->{c_row} = $row;
1616 $self->{children}[$row][$col] = $child; 1644 $child->{c_col} = $col;
1617 }
1618 1645
1619 $self->{force_realloc} = 1; 1646 push @widgets, $child;
1620 $self->{force_size_alloc} = 1; 1647 }
1621 $self->realloc;
1622}
1623 1648
1624sub remove { 1649 $self->add (@widgets);
1650}
1651
1652sub get_wh {
1625 my ($self, $child) = @_; 1653 my ($self) = @_;
1626 1654
1627 for (@{ $self->{children} }) { 1655 my (@w, @h);
1628 for (@{ $_ || [] }) { 1656
1629 $_ = undef if $_ == $child; 1657 my @children = $self->children;
1658
1659 # first pass, columns
1660 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1661 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1662
1663 my $sw = sum @w[$c .. $c + $cs - 1];
1664
1665 if ($w > $sw) {
1666 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1630 } 1667 }
1631 } 1668 }
1632}
1633 1669
1634# TODO: move to container class maybe? send children a signal on removal? 1670 # second pass, rows
1635sub clear { 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1636 my ($self) = @_;
1637
1638 my @children = $self->children;
1639 delete $self->{children};
1640
1641 for (@children) {
1642 delete $_->{parent};
1643 $_->hide;
1644 }
1645
1646 $self->realloc;
1647}
1648
1649sub get_wh {
1650 my ($self) = @_;
1651
1652 my (@w, @h);
1653
1654 for my $y (0 .. $#{$self->{children}}) {
1655 my $row = $self->{children}[$y]
1656 or next;
1657
1658 for my $x (0 .. $#$row) {
1659 my $widget = $row->[$x]
1660 or next;
1661 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1662 1673
1663 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1664 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1665 } 1678 }
1666 } 1679 }
1667 1680
1668 (\@w, \@h) 1681 (\@w, \@h)
1669} 1682}
… …
1685 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1686 1699
1687 my $req_w = (sum @$ws) || 1; 1700 my $req_w = (sum @$ws) || 1;
1688 my $req_h = (sum @$hs) || 1; 1701 my $req_h = (sum @$hs) || 1;
1689 1702
1690 # TODO: nicer code 1703 # now linearly scale the rows/columns to the allocated size
1691 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1692 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1693 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1694 1707
1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1696 1709
1697 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1698 1711
1699 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1702 1715
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704 1717
1705 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1706 1719
1707 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1708 1722
1709 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1710 my $row = $self->{children}[$r] 1724 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1711 or next;
1712 1725
1713 my $x = 0; 1726 $widget->configure (
1714 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1715 1729 );
1716 for my $c (0 .. $#$row) {
1717 my $col_w = $ws->[$c];
1718
1719 if (my $widget = $row->[$c]) {
1720 $widget->configure ($x, $y, $col_w, $row_h);
1721 }
1722
1723 $x += $col_w;
1724 }
1725
1726 $y += $row_h;
1727 } 1730 }
1728 1731
1729 1 1732 1
1730} 1733}
1731 1734
1732sub find_widget {
1733 my ($self, $x, $y) = @_;
1734
1735 $x -= $self->{x};
1736 $y -= $self->{y};
1737
1738 my $res;
1739
1740 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1741 $res = $_->find_widget ($x, $y)
1742 and return $res;
1743 }
1744
1745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1746}
1747
1748sub _draw {
1749 my ($self) = @_;
1750
1751 for (grep $_, @{$self->{children}}) {
1752 $_->draw for grep $_, @$_;
1753 }
1754}
1755
1756############################################################################# 1735#############################################################################
1757 1736
1758package CFPlus::UI::Fixed; 1737package DC::UI::Fixed;
1759 1738
1760use List::Util qw(min max); 1739use List::Util qw(min max);
1761 1740
1762our @ISA = CFPlus::UI::Container::; 1741our @ISA = DC::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770 1742
1771sub _scale($$$) { 1743sub _scale($$$) {
1772 my ($mode, $val, $max) = @_; 1744 my ($rel, $val, $max) = @_;
1773 1745
1774 $mode eq "abs" ? $val 1746 $rel ? $val * $max : $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777} 1747}
1778 1748
1779sub size_request { 1749sub size_request {
1780 my ($self) = @_; 1750 my ($self) = @_;
1781 1751
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1752 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783 1753
1784 # determine overall size by querying abs widgets 1754 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) { 1755 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1756 unless ($child->{c_rel}) {
1757 my $x = $child->{c_x};
1758 my $y = $child->{c_y};
1787 1759
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1794 } 1762 }
1795 } 1763 }
1796 1764
1797 my $W = $x2 - $x1; 1765 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1; 1766 my $H = $y2 - $y1;
1799 1767
1800 # now layout remaining widgets 1768 # now layout remaining widgets
1801 for my $child ($self->visible_children) { 1769 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1770 if ($child->{c_rel}) {
1771 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1772 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1803 1773
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1812 } 1776 }
1813 } 1777 }
1814 1778
1815 my $W = $x2 - $x1; 1779 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1; 1780 my $H = $y2 - $y1;
… …
1820 1784
1821sub invoke_size_allocate { 1785sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_; 1786 my ($self, $W, $H) = @_;
1823 1787
1824 for my $child ($self->visible_children) { 1788 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1789 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1790 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1826 1791
1827 $x = _scale $pos, $x, $W; 1792 $x += $child->{c_halign} * $child->{req_w};
1828 $y = _scale $pos, $x, $H; 1793 $y += $child->{c_valign} * $child->{req_h};
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831 1794
1832 $child->configure ($x, $y, $w, $h); 1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1833 } 1796 }
1834 1797
1835 1 1798 1
1836} 1799}
1837 1800
1838############################################################################# 1801#############################################################################
1839 1802
1840package CFPlus::UI::Box; 1803package DC::UI::Box;
1841 1804
1842our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1843 1806
1844sub size_request { 1807sub size_request {
1845 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1846 1811
1847 $self->{vertical} 1812 $self->{vertical}
1848 ? ( 1813 ? (
1849 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1850 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1851 ) 1816 )
1852 : ( 1817 : (
1853 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1854 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1855 ) 1820 )
1856} 1821}
1857 1822
1858sub invoke_size_allocate { 1823sub invoke_size_allocate {
1859 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1880 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1881 for 0 .. $#children; 1846 for 0 .. $#children;
1882 } 1847 }
1883 } 1848 }
1884 1849
1885 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1886 1851
1887 my $pos = 0; 1852 my $pos = 0;
1888 for (0 .. $#children) { 1853 for (0 .. $#children) {
1889 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1855 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1895 1 1860 1
1896} 1861}
1897 1862
1898############################################################################# 1863#############################################################################
1899 1864
1900package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1901 1866
1902our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1903 1868
1904sub new { 1869sub new {
1905 my $class = shift; 1870 my $class = shift;
1906 1871
1907 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1910 ) 1875 )
1911} 1876}
1912 1877
1913############################################################################# 1878#############################################################################
1914 1879
1915package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1916 1881
1917our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1918 1883
1919sub new { 1884sub new {
1920 my $class = shift; 1885 my $class = shift;
1921 1886
1922 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1925 ) 1890 )
1926} 1891}
1927 1892
1928############################################################################# 1893#############################################################################
1929 1894
1930package CFPlus::UI::Label; 1895package DC::UI::Label;
1931 1896
1932our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1933 1898
1934use CFPlus::OpenGL; 1899use DC::OpenGL;
1935 1900
1936sub new { 1901sub new {
1937 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1938 1903
1939 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1944 #text => initial text 1909 #text => initial text
1945 #markup => initial narkup 1910 #markup => initial narkup
1946 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1947 #style => 0, # render flags 1912 #style => 0, # render flags
1948 ellipsise => 3, # end 1913 ellipsise => 3, # end
1949 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1950 fontsize => 1, 1915 fontsize => 1,
1951 align => -1, 1916 align => 0.5,
1952 valign => -1, 1917 valign => 0.5,
1953 padding_x => 2, 1918 padding_x => 4,
1954 padding_y => 2, 1919 padding_y => 2,
1955 can_events => 0, 1920 can_events => 0,
1956 %arg 1921 %arg
1957 ); 1922 );
1958 1923
1959 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1960 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1961 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1962 $self->{template} = $layout; 1927 $self->{template} = $layout;
1963 } 1928 }
1964 1929
1965 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1983 1948
1984 delete $self->{ox}; 1949 delete $self->{ox};
1985 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1986} 1951}
1987 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1988sub set_text { 1959sub set_text {
1989 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1990 1961
1991 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1992 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
… …
2015 1986
2016sub size_request { 1987sub size_request {
2017 my ($self) = @_; 1988 my ($self) = @_;
2018 1989
2019 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
2020 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
2021 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
2022 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
2023 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2024 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2025 1998
2026 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
2027 2000
2028 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
2029 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
2030 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
2031 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2032 2005
2033 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
2034 2007
2035 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
2091 2064
2092 [$self->{layout}->size] 2065 [$self->{layout}->size]
2093 }; 2066 };
2094 2067
2095 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
2096 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2069 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2097 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2070 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2098 : ($self->{w} - $size->[0]) * 0.5);
2099 2071
2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2102 : ($self->{h} - $size->[1]) * 0.5);
2103 }; 2073 };
2104 2074
2105 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2075# unless ($self->{list}) {
2106 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2076# $self->{list} = DC::OpenGL::glGenList;
2107 2077# DC::OpenGL::glNewList $self->{list};
2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2079# DC::OpenGL::glEndList;
2080# }
2081#
2082# DC::OpenGL::glCallList $self->{list};
2083
2084 $self->{layout}->draw;
2109} 2085}
2086
2087#sub destroy {
2088# my ($self) = @_;
2089#
2090# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2091#
2092# $self->SUPER::destroy;
2093#}
2110 2094
2111############################################################################# 2095#############################################################################
2112 2096
2113package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
2114 2098
2115our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
2116 2100
2117use CFPlus::OpenGL; 2101use DC::OpenGL;
2118 2102
2119sub new { 2103sub new {
2120 my $class = shift; 2104 my $class = shift;
2121 2105
2122 $class->SUPER::new ( 2106 $class->SUPER::new (
2123 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2124 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
2125 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
2126 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
2127 can_hover => 1, 2113 can_hover => 1,
2128 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
2129 valign => 0, 2116 valign => 0.5,
2130 can_events => 1, 2117 can_events => 1,
2131 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
2132 #text => ... 2121 #text => ...
2133 #hidden => "*", 2122 #hidden => "*",
2134 @_ 2123 @_
2135 ) 2124 )
2136} 2125}
… …
2183 2172
2184 my $text = $self->get_text; 2173 my $text = $self->get_text;
2185 2174
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2187 2176
2188 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2190 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2191 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2192 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2193 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2194 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2195 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2196 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2197 # what a hack 2186 # what a hack
2198 $self->{cursor} = 2187 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1 2189 ? length $1
2201 : 0; 2190 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2203 # uh, again 2192 # uh, again
2204 $self->{cursor} = 2193 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2207 : length $self->{text}; 2196 : length $self->{text};
… …
2271 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2272 } 2261 }
2273 2262
2274 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2275 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2276 glBegin GL_QUADS;
2277 glVertex 0 , 0;
2278 glVertex 0 , $self->{h};
2279 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2280 glVertex $self->{w}, 0;
2281 glEnd;
2282 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2283 2267
2284 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2285 2269
2286 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
2288 2272
2289 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
2290 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
2291 utf8::encode $text; 2275 utf8::encode $text;
2292 2276
2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2277 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2294 } 2278 }
2295 2279
2280 glColor_premultiply @{$self->{active_fg}};
2296 glBegin GL_LINES; 2281 glBegin GL_LINES;
2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2299 glEnd; 2284 glEnd;
2285
2286 glLineWidth 3;
2287 glColor @{$self->{active_outline}};
2288 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2289 glLineWidth 1;
2290
2291 } else {
2292 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2293 glBegin GL_LINE_STRIP;
2294 glVertex .5, $self->{h} * .5;
2295 glVertex .5, $self->{h} - 2.5;
2296 glVertex $self->{w} - .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} * .5;
2298 glEnd;
2300 } 2299 }
2301} 2300}
2302 2301
2303############################################################################# 2302#############################################################################
2304 2303
2305package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2306 2305
2307our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2308 2307
2309use CFPlus::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2310 2319
2311sub invoke_key_down { 2320sub invoke_key_down {
2312 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2313 2322
2314 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2320 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2321 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2322 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2323 $self->update; 2332 $self->update;
2324 2333
2325 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2326 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2327 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2328 } 2337 }
2329 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2330 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2332 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2333 } 2342 }
2334 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2335 } 2344 }
2336 2345
2337 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2338 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2340 2349
2341 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2342 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2343 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2344 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2345 } 2357 }
2346 2358
2347 } else { 2359 } else {
2348 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2349 } 2361 }
… …
2351 1 2363 1
2352} 2364}
2353 2365
2354############################################################################# 2366#############################################################################
2355 2367
2356package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2357 2369
2358our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2359 2371
2360use CFPlus::OpenGL; 2372use DC::OpenGL;
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 padding_y => 4,
2379
2380 @_
2381 )
2382}
2361 2383
2362sub move_cursor_ver { 2384sub move_cursor_ver {
2363 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2364 2386
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366 2388
2367 $y += $dy; 2389 $line += $dy;
2368 2390
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2391 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2370 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2371 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2372 $self->update; 2394 $self->update;
2373 return; 2395 return;
2374 } 2396 }
… …
2377sub invoke_key_down { 2399sub invoke_key_down {
2378 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2379 2401
2380 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2381 2403
2382 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2383 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2386 } else { 2408 } else {
2387 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2388 } 2410 }
2389 2411
2390 1 2412 1
2391} 2413}
2392 2414
2393############################################################################# 2415#############################################################################
2394 2416
2395package CFPlus::UI::Button; 2417package DC::UI::ButtonBin;
2396 2418
2397our @ISA = CFPlus::UI::Label::; 2419our @ISA = DC::UI::Bin::;
2398 2420
2399use CFPlus::OpenGL; 2421use DC::OpenGL;
2400 2422
2401my @tex = 2423my @tex =
2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2403 qw(b1_button_inactive.png b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2404 2426
2405sub new { 2427sub new {
2406 my $class = shift; 2428 my $class = shift;
2407 2429
2408 $class->SUPER::new ( 2430 $class->SUPER::new (
2431 can_hover => 1,
2432 align => 0.5,
2433 valign => 0.5,
2434 can_events => 1,
2435 @_
2436 )
2437}
2438
2439sub invoke_button_up {
2440 my ($self, $ev, $x, $y) = @_;
2441
2442 $self->emit ("activate")
2443 if $x >= 0 && $x < $self->{w}
2444 && $y >= 0 && $y < $self->{h};
2445
2446 1
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 glEnable GL_TEXTURE_2D;
2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2454 glColor 0, 0, 0, 1;
2455
2456 my $tex = $tex[$GRAB == $self];
2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2458
2459 glDisable GL_TEXTURE_2D;
2460
2461 $self->SUPER::_draw;
2462}
2463
2464#############################################################################
2465
2466package DC::UI::Button;
2467
2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
2471
2472my @tex =
2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2474 qw(b1_button_inactive.png b1_button_active.png);
2475
2476sub new {
2477 my $class = shift;
2478
2479 $class->SUPER::new (
2409 padding_x => 4, 2480 padding_x => 8,
2410 padding_y => 4, 2481 padding_y => 4,
2411 fg => [1.0, 1.0, 1.0], 2482 fg => [1.0, 1.0, 1.0],
2412 active_fg => [0.8, 0.8, 0.8], 2483 active_fg => [0.8, 0.8, 0.8],
2413 can_hover => 1, 2484 can_hover => 1,
2414 align => 0, 2485 align => 0.5,
2415 valign => 0, 2486 valign => 0.5,
2416 can_events => 1, 2487 can_events => 1,
2417 @_ 2488 @_
2418 ) 2489 )
2419} 2490}
2420 2491
… …
2445 $self->SUPER::_draw; 2516 $self->SUPER::_draw;
2446} 2517}
2447 2518
2448############################################################################# 2519#############################################################################
2449 2520
2450package CFPlus::UI::CheckBox; 2521package DC::UI::CheckBox;
2451 2522
2452our @ISA = CFPlus::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2453 2524
2454my @tex = 2525my @tex =
2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2456 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2457 2528
2458use CFPlus::OpenGL; 2529use DC::OpenGL;
2459 2530
2460sub new { 2531sub new {
2461 my $class = shift; 2532 my $class = shift;
2462 2533
2463 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2464 padding_x => 2, 2536 padding_x => 2,
2465 padding_y => 2, 2537 padding_y => 2,
2466 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2467 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2468 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2474} 2546}
2475 2547
2476sub size_request { 2548sub size_request {
2477 my ($self) = @_; 2549 my ($self) = @_;
2478 2550
2479 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2480} 2552}
2481 2553
2482sub toggle { 2554sub toggle {
2483 my ($self) = @_; 2555 my ($self) = @_;
2484 2556
… …
2503sub _draw { 2575sub _draw {
2504 my ($self) = @_; 2576 my ($self) = @_;
2505 2577
2506 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2507 2579
2508 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2509 2581
2510 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2511 2583
2512 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2584 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2513 2585
… …
2520 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2521} 2593}
2522 2594
2523############################################################################# 2595#############################################################################
2524 2596
2525package CFPlus::UI::Image; 2597package DC::UI::Image;
2526 2598
2527our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2528 2600
2529use CFPlus::OpenGL; 2601use DC::OpenGL;
2530 2602
2531our %texture_cache; 2603our %texture_cache;
2532 2604
2533sub new { 2605sub new {
2534 my $class = shift; 2606 my $class = shift;
2535 2607
2536 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2537 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2538 @_, 2611 @_,
2539 ); 2612 );
2540 2613
2541 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2543 2616
2544 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2546 2619
2547 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2548 2621
2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2550 2623
2551 $self 2624 $self
2552} 2625}
2553 2626
2554sub STORABLE_freeze { 2627sub STORABLE_freeze {
2555 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2556 2629
2557 $self->{path} 2630 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2559 2632
2560 $self->{path} 2633 $self->{path}
2561} 2634}
2562 2635
2563sub STORABLE_attach { 2636sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_; 2637 my ($self, $cloning, $path) = @_;
2565 2638
2566 $self->new (path => $path) 2639 $self->new (path => $path)
2567} 2640}
2568 2641
2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2647}
2648
2569sub size_request { 2649sub size_request {
2570 my ($self) = @_; 2650 my ($self) = @_;
2571 2651
2572 ($self->{tex}{w}, $self->{tex}{h}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2573} 2653}
2574 2654
2575sub _draw { 2655sub _draw {
2576 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2577 2659
2578 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2579 2661
2580 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2581 2663
… …
2587 } 2669 }
2588 2670
2589 glEnable GL_TEXTURE_2D; 2671 glEnable GL_TEXTURE_2D;
2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2591 2673
2592 $tex->draw_quad (0, 0, $w, $h); 2674 $tex->draw_quad_alpha (0, 0, $w, $h);
2593 2675
2594 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2595} 2677}
2596 2678
2597############################################################################# 2679#############################################################################
2598 2680
2599package CFPlus::UI::ImageButton; 2681package DC::UI::ImageButton;
2600 2682
2601our @ISA = CFPlus::UI::Image::; 2683our @ISA = DC::UI::Image::;
2602 2684
2603use CFPlus::OpenGL; 2685use DC::OpenGL;
2604
2605my %textures;
2606 2686
2607sub new { 2687sub new {
2608 my $class = shift; 2688 my $class = shift;
2609 2689
2610 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2611 padding_x => 4, 2691 padding_x => 4,
2612 padding_y => 4, 2692 padding_y => 4,
2613 fg => [1, 1, 1], 2693 fg => [1, 1, 1],
2614 active_fg => [0, 0, 1], 2694 active_fg => [0, 0, 1],
2615 can_hover => 1, 2695 can_hover => 1,
2616 align => 0, 2696 align => 0.5,
2617 valign => 0, 2697 valign => 0.5,
2618 can_events => 1, 2698 can_events => 1,
2619 @_ 2699 @_
2620 ); 2700 );
2621} 2701}
2622 2702
2703sub invoke_button_down {
2704 my ($self, $ev, $x, $y) = @_;
2705
2706 1
2707}
2708
2623sub invoke_button_up { 2709sub invoke_button_up {
2624 my ($self, $ev, $x, $y) = @_; 2710 my ($self, $ev, $x, $y) = @_;
2625 2711
2626 $self->emit ("activate") 2712 $self->emit ("activate")
2627 if $x >= 0 && $x < $self->{w} 2713 if $x >= 0 && $x < $self->{w}
… …
2630 1 2716 1
2631} 2717}
2632 2718
2633############################################################################# 2719#############################################################################
2634 2720
2635package CFPlus::UI::VGauge; 2721package DC::UI::VGauge;
2636 2722
2637our @ISA = CFPlus::UI::Base::; 2723our @ISA = DC::UI::Base::;
2638 2724
2639use List::Util qw(min max); 2725use List::Util qw(min max);
2640 2726
2641use CFPlus::OpenGL; 2727use DC::OpenGL;
2642 2728
2643my %tex = ( 2729my %tex = (
2644 food => [ 2730 food => [
2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2647 ], 2733 ],
2648 grace => [ 2734 grace => [
2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2736 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2651 ], 2737 ],
2652 hp => [ 2738 hp => [
2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2655 ], 2741 ],
2656 mana => [ 2742 mana => [
2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2744 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2659 ], 2745 ],
2660); 2746);
2661 2747
2662# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2765 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2766} 2852}
2767 2853
2768############################################################################# 2854#############################################################################
2769 2855
2856package DC::UI::Progress;
2857
2858our @ISA = DC::UI::Label::;
2859
2860use DC::OpenGL;
2861
2862sub new {
2863 my ($class, %arg) = @_;
2864
2865 my $self = $class->SUPER::new (
2866 padding_x => 2,
2867 padding_y => 2,
2868 fg => [1, 1, 1],
2869 bg => [0, 0, 1, 0.2],
2870 bar => [0.7, 0.5, 0.1, 0.8],
2871 outline => [0.4, 0.3, 0],
2872 fontsize => 0.9,
2873 valign => 0.5,
2874 align => 0.5,
2875 can_events => 1,
2876 ellipsise => 1,
2877 label => "%d%%",
2878 %arg,
2879 );
2880
2881 $self->set_value ($arg{value} || -1);
2882
2883 $self
2884}
2885
2886sub set_label {
2887 my ($self, $label) = @_;
2888
2889 return if $self->{label} eq $label;
2890 $self->{label} = $label;
2891
2892 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2893}
2894
2895sub set_value {
2896 my ($self, $value) = @_;
2897
2898 if ($self->{value} ne $value) {
2899 $self->{value} = $value;
2900
2901 if ($value < 0) {
2902 $self->set_text ("-");
2903 } else {
2904 $self->set_text (sprintf $self->{label}, $value * 100);
2905 }
2906
2907 $self->update;
2908 }
2909}
2910
2911sub _draw {
2912 my ($self) = @_;
2913
2914 glEnable GL_BLEND;
2915 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2916
2917 my $px = $self->{padding_x};
2918 my $py = $self->{padding_y};
2919
2920 if ($self->{value} >= 0) {
2921 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2922
2923 glColor_premultiply @{$self->{bar}};
2924 glRect $px, $py, $s, $self->{h} - $py;
2925 glColor_premultiply @{$self->{bg}};
2926 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2927 }
2928
2929 glColor_premultiply @{$self->{outline}};
2930
2931 $px -= .5;
2932 $py -= .5;
2933
2934 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2935
2936 glDisable GL_BLEND;
2937
2938 {
2939 local $self->{bg}; # do not draw background
2940 $self->SUPER::_draw;
2941 }
2942}
2943
2944#############################################################################
2945
2946package DC::UI::ExperienceProgress;
2947
2948our @ISA = DC::UI::Progress::;
2949
2950sub new {
2951 my ($class, %arg) = @_;
2952
2953 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2954
2955 my $self = $class->SUPER::new (
2956 %arg,
2957 tooltip => sub {
2958 my ($self) = @_;
2959
2960 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2961 $tt,
2962 $self->{lvl},
2963 ::formsep ($self->{exp}),
2964 ::formsep ($self->{nxt}),
2965 ::formsep ($self->{nxt} - $self->{exp}),
2966 $self->_percent * 100,
2967 },
2968 );
2969
2970 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2971 if $::CONN;
2972
2973 $self
2974}
2975
2976sub DESTROY {
2977 my ($self) = @_;
2978
2979 delete $::CONN->{on_exp_update}{$self+0}
2980 if $::CONN;
2981
2982 $self->SUPER::DESTROY;
2983}
2984
2985sub _percent {
2986 my ($self) = @_;
2987
2988 my $table = $::CONN && $::CONN->{exp_table}
2989 or return -1;
2990
2991 my $l0 = $table->[$self->{lvl} - 1];
2992 my $l1 = $table->[$self->{lvl}];
2993
2994 $self->{nxt} = $l1;
2995
2996 ($self->{exp} - $l0) / ($l1 - $l0)
2997}
2998
2999sub set_value {
3000 my ($self, $lvl, $exp) = @_;
3001
3002 $self->{lvl} = $lvl;
3003 $self->{exp} = $exp;
3004
3005 $self->SUPER::set_value ($self->_percent);
3006}
3007
3008#############################################################################
3009
2770package CFPlus::UI::Gauge; 3010package DC::UI::Gauge;
2771 3011
2772our @ISA = CFPlus::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2773 3013
2774sub new { 3014sub new {
2775 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2776 3016
2777 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2779 can_hover => 1, 3019 can_hover => 1,
2780 can_events => 1, 3020 can_events => 1,
2781 %arg, 3021 %arg,
2782 ); 3022 );
2783 3023
2784 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3024 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2785 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3025 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3026 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2787 3027
2788 $self 3028 $self
2789} 3029}
2790 3030
2791sub set_fontsize { 3031sub set_fontsize {
… …
2812 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2813} 3053}
2814 3054
2815############################################################################# 3055#############################################################################
2816 3056
2817package CFPlus::UI::Slider; 3057package DC::UI::Slider;
2818 3058
2819use strict; 3059use strict;
2820 3060
2821use CFPlus::OpenGL; 3061use DC::OpenGL;
2822 3062
2823our @ISA = CFPlus::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2824 3064
2825my @tex = 3065my @tex =
2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2827 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2828 3068
2829sub new { 3069sub new {
2830 my $class = shift; 3070 my $class = shift;
2831 3071
… …
2868sub set_value { 3108sub set_value {
2869 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2870 3110
2871 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2872 3112
2873 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2874 3114
2875 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2876
2877 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2878 $value = $hi - $page if $value > $hi - $page;
2879 3117
2880 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2881 if $unit; 3119 if $unit;
2882 3120
2883 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2899 3137
2900 $self->SUPER::invoke_button_down ($ev, $x, $y); 3138 $self->SUPER::invoke_button_down ($ev, $x, $y);
2901 3139
2902 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3140 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2903 3141
2904 $self->invoke_mouse_motion ($ev, $x, $y) 3142 $self->invoke_mouse_motion ($ev, $x, $y);
3143
3144 1
2905} 3145}
2906 3146
2907sub invoke_mouse_motion { 3147sub invoke_mouse_motion {
2908 my ($self, $ev, $x, $y) = @_; 3148 my ($self, $ev, $x, $y) = @_;
2909 3149
… …
2925sub invoke_mouse_wheel { 3165sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_; 3166 my ($self, $ev) = @_;
2927 3167
2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3168 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2929 3169
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3170 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2931 3171
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3172 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933 3173
2934 ! ! $delta 3174 1
2935} 3175}
2936 3176
2937sub update { 3177sub update {
2938 my ($self) = @_; 3178 my ($self) = @_;
2939 3179
… …
2945 my ($self) = @_; 3185 my ($self) = @_;
2946 3186
2947 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
2948 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2949 3189
2950 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2951 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2952 3192
2953 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3193 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2954 3194
2955 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3195 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2956 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2957 3197
2958 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
… …
2988 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
2989} 3229}
2990 3230
2991############################################################################# 3231#############################################################################
2992 3232
2993package CFPlus::UI::ValSlider; 3233package DC::UI::ValSlider;
2994 3234
2995our @ISA = CFPlus::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
2996 3236
2997sub new { 3237sub new {
2998 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
2999 3239
3000 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
3001 3241
3002 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3005 to_value => sub { shift }, 3245 to_value => sub { shift },
3006 from_value => sub { shift }, 3246 from_value => sub { shift },
3007 %arg, 3247 %arg,
3008 ); 3248 );
3009 3249
… …
3029sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
3030sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
3031 3271
3032############################################################################# 3272#############################################################################
3033 3273
3034package CFPlus::UI::TextScroller; 3274package DC::UI::TextScroller;
3035 3275
3036our @ISA = CFPlus::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
3037 3277
3038use CFPlus::OpenGL; 3278use DC::OpenGL;
3039 3279
3040sub new { 3280sub new {
3041 my $class = shift; 3281 my $class = shift;
3042 3282
3043 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
… …
3045 can_events => 1, 3285 can_events => 1,
3046 indent => 0, 3286 indent => 0,
3047 #font => default_font 3287 #font => default_font
3048 @_, 3288 @_,
3049 3289
3050 layout => (new CFPlus::Layout), 3290 layout => (new DC::Layout),
3051 par => [], 3291 par => [],
3052 max_par => 0, 3292 max_par => 0,
3053 height => 0, 3293 height => 0,
3054 children => [ 3294 children => [
3055 (new CFPlus::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
3056 (new CFPlus::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
3057 ], 3297 ],
3058 ); 3298 );
3059 3299
3060 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
3061 3301
… …
3070} 3310}
3071 3311
3072sub size_request { 3312sub size_request {
3073 my ($self) = @_; 3313 my ($self) = @_;
3074 3314
3075 my ($empty, $slider) = @{ $self->{children} }; 3315 my ($empty, $slider) = $self->visible_children;
3076 3316
3077 local $self->{children} = [$empty, $slider]; 3317 local $self->{children} = [$empty, $slider];
3078 $self->SUPER::size_request 3318 $self->SUPER::size_request
3079} 3319}
3080 3320
… …
3117 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3118 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
3119 3359
3120 $layout->set_shapes ( 3360 $layout->set_shapes (
3121 map 3361 map
3122 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3123 @{$para->{widget}} 3363 @{$para->{widget}}
3124 ); 3364 );
3125 3365
3126 $layout 3366 $layout
3127} 3367}
… …
3244 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate; 3485 $self->force_uptodate;
3246 3486
3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3248 3488
3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3250 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
3251 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
3252 3492
3253 package CFPlus::UI::Base; 3493 package DC::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3494 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h}); 3495 (0, 0, $self->{w}, $self->{h});
3256 3496
3257 my $top = int $self->{children}[1]{range}[0]; 3497 my $top = int $self->{children}[1]{range}[0];
3258 3498
… …
3269 3509
3270 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
3271 my $layout = $self->get_layout ($para); 3511 my $layout = $self->get_layout ($para);
3272 3512
3273 $layout->render ($para->{indent}, $y - $y0); 3513 $layout->render ($para->{indent}, $y - $y0);
3514 $layout->draw;
3274 3515
3275 if (my @w = @{ $para->{widget} }) { 3516 if (my @w = @{ $para->{widget} }) {
3276 my @s = $layout->get_shapes; 3517 my @s = $layout->get_shapes;
3277 3518
3278 for (@w) { 3519 for (@w) {
… …
3316 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
3317} 3558}
3318 3559
3319############################################################################# 3560#############################################################################
3320 3561
3321package CFPlus::UI::Animator; 3562package DC::UI::Animator;
3322 3563
3323use CFPlus::OpenGL; 3564use DC::OpenGL;
3324 3565
3325our @ISA = CFPlus::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
3326 3567
3327sub moveto { 3568sub moveto {
3328 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
3329 3570
3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3358 glPopMatrix; 3599 glPopMatrix;
3359} 3600}
3360 3601
3361############################################################################# 3602#############################################################################
3362 3603
3363package CFPlus::UI::Flopper; 3604package DC::UI::Flopper;
3364 3605
3365our @ISA = CFPlus::UI::Button::; 3606our @ISA = DC::UI::Button::;
3366 3607
3367sub new { 3608sub new {
3368 my $class = shift; 3609 my $class = shift;
3369 3610
3370 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
… …
3382 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
3383} 3624}
3384 3625
3385############################################################################# 3626#############################################################################
3386 3627
3387package CFPlus::UI::Tooltip; 3628package DC::UI::Tooltip;
3388 3629
3389our @ISA = CFPlus::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
3390 3631
3391use CFPlus::OpenGL; 3632use DC::OpenGL;
3392 3633
3393sub new { 3634sub new {
3394 my $class = shift; 3635 my $class = shift;
3395 3636
3396 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
3400} 3641}
3401 3642
3402sub set_tooltip_from { 3643sub set_tooltip_from {
3403 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
3404 3645
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
3407
3408 my $tooltip = $widget->{tooltip}; 3646 my $tip = $widget->{tooltip};
3647 $tip = $tip->($widget) if "CODE" eq ref $tip;
3648
3649 $tip = DC::Pod::section_label tooltip => $1
3650 if $tip =~ /^#(.*)$/;
3409 3651
3410 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
3411 $tooltip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
3412 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3413 . "req $widget->{req_w} $widget->{req_h}\n" 3655 . "req $widget->{req_w} $widget->{req_h}\n"
3414 . "visible $widget->{visible}"; 3656 . "visible $widget->{visible}";
3415 } 3657 }
3416 3658
3417 $tooltip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
3418 $tooltip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
3419 3661
3420 $self->add (new CFPlus::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
3421 markup => $tooltip, 3664 markup => $tip,
3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
3423 fontsize => 0.8, 3667 fontsize => 0.8,
3424 style => 1, # FLAG_INVERSE 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3425 ellipsise => 0, 3669 ellipsise => 0,
3426 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
3427 ); 3671 );
3428} 3672}
3429 3673
… …
3464} 3708}
3465 3709
3466sub _draw { 3710sub _draw {
3467 my ($self) = @_; 3711 my ($self) = @_;
3468 3712
3469 glTranslate 0.375, 0.375;
3470
3471 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
3472 3714
3473 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
3474 glBegin GL_QUADS; 3716 glRect 0, 0, $w, $h;
3475 glVertex 0 , 0;
3476 glVertex 0 , $h;
3477 glVertex $w, $h;
3478 glVertex $w, 0;
3479 glEnd;
3480 3717
3481 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
3482 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
3483 glVertex 0 , 0;
3484 glVertex 0 , $h;
3485 glVertex $w, $h;
3486 glVertex $w, 0;
3487 glEnd;
3488 3720
3489 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
3490 3722
3491 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
3492} 3724}
3493 3725
3494############################################################################# 3726#############################################################################
3495 3727
3496package CFPlus::UI::Face; 3728package DC::UI::Face;
3497 3729
3498our @ISA = CFPlus::UI::DrawBG::; 3730our @ISA = DC::UI::DrawBG::;
3499 3731
3500use CFPlus::OpenGL; 3732use DC::OpenGL;
3501 3733
3502sub new { 3734sub new {
3503 my $class = shift; 3735 my $class = shift;
3504 3736
3505 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
… …
3508 aspect => 1, 3740 aspect => 1,
3509 can_events => 0, 3741 can_events => 0,
3510 @_, 3742 @_,
3511 ); 3743 );
3512 3744
3513 if ($self->{anim} && $self->{animspeed}) {
3514 CFPlus::weaken (my $widget = $self);
3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3518 $self->{timer} = Event->timer (
3519 parked => 1,
3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
3523 ++$widget->{frame};
3524 $widget->update_face;
3525 $widget->update;
3526
3527 $widget->update_timer;
3528 },
3529 );
3530
3531 $self->update_face;
3532 $self->update_timer; 3745 $self->update_anim;
3533 }
3534 3746
3535 $self 3747 $self
3536} 3748}
3537 3749
3538sub update_timer { 3750sub update_timer {
3539 my ($self) = @_; 3751 my ($self) = @_;
3540 3752
3541 return unless $self->{timer}; 3753 return unless $self->{timer};
3542 3754
3543 if ($self->{visible}) { 3755 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start; 3756 $self->{timer}->start;
3550 } else { 3757 } else {
3551 $self->{timer}->stop; 3758 $self->{timer}->stop;
3552 } 3759 }
3553} 3760}
3554 3761
3555sub update_face { 3762sub update_face {
3556 my ($self) = @_; 3763 my ($self) = @_;
3557 3764
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
3568sub size_request {
3569 my ($self) = @_;
3570
3571 if ($::CONN) { 3765 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3766 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) { 3767 if ($anim && @$anim) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3768 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3575 } else { 3769 delete $self->{face_change_cb};
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3770
3577 $self->realloc; 3771 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3772 unless ($tex->{name} || $tex->{loading}) {
3773 $tex->upload (sub { $self->reconfigure });
3774 }
3578 }); 3775 }
3579 } 3776 }
3580 } 3777 }
3581 } 3778 }
3779}
3780
3781sub update_anim {
3782 my ($self) = @_;
3783
3784 if ($self->{anim} && $self->{animspeed}) {
3785 DC::weaken (my $widget = $self);
3786
3787 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3788 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3789 return unless $::CONN;
3790
3791 my $w = $widget
3792 or return;
3793
3794 ++$w->{frame};
3795 $w->update_face;
3796
3797 # somehow, $widget can go away
3798 $w->update;
3799 $w->update_timer;
3800 };
3801
3802 $self->update_face;
3803 $self->update_timer;
3804 } else {
3805 delete $self->{timer};
3806 }
3807}
3808
3809sub size_request {
3810 my ($self) = @_;
3811
3812 if ($::CONN) {
3813 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3814 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3815 if ($tex->{name}) {
3816 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3817 } elsif (!$tex->{loading}) {
3818 $tex->upload (sub { $self->reconfigure });
3819 }
3820 }
3821
3822 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3823 }
3824 }
3582 3825
3583 ($self->{size_w} || 8, $self->{size_h} || 8) 3826 ($self->{size_w} || 8, $self->{size_h} || 8)
3584} 3827}
3585 3828
3586sub update { 3829sub update {
… …
3589 return unless $self->{visible}; 3832 return unless $self->{visible};
3590 3833
3591 $self->SUPER::update; 3834 $self->SUPER::update;
3592} 3835}
3593 3836
3837sub set_face {
3838 my ($self, $face) = @_;
3839
3840 $self->{face} = $face;
3841 $self->reconfigure;
3842}
3843
3844sub set_anim {
3845 my ($self, $anim) = @_;
3846
3847 $self->{anim} = $anim;
3848 $self->update_anim;
3849}
3850
3851sub set_animspeed {
3852 my ($self, $animspeed) = @_;
3853
3854 $self->{animspeed} = $animspeed;
3855 $self->update_anim;
3856}
3857
3594sub invoke_visibility_change { 3858sub invoke_visibility_change {
3595 my ($self) = @_; 3859 my ($self) = @_;
3596 3860
3597 $self->update_timer; 3861 $self->update_timer;
3598 3862
… …
3600} 3864}
3601 3865
3602sub _draw { 3866sub _draw {
3603 my ($self) = @_; 3867 my ($self) = @_;
3604 3868
3605 return unless $::CONN;
3606
3607 $self->SUPER::_draw; 3869 $self->SUPER::_draw;
3608 3870
3609 my $faceid = $::CONN->{faceid}[$self->{face}] 3871 if (my $tex = $self->{tex}) {
3610 or return;
3611
3612 my $tex = $::CONN->{texture}[$faceid];
3613
3614 if ($tex) {
3615 glEnable GL_TEXTURE_2D; 3872 glEnable GL_TEXTURE_2D;
3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3617 glColor 0, 0, 0, 1; 3874 glColor 0, 0, 0, 1;
3618 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3619 glDisable GL_TEXTURE_2D; 3876 glDisable GL_TEXTURE_2D;
… …
3629 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3630} 3887}
3631 3888
3632############################################################################# 3889#############################################################################
3633 3890
3634package CFPlus::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3635 3892
3636our @ISA = CFPlus::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3637 3894
3638# TODO: should actually wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3639 3896
3640############################################################################# 3897#############################################################################
3641 3898
3642package CFPlus::UI::Menu; 3899package DC::UI::Menu;
3643 3900
3644our @ISA = CFPlus::UI::Toplevel::; 3901our @ISA = DC::UI::Toplevel::;
3645 3902
3646use CFPlus::OpenGL; 3903use DC::OpenGL;
3647 3904
3648sub new { 3905sub new {
3649 my $class = shift; 3906 my $class = shift;
3650 3907
3651 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3652 items => [], 3909 items => [],
3653 z => 100, 3910 z => 100,
3654 @_, 3911 @_,
3655 ); 3912 );
3656 3913
3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3658 3915
3659 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3660 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3661 3918
3662 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3663 if (!ref $widget) { 3920 if (!ref $widget) {
3664 if ($widget =~ /\t/) { 3921 if ($widget =~ /\t/) {
3665 my ($left, $right) = split /\t/, $widget, 2; 3922 my ($left, $right) = split /\t/, $widget, 2;
3666 3923
3667 $widget = new CFPlus::UI::HBox 3924 $widget = new DC::UI::HBox
3668 can_hover => 1, 3925 can_hover => 1,
3669 can_events => 1, 3926 can_events => 1,
3670 tooltip => $tooltip, 3927 tooltip => $tooltip,
3671 children => [ 3928 children => [
3672 (new CFPlus::UI::Label markup => $left, expand => 1), 3929 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3673 (new CFPlus::UI::Label markup => $right, align => +1), 3930 (new DC::UI::Label markup => $right, align => 1),
3674 ], 3931 ],
3675 ; 3932 ;
3676 3933
3677 } else { 3934 } else {
3678 $widget = new CFPlus::UI::Label 3935 $widget = new DC::UI::Label
3679 can_hover => 1, 3936 can_hover => 1,
3680 can_events => 1, 3937 can_events => 1,
3938 align => 0,
3681 markup => $widget, 3939 markup => $widget,
3682 tooltip => $tooltip; 3940 tooltip => $tooltip;
3683 } 3941 }
3684 } 3942 }
3685 3943
… …
3700 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3701 $GRAB = $self; 3959 $GRAB = $self;
3702 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3703 3961
3704 $self->show; 3962 $self->show;
3705 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3963
3964 my $x = $ev->{x};
3965 my $y = $ev->{y};
3966
3967 $self->{root}->on_post_alloc ($self => sub {
3968 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3969 });
3970
3971 1 # so it can be used inside event handlers
3706} 3972}
3707 3973
3708sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3709 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3710 3976
… …
3731 1 3997 1
3732} 3998}
3733 3999
3734############################################################################# 4000#############################################################################
3735 4001
3736package CFPlus::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3737 4003
3738our @ISA = CFPlus::UI::Container::; 4004our @ISA = DC::UI::Container::;
3739 4005
3740sub new { 4006sub new {
3741 my $class = shift; 4007 my $class = shift;
3742 4008
3743 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3744 @_, 4010 @_,
3745 ); 4011 );
3746 4012
3747 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3748 if @{ $self->{children} };
3749 4014
3750 $self 4015 $self
3751} 4016}
3752 4017
3753sub add { 4018sub add {
3754 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3755 4020
3756 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3757 4022
3758 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3759 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
3760} 4025}
3761 4026
3762sub get_current_page { 4027sub get_current_page {
3763 my ($self) = @_; 4028 my ($self) = @_;
3764 4029
… …
3770 4035
3771 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3772 ? $page_or_widget 4037 ? $page_or_widget
3773 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3774 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3775 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3776 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3777 4045
3778 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3779 4048
3780 $self->realloc; 4049 $self->realloc;
3781} 4050}
3782 4051
3783sub visible_children { 4052sub visible_children {
3784 $_[0]{current} 4053 $_[0]{current} || ()
3785} 4054}
3786 4055
3787sub size_request { 4056sub size_request {
3788 my ($self) = @_; 4057 my ($self) = @_;
3789 4058
4059 $self->{current}
3790 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3791} 4062}
3792 4063
3793sub invoke_size_allocate { 4064sub invoke_size_allocate {
3794 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3795 4066
3796 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3797 4069
3798 1 4070 1
3799} 4071}
3800 4072
3801sub _draw { 4073sub _draw {
3802 my ($self) = @_; 4074 my ($self) = @_;
3803 4075
3804 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3805} 4078}
3806 4079
3807############################################################################# 4080#############################################################################
3808 4081
3809package CFPlus::UI::Notebook; 4082package DC::UI::Notebook;
3810 4083
4084use DC::OpenGL;
4085
3811our @ISA = CFPlus::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3812 4087
3813sub new { 4088sub new {
3814 my $class = shift; 4089 my $class = shift;
3815 4090
3816 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3817 buttonbar => (new CFPlus::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
4094 active_outline => [.7, .7, 0.2],
3819 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3820 @_, 4096 @_,
3821 ); 4097 );
3822 4098
3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4099 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3824 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4100 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3825 4101
4102 {
4103 Scalar::Util::weaken (my $wself = $self);
4104
4105 $self->{multiplexer}->connect (c_add => sub {
4106 my ($mplex, $widgets) = @_;
4107
4108 for my $child (@$widgets) {
4109 Scalar::Util::weaken $child;
4110 $child->{c_tab_} ||= do {
4111 my $tab =
4112 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4113 ? $child->{c_tab}
4114 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4115
4116 $tab->connect (activate => sub {
4117 $wself->set_current_page ($child);
4118 });
4119
4120 $tab
4121 };
4122
4123 $self->{buttonbar}->add ($child->{c_tab_});
4124 }
4125 });
4126
4127 $self->{multiplexer}->connect (c_remove => sub {
4128 my ($mplex, $widgets) = @_;
4129
4130 for my $child (@$widgets) {
4131 $wself->{buttonbar}->remove ($child->{c_tab_});
4132 }
4133 });
4134 }
4135
3826 $self 4136 $self
3827} 4137}
3828 4138
3829sub add { 4139sub add {
4140 my ($self, @widgets) = @_;
4141
4142 $self->{multiplexer}->add (@widgets)
4143}
4144
4145sub remove {
4146 my ($self, @widgets) = @_;
4147
4148 $self->{multiplexer}->remove (@widgets)
4149}
4150
4151sub pages {
4152 my ($self) = @_;
4153 $self->{multiplexer}->children
4154}
4155
4156sub page_index {
4157 my ($self, $widget) = @_;
4158
4159 my $i = 0;
4160 for ($self->pages) {
4161 if ($_ eq $widget) { return $i };
4162 $i++;
4163 }
4164
4165 undef
4166}
4167
4168sub add_tab {
3830 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
3831 4170
3832 CFPlus::weaken $self; 4171 $title = [$title, $tooltip] unless ref $title;
4172 $widget->{c_tab} = $title;
3833 4173
3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3835 markup => $title,
3836 tooltip => $tooltip,
3837 on_activate => sub { $self->set_current_page ($widget) },
3838 );
3839
3840 $self->{multiplexer}->add ($widget); 4174 $self->add ($widget);
3841} 4175}
3842 4176
3843sub get_current_page { 4177sub get_current_page {
3844 my ($self) = @_; 4178 my ($self) = @_;
3845 4179
… …
3851 4185
3852 $self->{multiplexer}->set_current_page ($page); 4186 $self->{multiplexer}->set_current_page ($page);
3853 $self->emit (page_changed => $self->{multiplexer}{current}); 4187 $self->emit (page_changed => $self->{multiplexer}{current});
3854} 4188}
3855 4189
4190sub _draw {
4191 my ($self) = @_;
4192
4193 $self->SUPER::_draw ();
4194
4195 if (my $cur = $self->{multiplexer}{current}) {
4196 if ($cur = $cur->{c_tab_}) {
4197 glTranslate $self->{buttonbar}{x} + $cur->{x},
4198 $self->{buttonbar}{y} + $cur->{y};
4199 glLineWidth 3;
4200 #glEnable GL_BLEND;
4201 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4202 glColor @{$self->{active_outline}};
4203 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4204 glLineWidth 1;
4205 #glDisable GL_BLEND;
4206 }
4207 }
4208}
4209
3856############################################################################# 4210#############################################################################
3857 4211
3858package CFPlus::UI::Selector; 4212package DC::UI::Selector;
3859 4213
3860use utf8; 4214use utf8;
3861 4215
3862our @ISA = CFPlus::UI::Button::; 4216our @ISA = DC::UI::Button::;
3863 4217
3864sub new { 4218sub new {
3865 my $class = shift; 4219 my $class = shift;
3866 4220
3867 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
… …
3884 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
3885 4239
3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3887 } 4241 }
3888 4242
3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3890} 4244}
3891 4245
3892sub _set_value { 4246sub _set_value {
3893 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
3894 4248
3895 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4249 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4250 $item ||= $self->{options}[0]
3896 or return; 4251 or return;
3897 4252
3898 $self->{value} = $item->[0]; 4253 $self->{value} = $item->[0];
3899 $self->set_markup ("$item->[1] ⇓"); 4254 $self->set_markup ("$item->[1] ⇓");
3900 $self->set_tooltip ($item->[2]); 4255# $self->set_tooltip ($item->[2]);
3901} 4256}
3902 4257
3903sub set_value { 4258sub set_value {
3904 my ($self, $value) = @_; 4259 my ($self, $value) = @_;
3905 4260
… …
3907 4262
3908 $self->_set_value ($value); 4263 $self->_set_value ($value);
3909 $self->emit (changed => $value); 4264 $self->emit (changed => $value);
3910} 4265}
3911 4266
4267sub set_options {
4268 my ($self, $options) = @_;
4269
4270 $self->{options} = $options;
4271 $self->_set_value ($self->{value});
4272}
4273
3912############################################################################# 4274#############################################################################
3913 4275
3914package CFPlus::UI::Statusbox; 4276package DC::UI::Statusbox;
3915 4277
3916our @ISA = CFPlus::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
3917 4279
3918sub new { 4280sub new {
3919 my $class = shift; 4281 my $class = shift;
3920 4282
3921 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
3922 fontsize => 0.8, 4284 fontsize => 0.8,
3923 @_, 4285 @_,
3924 ); 4286 );
3925 4287
3926 CFPlus::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
3927 4289
3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3929 4291
3930 $self 4292 $self
3931} 4293}
3932 4294
3933sub reorder { 4295sub reorder {
3934 my ($self) = @_; 4296 my ($self) = @_;
3935 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
3936 4298
3937 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
3938 return if $CFPlus::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3940 values %{ $self->{item} }; 4302 values %{ $self->{item} };
3941 4303
3942 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
3943 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3944 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
3945 4309
3946 my @widgets; 4310 my @widgets;
3947 4311
3948 my @items = sort { 4312 my @items = sort {
3949 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
3950 or $b->{id} <=> $a->{id} 4314 or $b->{id} <=> $a->{id}
3951 } values %{ $self->{item} }; 4315 } values %{ $self->{item} };
3952
3953 $self->{timer}->interval (1);
3954 4316
3955 my $count = 10 + 1; 4317 my $count = 10 + 1;
3956 for my $item (@items) { 4318 for my $item (@items) {
3957 last unless --$count; 4319 last unless --$count;
3958 4320
… …
3965 for ($short) { 4327 for ($short) {
3966 s/^\s+//; 4328 s/^\s+//;
3967 s/\s+/ /g; 4329 s/\s+/ /g;
3968 } 4330 }
3969 4331
3970 new CFPlus::UI::Label 4332 new DC::UI::Label
3971 markup => $short, 4333 markup => $short,
3972 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
3973 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
3974 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
3975 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
3976 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
3977 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
3978 can_events => 1, 4341 can_events => 1,
3979 can_hover => 1 4342 can_hover => 1
3980 }; 4343 };
3981 4344
3982 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4345 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3983 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4346 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3984 $label->update; 4347 $label->update;
3985 $label->set_max_size (undef, $label->{req_h} * $diff) 4348 $label->set_max_size (undef, $label->{req_h} * $diff)
3986 if $diff < 1; 4349 if $diff < 1;
3987 $self->{timer}->interval (1/30); 4350 $self->{timer}->set (1/30, 1/30);
3988 } else { 4351 } else {
3989 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
3990 } 4353 }
3991 4354
3992 push @widgets, $label; 4355 push @widgets, $label;
3993 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
3994 4361
3995 $self->clear; 4362 $self->clear;
3996 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
3997} 4364}
3998 4365
… …
4054 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
4055} 4422}
4056 4423
4057############################################################################# 4424#############################################################################
4058 4425
4059package CFPlus::UI::Root; 4426package DC::UI::Root;
4060 4427
4061our @ISA = CFPlus::UI::Container::; 4428our @ISA = DC::UI::Container::;
4062 4429
4063use List::Util qw(min max); 4430use List::Util qw(min max);
4064 4431
4065use CFPlus::OpenGL; 4432use DC::OpenGL;
4066 4433
4067sub new { 4434sub new {
4068 my $class = shift; 4435 my $class = shift;
4069 4436
4070 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
4071 visible => 1, 4438 visible => 1,
4072 @_, 4439 @_,
4073 ); 4440 );
4074 4441
4075 CFPlus::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
4076 4443
4077 $self 4444 $self
4078} 4445}
4079 4446
4080sub size_request { 4447sub size_request {
… …
4128} 4495}
4129 4496
4130sub update { 4497sub update {
4131 my ($self) = @_; 4498 my ($self) = @_;
4132 4499
4133 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
4134} 4501}
4135 4502
4136sub add { 4503sub add {
4137 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
4138 4505
… …
4175 while ($self->{refresh_hook}) { 4542 while ($self->{refresh_hook}) {
4176 $_->() 4543 $_->()
4177 for values %{delete $self->{refresh_hook}}; 4544 for values %{delete $self->{refresh_hook}};
4178 } 4545 }
4179 4546
4180 if ($self->{realloc}) { 4547 while ($self->{realloc}) {
4181 my %queue; 4548 my %queue;
4182 my @queue; 4549 my @queue;
4183 my $widget; 4550 my $widget;
4184 4551
4185 outer: 4552 outer:
… …
4205 4572
4206 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
4207 4574
4208 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
4209 4576
4210 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
4211 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4578 $h += $widget->{padding_y} * 2;
4579
4580 $w = max $widget->{min_w}, $w;
4581 $h = max $widget->{min_h}, $h;
4212 4582
4213 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4214 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4215 4585
4216 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4232 } 4602 }
4233 } 4603 }
4234 4604
4235 delete $self->{realloc}{$widget+0}; 4605 delete $self->{realloc}{$widget+0};
4236 } 4606 }
4237 }
4238 4607
4239 while (my $size_alloc = delete $self->{size_alloc}) { 4608 while (my $size_alloc = delete $self->{size_alloc}) {
4240 my @queue = sort { $b->{visible} <=> $a->{visible} } 4609 my @queue = sort { $a->{visible} <=> $b->{visible} }
4241 values %$size_alloc; 4610 values %$size_alloc;
4242 4611
4243 while () { 4612 while () {
4244 my $widget = pop @queue || last; 4613 my $widget = pop @queue || last;
4245 4614
4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4615 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4247 4616
4248 $w = 0 if $w < 0;
4249 $h = 0 if $h < 0;
4250
4251 $w = max $widget->{min_w}, $w; 4617 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h; 4618 $h = max $widget->{min_h}, $h;
4253 4619
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4620# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4621# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256 4622
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4623 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4624 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259 4625
4260 $w = int $w + 0.5; 4626 $w = int $w + 0.5;
4261 $h = int $h + 0.5; 4627 $h = int $h + 0.5;
4262 4628
4263 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4629 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4264 $widget->{old_w} = $widget->{w}; 4630 $widget->{old_w} = $widget->{w};
4265 $widget->{old_h} = $widget->{h}; 4631 $widget->{old_h} = $widget->{h};
4266 4632
4267 $widget->{w} = $w; 4633 $widget->{w} = $w;
4268 $widget->{h} = $h; 4634 $widget->{h} = $h;
4269 4635
4270 $widget->emit (size_allocate => $w, $h); 4636 $widget->emit (size_allocate => $w, $h);
4637 }
4271 } 4638 }
4272 } 4639 }
4273 } 4640 }
4274 4641
4275 while ($self->{post_alloc_hook}) { 4642 while ($self->{post_alloc_hook}) {
… …
4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4287 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
4288 glLoadIdentity; 4655 glLoadIdentity;
4289 4656
4290 { 4657 {
4291 package CFPlus::UI::Base; 4658 package DC::UI::Base;
4292 4659
4293 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4294 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
4295 4662
4296 $self->_draw; 4663 $self->_draw;
4297 } 4664 }
4298} 4665}
4299 4666
4300############################################################################# 4667#############################################################################
4301 4668
4302package CFPlus::UI; 4669package DC::UI;
4303 4670
4304$ROOT = new CFPlus::UI::Root; 4671$ROOT = new DC::UI::Root;
4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
4306 4673
43071 46741
4308

Diff Legend

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