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.392 by root, Sat Jul 21 13:37:09 2007 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

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

Diff Legend

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