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.395 by root, Sat Jul 21 13:56:00 2007 UTC vs.
Revision 1.482 by root, Sat Aug 13 23:18:19 2011 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 {
… …
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;
… …
1108 my ($self, $widget) = @_; 1115 my ($self, $widget) = @_;
1109 1116
1110 $self->{vp}->add ($self->{child} = $widget); 1117 $self->{vp}->add ($self->{child} = $widget);
1111} 1118}
1112 1119
1120sub set_offset { shift->{vp}->set_offset (@_) }
1121sub set_center { shift->{vp}->set_center (@_) }
1122sub make_visible { shift->{vp}->make_visible (@_) }
1123
1113sub update_slider { 1124sub update_slider {
1114 my ($self) = @_; 1125 my ($self) = @_;
1115 1126
1116 my $child = ($self->{vp} or return)->child; 1127 my $child = ($self->{vp} or return)->child;
1117 1128
1129 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1130 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $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]);
1120 1132
1121 my $visible = $w1 > $w2; 1133 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1134 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1135 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1136 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1137 : $self->SUPER::remove ($self->{hslider});
1138 }
1126 } 1139 }
1127 1140
1141 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1142 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $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]);
1130 1144
1131 my $visible = $h1 > $h2; 1145 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1146 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $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} 1170}
1138 1171
1139sub invoke_mouse_wheel { 1172sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1173 my ($self, $ev) = @_;
1141 1174
1142 $self->{vslider}->emit (mouse_wheel => $ev) 1175 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev) 1176 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146 if $ev->{dx};
1147 1177
1148 1 1178 1
1149} 1179}
1150 1180
1151sub invoke_button_down { 1181sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_; 1182 my ($self, $ev, $x, $y) = @_;
1153 1183
1154 if ($ev->{button} == 2) { 1184 if ($ev->{button} == 2) {
1155 $self->grab_focus; 1185 $self->start_dragging ($ev);
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1; 1186 return 1;
1168 } 1187 }
1169 1188
1170 0 1189 0
1171} 1190}
… …
1198 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1199} 1218}
1200 1219
1201############################################################################# 1220#############################################################################
1202 1221
1203package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1204 1223
1205our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1206 1225
1207use CFPlus::OpenGL; 1226use DC::OpenGL;
1208 1227
1209sub new { 1228sub new {
1210 my $class = shift; 1229 my $class = shift;
1211 1230
1212 $class->SUPER::new ( 1231 $class->SUPER::new (
… …
1222 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1223 1242
1224 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1225 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1227
1228 glBegin GL_QUADS;
1229 glVertex 0 , 0;
1230 glVertex 0 , $h;
1231 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1232 glVertex $w, 0;
1233 glEnd;
1234
1235 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1236 } 1248 }
1237 1249
1238 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1239} 1251}
1240 1252
1241############################################################################# 1253#############################################################################
1242 1254
1243package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1244 1256
1245our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1246 1258
1247use CFPlus::OpenGL; 1259use DC::OpenGL;
1248 1260
1249sub new { 1261sub new {
1250 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1251 1263
1252 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1254 align => 1, 1266 align => 1,
1255 valign => 0, 1267 valign => 0.5,
1256 text => $arg{label}, 1268 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1258 } 1270 }
1259 1271
1260 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1261 # label => "", 1273 # label => "",
1262 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1263 border => 0.8, 1275 border => 0.8,
1264 style => 'single', 1276 style => 'single',
1265 %arg, 1277 %arg,
1266 ); 1278 );
1267 1279
… …
1270 1282
1271sub add { 1283sub add {
1272 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1273 1285
1274 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1276} 1288}
1277 1289
1278sub border { 1290sub border {
1279 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1280} 1292}
… …
1320 my $border = $self->border; 1332 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1322 1334
1323 $child->draw; 1335 $child->draw;
1324 1336
1325 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1326 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 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;
1330 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;
… …
1338 } 1350 }
1339} 1351}
1340 1352
1341############################################################################# 1353#############################################################################
1342 1354
1343package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1344 1356
1345our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1346 1358
1347use CFPlus::OpenGL; 1359use DC::OpenGL;
1348 1360
1349my $bg = 1361my $bg =
1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1351 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1352 1364
1353my @border = 1365my @border =
1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 map { new_from_resource DC::Texture $_, mipmap => 1 }
1355 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);
1356 1368
1357my @icon = 1369my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png); 1371 qw(x1_move.png x1_resize.png);
1360 1372
1361sub new { 1373sub new {
1362 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1363 1375
1364 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1365 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1366 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1367 border => 0.6, 1379 border => 0.8,
1368 can_events => 1, 1380 can_events => 1,
1369 min_w => 64, 1381 min_w => 64,
1370 min_h => 32, 1382 min_h => 32,
1371 %arg, 1383 %arg,
1372 ); 1384 );
1373 1385
1374 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1375 align => 0, 1387 align => 0.5,
1376 valign => 1, 1388 valign => 1,
1377 text => $self->{title}, 1389 text => $self->{title},
1378 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1379 if exists $self->{title}; 1391 if exists $self->{title};
1380 1392
1381 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1382 $self->{close_button} = 1394 $self->{close_button} =
1383 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1384 path => 'x1_close.png', 1396 path => 'x1_close.png',
1385 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1386 1398
1387 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1388 } 1400 }
1389 1401
1390 $self 1402 $self
1391} 1403}
1392 1404
1393sub add { 1405sub add {
1394 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1395 1407
1396 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1397 $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};
1398 $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};
1399} 1411}
1400 1412
1401sub border { 1413sub border {
1402 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
1403} 1424}
1404 1425
1405sub size_request { 1426sub size_request {
1406 my ($self) = @_; 1427 my ($self) = @_;
1407 1428
… …
1532 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1534 1555
1535 my $border = $self->border; 1556 my $border = $self->border;
1536 1557
1558 if ($border) {
1537 glColor @{ $self->{border_bg} }; 1559 glColor @{ $self->{border_bg} };
1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1560 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1561 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1562 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1563 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542 1564
1543 # move 1565 # move
1544 my $w2 = ($w - $border) * .5; 1566 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5; 1567 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1570 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549 1571
1550 # resize 1572 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1573 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1574 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button}; 1575 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1577 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1578 }
1556 1579
1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1580 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1558 glColor @{ $self->{bg} }; 1581 glColor @{ $self->{bg} };
1559 1582
1560 # TODO: repeat texture not scale 1583 # TODO: repeat texture not scale
… …
1579 if $self->{close_button}; 1602 if $self->{close_button};
1580} 1603}
1581 1604
1582############################################################################# 1605#############################################################################
1583 1606
1584package CFPlus::UI::Table; 1607package DC::UI::Table;
1585 1608
1586our @ISA = CFPlus::UI::Container::; 1609our @ISA = DC::UI::Container::;
1587 1610
1588use List::Util qw(max sum); 1611use List::Util qw(max sum);
1589 1612
1590use CFPlus::OpenGL; 1613use DC::OpenGL;
1591 1614
1592sub new { 1615sub new {
1593 my $class = shift; 1616 my $class = shift;
1594 1617
1595 $class->SUPER::new ( 1618 $class->SUPER::new (
… …
1601 1624
1602sub add { 1625sub add {
1603 my ($self, @widgets) = @_; 1626 my ($self, @widgets) = @_;
1604 1627
1605 for my $child (@widgets) { 1628 for my $child (@widgets) {
1606 $child->{rowspan} ||= 1; 1629 $child->{c_rowspan} ||= 1;
1607 $child->{colspan} ||= 1; 1630 $child->{c_colspan} ||= 1;
1608 } 1631 }
1609 1632
1610 $self->SUPER::add (@widgets); 1633 $self->SUPER::add (@widgets);
1611} 1634}
1612 1635
… …
1616 my @widgets; 1639 my @widgets;
1617 1640
1618 while (@_) { 1641 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, (); 1642 my ($col, $row, $child) = splice @_, 0, 3, ();
1620 1643
1621 $child->{row} = $row; 1644 $child->{c_row} = $row;
1622 $child->{col} = $col; 1645 $child->{c_col} = $col;
1623 1646
1624 push @widgets, $child; 1647 push @widgets, $child;
1625 } 1648 }
1626 1649
1627 $self->add (@widgets); 1650 $self->add (@widgets);
… …
1633 my (@w, @h); 1656 my (@w, @h);
1634 1657
1635 my @children = $self->children; 1658 my @children = $self->children;
1636 1659
1637 # first pass, columns 1660 # first pass, columns
1638 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1661 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1662 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640 1663
1641 my $sw = sum @w[$c .. $c + $cs - 1]; 1664 my $sw = sum @w[$c .. $c + $cs - 1];
1642 1665
1643 if ($w > $sw) { 1666 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1667 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 } 1668 }
1646 } 1669 }
1647 1670
1648 # second pass, rows 1671 # second pass, rows
1649 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1672 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1673 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1651 1674
1652 my $sh = sum @h[$r .. $r + $rs - 1]; 1675 my $sh = sum @h[$r .. $r + $rs - 1];
1653 1676
1654 if ($h > $sh) { 1677 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1678 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1656 } 1679 }
1657 } 1680 }
1658 1681
1659 (\@w, \@h) 1682 (\@w, \@h)
1660} 1683}
… …
1683 @col_expand = (1) x @$ws unless @col_expand; 1706 @col_expand = (1) x @$ws unless @col_expand;
1684 my $col_expand = (sum @col_expand) || 1; 1707 my $col_expand = (sum @col_expand) || 1;
1685 1708
1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1709 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1687 1710
1688 CFPlus::UI::harmonize $ws; 1711 DC::UI::harmonize $ws;
1689 1712
1690 my @row_expand = @{$self->{row_expand}}; 1713 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand; 1714 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1; 1715 my $row_expand = (sum @row_expand) || 1;
1693 1716
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1717 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695 1718
1696 CFPlus::UI::harmonize $hs; 1719 DC::UI::harmonize $hs;
1697 1720
1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1721 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1722 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1700 1723
1701 for my $widget ($self->children) { 1724 for my $widget ($self->children) {
1702 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)};
1703 1726
1704 $widget->configure ( 1727 $widget->configure (
1705 $x[$c], $y[$r], 1728 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1729 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1707 ); 1730 );
… …
1710 1 1733 1
1711} 1734}
1712 1735
1713############################################################################# 1736#############################################################################
1714 1737
1715package CFPlus::UI::Fixed; 1738package DC::UI::Fixed;
1716 1739
1717use List::Util qw(min max); 1740use List::Util qw(min max);
1718 1741
1719our @ISA = CFPlus::UI::Container::; 1742our @ISA = DC::UI::Container::;
1720
1721sub add {
1722 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1723
1724 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1725 $self->SUPER::add ($child);
1726}
1727 1743
1728sub _scale($$$) { 1744sub _scale($$$) {
1729 my ($mode, $val, $max) = @_; 1745 my ($rel, $val, $max) = @_;
1730 1746
1731 $mode eq "abs" ? $val 1747 $rel ? $val * $max : $val
1732 : $mode eq "rel" ? $val * $max
1733 : 0
1734} 1748}
1735 1749
1736sub size_request { 1750sub size_request {
1737 my ($self) = @_; 1751 my ($self) = @_;
1738 1752
1739 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1740 1754
1741 # determine overall size by querying abs widgets 1755 # determine overall size by querying abs widgets
1742 for my $child ($self->visible_children) { 1756 for my $child ($self->visible_children) {
1743 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};
1744 1760
1745 if ($pos eq "abs") {
1746 $w = _scale $size, $w, $child->{req_w};
1747 $h = _scale $size, $h, $child->{req_h};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1761 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1762 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 } 1763 }
1752 } 1764 }
1753 1765
1754 my $W = $x2 - $x1; 1766 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1; 1767 my $H = $y2 - $y1;
1756 1768
1757 # now layout remaining widgets 1769 # now layout remaining widgets
1758 for my $child ($self->visible_children) { 1770 for my $child ($self->visible_children) {
1759 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;
1760 1774
1761 if ($pos ne "abs") {
1762 $x = _scale $pos, $x, $W;
1763 $y = _scale $pos, $x, $H;
1764 $w = _scale $size, $w, $child->{req_w};
1765 $h = _scale $size, $h, $child->{req_h};
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1769 } 1777 }
1770 } 1778 }
1771 1779
1772 my $W = $x2 - $x1; 1780 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1; 1781 my $H = $y2 - $y1;
… …
1777 1785
1778sub invoke_size_allocate { 1786sub invoke_size_allocate {
1779 my ($self, $W, $H) = @_; 1787 my ($self, $W, $H) = @_;
1780 1788
1781 for my $child ($self->visible_children) { 1789 for my $child ($self->visible_children) {
1782 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;
1783 1792
1784 $x = _scale $pos, $x, $W; 1793 $x += $child->{c_halign} * $child->{req_w};
1785 $y = _scale $pos, $x, $H; 1794 $y += $child->{c_valign} * $child->{req_h};
1786 $w = _scale $size, $w, $child->{req_w};
1787 $h = _scale $size, $h, $child->{req_h};
1788 1795
1789 $child->configure ($x, $y, $w, $h); 1796 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1790 } 1797 }
1791 1798
1792 1 1799 1
1793} 1800}
1794 1801
1795############################################################################# 1802#############################################################################
1796 1803
1797package CFPlus::UI::Box; 1804package DC::UI::Box;
1798 1805
1799our @ISA = CFPlus::UI::Container::; 1806our @ISA = DC::UI::Container::;
1800 1807
1801sub size_request { 1808sub size_request {
1802 my ($self) = @_; 1809 my ($self) = @_;
1810
1811 my @children = $self->visible_children;
1803 1812
1804 $self->{vertical} 1813 $self->{vertical}
1805 ? ( 1814 ? (
1806 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1815 (List::Util::max map $_->{req_w}, @children),
1807 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1816 (List::Util::sum map $_->{req_h}, @children),
1808 ) 1817 )
1809 : ( 1818 : (
1810 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1819 (List::Util::sum map $_->{req_w}, @children),
1811 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1820 (List::Util::max map $_->{req_h}, @children),
1812 ) 1821 )
1813} 1822}
1814 1823
1815sub invoke_size_allocate { 1824sub invoke_size_allocate {
1816 my ($self, $w, $h) = @_; 1825 my ($self, $w, $h) = @_;
… …
1837 $req[$_] += $space * $children[$_]{expand} 1846 $req[$_] += $space * $children[$_]{expand}
1838 for 0 .. $#children; 1847 for 0 .. $#children;
1839 } 1848 }
1840 } 1849 }
1841 1850
1842 CFPlus::UI::harmonize \@req; 1851 DC::UI::harmonize \@req;
1843 1852
1844 my $pos = 0; 1853 my $pos = 0;
1845 for (0 .. $#children) { 1854 for (0 .. $#children) {
1846 my $alloc = $req[$_]; 1855 my $alloc = $req[$_];
1847 $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));
… …
1852 1 1861 1
1853} 1862}
1854 1863
1855############################################################################# 1864#############################################################################
1856 1865
1857package CFPlus::UI::HBox; 1866package DC::UI::HBox;
1858 1867
1859our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1860 1869
1861sub new { 1870sub new {
1862 my $class = shift; 1871 my $class = shift;
1863 1872
1864 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1867 ) 1876 )
1868} 1877}
1869 1878
1870############################################################################# 1879#############################################################################
1871 1880
1872package CFPlus::UI::VBox; 1881package DC::UI::VBox;
1873 1882
1874our @ISA = CFPlus::UI::Box::; 1883our @ISA = DC::UI::Box::;
1875 1884
1876sub new { 1885sub new {
1877 my $class = shift; 1886 my $class = shift;
1878 1887
1879 $class->SUPER::new ( 1888 $class->SUPER::new (
… …
1882 ) 1891 )
1883} 1892}
1884 1893
1885############################################################################# 1894#############################################################################
1886 1895
1887package CFPlus::UI::Label; 1896package DC::UI::Label;
1888 1897
1889our @ISA = CFPlus::UI::DrawBG::; 1898our @ISA = DC::UI::DrawBG::;
1890 1899
1891use CFPlus::OpenGL; 1900use DC::OpenGL;
1892 1901
1893sub new { 1902sub new {
1894 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1895 1904
1896 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
… …
1901 #text => initial text 1910 #text => initial text
1902 #markup => initial narkup 1911 #markup => initial narkup
1903 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1904 #style => 0, # render flags 1913 #style => 0, # render flags
1905 ellipsise => 3, # end 1914 ellipsise => 3, # end
1906 layout => (new CFPlus::Layout), 1915 layout => (new DC::Layout),
1907 fontsize => 1, 1916 fontsize => 1,
1908 align => -1, 1917 align => 0.5,
1909 valign => -1, 1918 valign => 0.5,
1910 padding_x => 2, 1919 padding_x => 4,
1911 padding_y => 2, 1920 padding_y => 2,
1912 can_events => 0, 1921 can_events => 0,
1913 %arg 1922 %arg
1914 ); 1923 );
1915 1924
1916 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1917 my $layout = new CFPlus::Layout; 1926 my $layout = new DC::Layout;
1918 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1919 $self->{template} = $layout; 1928 $self->{template} = $layout;
1920 } 1929 }
1921 1930
1922 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
… …
1940 1949
1941 delete $self->{ox}; 1950 delete $self->{ox};
1942 $self->SUPER::realloc; 1951 $self->SUPER::realloc;
1943} 1952}
1944 1953
1954sub clear {
1955 my ($self) = @_;
1956
1957 $self->set_text ("");
1958}
1959
1945sub set_text { 1960sub set_text {
1946 my ($self, $text) = @_; 1961 my ($self, $text) = @_;
1947 1962
1948 return if $self->{text} eq "T$text"; 1963 return if $self->{text} eq "T$text";
1949 $self->{text} = "T$text"; 1964 $self->{text} = "T$text";
… …
1972 1987
1973sub size_request { 1988sub size_request {
1974 my ($self) = @_; 1989 my ($self) = @_;
1975 1990
1976 $self->{size_req} ||= do { 1991 $self->{size_req} ||= do {
1992 my ($max_w, $max_h) = $self->get_max_wh;
1993
1977 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1994 $self->{layout}->set_font ($self->{font}) if $self->{font};
1978 $self->{layout}->set_width ($self->{max_w} || -1); 1995 $self->{layout}->set_width ($max_w);
1979 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1996 $self->{layout}->set_ellipsise ($self->{ellipsise});
1980 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1997 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1981 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1998 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1982 1999
1983 my ($w, $h) = $self->{layout}->size; 2000 my ($w, $h) = $self->{layout}->size;
1984 2001
1985 if (exists $self->{template}) { 2002 if (exists $self->{template}) {
1986 $self->{template}->set_font ($self->{font}) if $self->{font}; 2003 $self->{template}->set_font ($self->{font}) if $self->{font};
1987 $self->{template}->set_width ($self->{max_w} || -1); 2004 $self->{template}->set_width ($max_w);
1988 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2005 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1989 2006
1990 my ($w2, $h2) = $self->{template}->size; 2007 my ($w2, $h2) = $self->{template}->size;
1991 2008
1992 $w = List::Util::max $w, $w2; 2009 $w = List::Util::max $w, $w2;
… …
2048 2065
2049 [$self->{layout}->size] 2066 [$self->{layout}->size]
2050 }; 2067 };
2051 2068
2052 unless (exists $self->{ox}) { 2069 unless (exists $self->{ox}) {
2053 $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);
2054 : $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);
2055 : ($self->{w} - $size->[0]) * 0.5);
2056 2072
2057 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2073 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2058 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2059 : ($self->{h} - $size->[1]) * 0.5);
2060 }; 2074 };
2061 2075
2062 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2076# unless ($self->{list}) {
2063 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2077# $self->{list} = DC::OpenGL::glGenList;
2064 2078# DC::OpenGL::glNewList $self->{list};
2065 $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;
2066} 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#}
2067 2095
2068############################################################################# 2096#############################################################################
2069 2097
2070package CFPlus::UI::EntryBase; 2098package DC::UI::EntryBase;
2071 2099
2072our @ISA = CFPlus::UI::Label::; 2100our @ISA = DC::UI::Label::;
2073 2101
2074use CFPlus::OpenGL; 2102use DC::OpenGL;
2075 2103
2076sub new { 2104sub new {
2077 my $class = shift; 2105 my $class = shift;
2078 2106
2079 $class->SUPER::new ( 2107 $class->SUPER::new (
2080 fg => [1, 1, 1], 2108 fg => [1, 1, 1],
2081 bg => [0, 0, 0, 0.2], 2109 bg => [0, 0, 0, 0.2],
2110 outline => undef,
2082 active_bg => [1, 1, 1, 0.5], 2111 active_bg => [0, 0, 1, .2],
2083 active_fg => [0, 0, 0], 2112 active_fg => [1, 1, 1],
2113 active_outline => [1, 1, 0],
2084 can_hover => 1, 2114 can_hover => 1,
2085 can_focus => 1, 2115 can_focus => 1,
2116 align => 0,
2086 valign => 0, 2117 valign => 0.5,
2087 can_events => 1, 2118 can_events => 1,
2088 ellipsise => 0, 2119 ellipsise => 0,
2120 padding_x => 4,
2121 padding_y => 2,
2089 #text => ... 2122 #text => ...
2090 #hidden => "*", 2123 #hidden => "*",
2091 @_ 2124 @_
2092 ) 2125 )
2093} 2126}
… …
2140 2173
2141 my $text = $self->get_text; 2174 my $text = $self->get_text;
2142 2175
2143 $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;
2144 2177
2145 if ($uni == 8) { 2178 if ($sym == DC::SDLK_BACKSPACE) {
2146 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2179 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2147 } elsif ($uni == 127) { 2180 } elsif ($sym == DC::SDLK_DELETE) {
2148 substr $text, $self->{cursor}, 1, ""; 2181 substr $text, $self->{cursor}, 1, "";
2149 } elsif ($sym == CFPlus::SDLK_LEFT) { 2182 } elsif ($sym == DC::SDLK_LEFT) {
2150 --$self->{cursor} if $self->{cursor}; 2183 --$self->{cursor} if $self->{cursor};
2151 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2184 } elsif ($sym == DC::SDLK_RIGHT) {
2152 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2185 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2153 } elsif ($sym == CFPlus::SDLK_HOME) { 2186 } elsif ($sym == DC::SDLK_HOME) {
2154 # what a hack 2187 # what a hack
2155 $self->{cursor} = 2188 $self->{cursor} =
2156 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2189 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2157 ? length $1 2190 ? length $1
2158 : 0; 2191 : 0;
2159 } elsif ($sym == CFPlus::SDLK_END) { 2192 } elsif ($sym == DC::SDLK_END) {
2160 # uh, again 2193 # uh, again
2161 $self->{cursor} = 2194 $self->{cursor} =
2162 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2195 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2163 ? $self->{cursor} + length $1 2196 ? $self->{cursor} + length $1
2164 : length $self->{text}; 2197 : length $self->{text};
… …
2228 glColor_premultiply @{$self->{bg}}; 2261 glColor_premultiply @{$self->{bg}};
2229 } 2262 }
2230 2263
2231 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2232 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2265 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glBegin GL_QUADS;
2234 glVertex 0 , 0;
2235 glVertex 0 , $self->{h};
2236 glVertex $self->{w}, $self->{h}; 2266 glRect 0, 0, $self->{w}, $self->{h};
2237 glVertex $self->{w}, 0;
2238 glEnd;
2239 glDisable GL_BLEND; 2267 glDisable GL_BLEND;
2240 2268
2241 $self->SUPER::_draw; 2269 $self->SUPER::_draw;
2242 2270
2243 #TODO: force update every cursor change :( 2271 #TODO: force update every cursor change :(
… …
2245 2273
2246 unless (exists $self->{cur_h}) { 2274 unless (exists $self->{cur_h}) {
2247 my $text = substr $self->{text}, 0, $self->{cursor}; 2275 my $text = substr $self->{text}, 0, $self->{cursor};
2248 utf8::encode $text; 2276 utf8::encode $text;
2249 2277
2250 @$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);
2251 } 2279 }
2252 2280
2281 glColor_premultiply @{$self->{active_fg}};
2253 glBegin GL_LINES; 2282 glBegin GL_LINES;
2254 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};
2255 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};
2256 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;
2257 } 2300 }
2258} 2301}
2259 2302
2260############################################################################# 2303#############################################################################
2261 2304
2262package CFPlus::UI::Entry; 2305package DC::UI::Entry;
2263 2306
2264our @ISA = CFPlus::UI::EntryBase::; 2307our @ISA = DC::UI::EntryBase::;
2265 2308
2266use 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
2267 2320
2268sub invoke_key_down { 2321sub invoke_key_down {
2269 my ($self, $ev) = @_; 2322 my ($self, $ev) = @_;
2270 2323
2271 my $sym = $ev->{sym}; 2324 my $sym = $ev->{sym};
… …
2277 $self->{history_pointer} = -1; 2330 $self->{history_pointer} = -1;
2278 $self->{history_saveback} = ''; 2331 $self->{history_saveback} = '';
2279 $self->emit (activate => $txt); 2332 $self->emit (activate => $txt);
2280 $self->update; 2333 $self->update;
2281 2334
2282 } elsif ($sym == CFPlus::SDLK_UP) { 2335 } elsif ($sym == DC::SDLK_UP) {
2283 if ($self->{history_pointer} < 0) { 2336 if ($self->{history_pointer} < 0) {
2284 $self->{history_saveback} = $self->get_text; 2337 $self->{history_saveback} = $self->get_text;
2285 } 2338 }
2286 if (@{$self->{history} || []} > 0) { 2339 if (@{$self->{history} || []} > 0) {
2287 $self->{history_pointer}++; 2340 $self->{history_pointer}++;
… …
2289 $self->{history_pointer} = @{$self->{history} || []} - 1; 2342 $self->{history_pointer} = @{$self->{history} || []} - 1;
2290 } 2343 }
2291 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2292 } 2345 }
2293 2346
2294 } elsif ($sym == CFPlus::SDLK_DOWN) { 2347 } elsif ($sym == DC::SDLK_DOWN) {
2295 $self->{history_pointer}--; 2348 $self->{history_pointer}--;
2296 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2349 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2297 2350
2298 if ($self->{history_pointer} >= 0) { 2351 if ($self->{history_pointer} >= 0) {
2299 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2352 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2300 } else { 2353 } else {
2354 if (defined $self->{history_saveback}) {
2301 $self->set_text ($self->{history_saveback}); 2355 $self->set_text ($self->{history_saveback});
2356 $self->{history_saveback} = undef;
2357 }
2302 } 2358 }
2303 2359
2304 } else { 2360 } else {
2305 return $self->SUPER::invoke_key_down ($ev) 2361 return $self->SUPER::invoke_key_down ($ev)
2306 } 2362 }
… …
2308 1 2364 1
2309} 2365}
2310 2366
2311############################################################################# 2367#############################################################################
2312 2368
2313package CFPlus::UI::TextEdit; 2369package DC::UI::TextEdit;
2314 2370
2315our @ISA = CFPlus::UI::EntryBase::; 2371our @ISA = DC::UI::EntryBase::;
2316 2372
2317use 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}
2318 2384
2319sub move_cursor_ver { 2385sub move_cursor_ver {
2320 my ($self, $dy) = @_; 2386 my ($self, $dy) = @_;
2321 2387
2322 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2388 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2323 2389
2324 $y += $dy; 2390 $line += $dy;
2325 2391
2326 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))) {
2327 $self->{cursor} = $index; 2393 $self->{cursor} = $index;
2328 delete $self->{cur_h}; 2394 delete $self->{cur_h};
2329 $self->update; 2395 $self->update;
2330 return; 2396 return;
2331 } 2397 }
… …
2334sub invoke_key_down { 2400sub invoke_key_down {
2335 my ($self, $ev) = @_; 2401 my ($self, $ev) = @_;
2336 2402
2337 my $sym = $ev->{sym}; 2403 my $sym = $ev->{sym};
2338 2404
2339 if ($sym == CFPlus::SDLK_UP) { 2405 if ($sym == DC::SDLK_UP) {
2340 $self->move_cursor_ver (-1); 2406 $self->move_cursor_ver (-1);
2341 } elsif ($sym == CFPlus::SDLK_DOWN) { 2407 } elsif ($sym == DC::SDLK_DOWN) {
2342 $self->move_cursor_ver (+1); 2408 $self->move_cursor_ver (+1);
2343 } else { 2409 } else {
2344 return $self->SUPER::invoke_key_down ($ev) 2410 return $self->SUPER::invoke_key_down ($ev)
2345 } 2411 }
2346 2412
2347 1 2413 1
2348} 2414}
2349 2415
2350############################################################################# 2416#############################################################################
2351 2417
2352package CFPlus::UI::Button; 2418package DC::UI::ButtonBin;
2353 2419
2354our @ISA = CFPlus::UI::Label::; 2420our @ISA = DC::UI::Bin::;
2355 2421
2356use CFPlus::OpenGL; 2422use DC::OpenGL;
2357 2423
2358my @tex = 2424my @tex =
2359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2425 map { new_from_resource DC::Texture $_, mipmap => 1 }
2360 qw(b1_button_inactive.png b1_button_active.png); 2426 qw(b1_button_inactive.png b1_button_active.png);
2361 2427
2362sub new { 2428sub new {
2363 my $class = shift; 2429 my $class = shift;
2364 2430
2365 $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 (
2366 padding_x => 4, 2481 padding_x => 8,
2367 padding_y => 4, 2482 padding_y => 4,
2368 fg => [1.0, 1.0, 1.0], 2483 fg => [1.0, 1.0, 1.0],
2369 active_fg => [0.8, 0.8, 0.8], 2484 active_fg => [0.8, 0.8, 0.8],
2370 can_hover => 1, 2485 can_hover => 1,
2371 align => 0, 2486 align => 0.5,
2372 valign => 0, 2487 valign => 0.5,
2373 can_events => 1, 2488 can_events => 1,
2374 @_ 2489 @_
2375 ) 2490 )
2376} 2491}
2377 2492
… …
2402 $self->SUPER::_draw; 2517 $self->SUPER::_draw;
2403} 2518}
2404 2519
2405############################################################################# 2520#############################################################################
2406 2521
2407package CFPlus::UI::CheckBox; 2522package DC::UI::CheckBox;
2408 2523
2409our @ISA = CFPlus::UI::DrawBG::; 2524our @ISA = DC::UI::DrawBG::;
2410 2525
2411my @tex = 2526my @tex =
2412 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2527 map { new_from_resource DC::Texture $_, mipmap => 1 }
2413 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2528 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2414 2529
2415use CFPlus::OpenGL; 2530use DC::OpenGL;
2416 2531
2417sub new { 2532sub new {
2418 my $class = shift; 2533 my $class = shift;
2419 2534
2420 $class->SUPER::new ( 2535 $class->SUPER::new (
2536 fontsize => 1,
2421 padding_x => 2, 2537 padding_x => 2,
2422 padding_y => 2, 2538 padding_y => 2,
2423 fg => [1, 1, 1], 2539 fg => [1, 1, 1],
2424 active_fg => [1, 1, 0], 2540 active_fg => [1, 1, 0],
2425 bg => [0, 0, 0, 0.2], 2541 bg => [0, 0, 0, 0.2],
… …
2431} 2547}
2432 2548
2433sub size_request { 2549sub size_request {
2434 my ($self) = @_; 2550 my ($self) = @_;
2435 2551
2436 (6) x 2 2552 ($self->{fontsize} * $::FONTSIZE) x 2
2437} 2553}
2438 2554
2439sub toggle { 2555sub toggle {
2440 my ($self) = @_; 2556 my ($self) = @_;
2441 2557
… …
2460sub _draw { 2576sub _draw {
2461 my ($self) = @_; 2577 my ($self) = @_;
2462 2578
2463 $self->SUPER::_draw; 2579 $self->SUPER::_draw;
2464 2580
2465 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2581 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2466 2582
2467 my ($w, $h) = @$self{qw(w h)}; 2583 my ($w, $h) = @$self{qw(w h)};
2468 2584
2469 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;
2470 2586
… …
2477 glDisable GL_TEXTURE_2D; 2593 glDisable GL_TEXTURE_2D;
2478} 2594}
2479 2595
2480############################################################################# 2596#############################################################################
2481 2597
2482package CFPlus::UI::Image; 2598package DC::UI::Image;
2483 2599
2484our @ISA = CFPlus::UI::Base::; 2600our @ISA = DC::UI::DrawBG::;
2485 2601
2486use CFPlus::OpenGL; 2602use DC::OpenGL;
2487 2603
2488our %texture_cache; 2604our %texture_cache;
2489 2605
2490sub new { 2606sub new {
2491 my $class = shift; 2607 my $class = shift;
2492 2608
2493 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2494 can_events => 0, 2610 can_events => 0,
2611 scale => 1,
2495 @_, 2612 @_,
2496 ); 2613 );
2497 2614
2498 $self->{path} || $self->{tex} 2615 $self->{path} || $self->{tex}
2499 or Carp::croak "'path' or 'tex' attributes required"; 2616 or Carp::croak "'path' or 'tex' attributes required";
2500 2617
2501 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2618 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2502 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2619 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2503 2620
2504 CFPlus::weaken $texture_cache{$self->{path}}; 2621 DC::weaken $texture_cache{$self->{path}};
2505 2622
2506 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2623 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2507 2624
2508 $self 2625 $self
2509} 2626}
2510 2627
2511sub STORABLE_freeze { 2628sub STORABLE_freeze {
2512 my ($self, $cloning) = @_; 2629 my ($self, $cloning) = @_;
2513 2630
2514 $self->{path} 2631 $self->{path}
2515 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";
2516 2633
2517 $self->{path} 2634 $self->{path}
2518} 2635}
2519 2636
2520sub STORABLE_attach { 2637sub STORABLE_attach {
2521 my ($self, $cloning, $path) = @_; 2638 my ($self, $cloning, $path) = @_;
2522 2639
2523 $self->new (path => $path) 2640 $self->new (path => $path)
2524} 2641}
2525 2642
2643sub set_texture {
2644 my ($self, $tex) = @_;
2645
2646 $self->{tex} = $tex;
2647 $self->update;
2648}
2649
2526sub size_request { 2650sub size_request {
2527 my ($self) = @_; 2651 my ($self) = @_;
2528 2652
2529 ($self->{tex}{w}, $self->{tex}{h}) 2653 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2530} 2654}
2531 2655
2532sub _draw { 2656sub _draw {
2533 my ($self) = @_; 2657 my ($self) = @_;
2658
2659 $self->SUPER::_draw;
2534 2660
2535 my $tex = $self->{tex}; 2661 my $tex = $self->{tex};
2536 2662
2537 my ($w, $h) = ($self->{w}, $self->{h}); 2663 my ($w, $h) = ($self->{w}, $self->{h});
2538 2664
… …
2544 } 2670 }
2545 2671
2546 glEnable GL_TEXTURE_2D; 2672 glEnable GL_TEXTURE_2D;
2547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2548 2674
2549 $tex->draw_quad (0, 0, $w, $h); 2675 $tex->draw_quad_alpha (0, 0, $w, $h);
2550 2676
2551 glDisable GL_TEXTURE_2D; 2677 glDisable GL_TEXTURE_2D;
2552} 2678}
2553 2679
2554############################################################################# 2680#############################################################################
2555 2681
2556package CFPlus::UI::ImageButton; 2682package DC::UI::ImageButton;
2557 2683
2558our @ISA = CFPlus::UI::Image::; 2684our @ISA = DC::UI::Image::;
2559 2685
2560use CFPlus::OpenGL; 2686use DC::OpenGL;
2561
2562my %textures;
2563 2687
2564sub new { 2688sub new {
2565 my $class = shift; 2689 my $class = shift;
2566 2690
2567 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2568 padding_x => 4, 2692 padding_x => 4,
2569 padding_y => 4, 2693 padding_y => 4,
2570 fg => [1, 1, 1], 2694 fg => [1, 1, 1],
2571 active_fg => [0, 0, 1], 2695 active_fg => [0, 0, 1],
2572 can_hover => 1, 2696 can_hover => 1,
2573 align => 0, 2697 align => 0.5,
2574 valign => 0, 2698 valign => 0.5,
2575 can_events => 1, 2699 can_events => 1,
2576 @_ 2700 @_
2577 ); 2701 );
2578} 2702}
2579 2703
2704sub invoke_button_down {
2705 my ($self, $ev, $x, $y) = @_;
2706
2707 1
2708}
2709
2580sub invoke_button_up { 2710sub invoke_button_up {
2581 my ($self, $ev, $x, $y) = @_; 2711 my ($self, $ev, $x, $y) = @_;
2582 2712
2583 $self->emit ("activate") 2713 $self->emit ("activate")
2584 if $x >= 0 && $x < $self->{w} 2714 if $x >= 0 && $x < $self->{w}
… …
2587 1 2717 1
2588} 2718}
2589 2719
2590############################################################################# 2720#############################################################################
2591 2721
2592package CFPlus::UI::VGauge; 2722package DC::UI::VGauge;
2593 2723
2594our @ISA = CFPlus::UI::Base::; 2724our @ISA = DC::UI::Base::;
2595 2725
2596use List::Util qw(min max); 2726use List::Util qw(min max);
2597 2727
2598use CFPlus::OpenGL; 2728use DC::OpenGL;
2599 2729
2600my %tex = ( 2730my %tex = (
2601 food => [ 2731 food => [
2602 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2603 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2733 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2604 ], 2734 ],
2605 grace => [ 2735 grace => [
2606 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2607 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/
2608 ], 2738 ],
2609 hp => [ 2739 hp => [
2610 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2740 map { new_from_resource DC::Texture $_, mipmap => 1 }
2611 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2741 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2612 ], 2742 ],
2613 mana => [ 2743 mana => [
2614 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2744 map { new_from_resource DC::Texture $_, mipmap => 1 }
2615 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/
2616 ], 2746 ],
2617); 2747);
2618 2748
2619# eg. VGauge->new (gauge => 'food'), default gauge: food 2749# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2722 glDisable GL_TEXTURE_2D; 2852 glDisable GL_TEXTURE_2D;
2723} 2853}
2724 2854
2725############################################################################# 2855#############################################################################
2726 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
2727package CFPlus::UI::Gauge; 3011package DC::UI::Gauge;
2728 3012
2729our @ISA = CFPlus::UI::VBox::; 3013our @ISA = DC::UI::VBox::;
2730 3014
2731sub new { 3015sub new {
2732 my ($class, %arg) = @_; 3016 my ($class, %arg) = @_;
2733 3017
2734 my $self = $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
… …
2736 can_hover => 1, 3020 can_hover => 1,
2737 can_events => 1, 3021 can_events => 1,
2738 %arg, 3022 %arg,
2739 ); 3023 );
2740 3024
2741 $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");
2742 $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);
2743 $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");
2744 3028
2745 $self 3029 $self
2746} 3030}
2747 3031
2748sub set_fontsize { 3032sub set_fontsize {
… …
2769 $self->{value}->set_text ($val); 3053 $self->{value}->set_text ($val);
2770} 3054}
2771 3055
2772############################################################################# 3056#############################################################################
2773 3057
2774package CFPlus::UI::Slider; 3058package DC::UI::Slider;
2775 3059
2776use strict; 3060use common::sense;
2777 3061
2778use CFPlus::OpenGL; 3062use DC::OpenGL;
2779 3063
2780our @ISA = CFPlus::UI::DrawBG::; 3064our @ISA = DC::UI::DrawBG::;
2781 3065
2782my @tex = 3066my @tex =
2783 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3067 map { new_from_resource DC::Texture $_ }
2784 qw(s1_slider.png s1_slider_bg.png); 3068 qw(s1_slider.png s1_slider_bg.png);
2785 3069
2786sub new { 3070sub new {
2787 my $class = shift; 3071 my $class = shift;
2788 3072
… …
2825sub set_value { 3109sub set_value {
2826 my ($self, $value) = @_; 3110 my ($self, $value) = @_;
2827 3111
2828 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3112 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2829 3113
2830 $hi = $lo + 1 if $hi <= $lo; 3114 $hi = $lo if $hi < $lo;
2831 3115
2832 $page = $hi - $lo if $page > $hi - $lo; 3116 $value = $hi - $page if $value > $hi - $page;
2833
2834 $value = $lo if $value < $lo; 3117 $value = $lo if $value < $lo;
2835 $value = $hi - $page if $value > $hi - $page;
2836 3118
2837 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2838 if $unit; 3120 if $unit;
2839 3121
2840 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2856 3138
2857 $self->SUPER::invoke_button_down ($ev, $x, $y); 3139 $self->SUPER::invoke_button_down ($ev, $x, $y);
2858 3140
2859 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3141 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2860 3142
2861 $self->invoke_mouse_motion ($ev, $x, $y) 3143 $self->invoke_mouse_motion ($ev, $x, $y);
3144
3145 1
2862} 3146}
2863 3147
2864sub invoke_mouse_motion { 3148sub invoke_mouse_motion {
2865 my ($self, $ev, $x, $y) = @_; 3149 my ($self, $ev, $x, $y) = @_;
2866 3150
2867 if ($GRAB == $self) { 3151 if ($GRAB == $self) {
2868 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3152 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2869 3153
2870 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3154 my (undef, $lo, $hi, $page) = @{$self->{range}};
2871 3155
2872 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3156 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2873 3157
2874 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3158 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2875 } else { 3159 } else {
2876 return 0; 3160 return 0;
2877 } 3161 }
… …
2882sub invoke_mouse_wheel { 3166sub invoke_mouse_wheel {
2883 my ($self, $ev) = @_; 3167 my ($self, $ev) = @_;
2884 3168
2885 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3169 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2886 3170
2887 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3171 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2888 3172
2889 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3173 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2890 3174
2891 ! ! $delta 3175 1
2892} 3176}
2893 3177
2894sub update { 3178sub update {
2895 my ($self) = @_; 3179 my ($self) = @_;
2896 3180
… …
2902 my ($self) = @_; 3186 my ($self) = @_;
2903 3187
2904 unless ($self->{knob_w}) { 3188 unless ($self->{knob_w}) {
2905 $self->set_value ($self->{range}[0]); 3189 $self->set_value ($self->{range}[0]);
2906 3190
2907 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3191 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2908 my $range = ($hi - $page - $lo) || 1e-100; 3192 my $range = ($hi - $page - $lo) || 1e-10;
2909 3193
2910 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};
2911 3195
2912 $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;
2913 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2914 3198
2915 $value = ($value - $lo) / $range; 3199 $value = ($value - $lo) / $range;
… …
2945 glDisable GL_TEXTURE_2D; 3229 glDisable GL_TEXTURE_2D;
2946} 3230}
2947 3231
2948############################################################################# 3232#############################################################################
2949 3233
2950package CFPlus::UI::ValSlider; 3234package DC::UI::ValSlider;
2951 3235
2952our @ISA = CFPlus::UI::HBox::; 3236our @ISA = DC::UI::HBox::;
2953 3237
2954sub new { 3238sub new {
2955 my ($class, %arg) = @_; 3239 my ($class, %arg) = @_;
2956 3240
2957 my $range = delete $arg{range}; 3241 my $range = delete $arg{range};
2958 3242
2959 my $self = $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
2960 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3244 slider => (new DC::UI::Slider expand => 1, range => $range),
2961 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3245 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2962 to_value => sub { shift }, 3246 to_value => sub { shift },
2963 from_value => sub { shift }, 3247 from_value => sub { shift },
2964 %arg, 3248 %arg,
2965 ); 3249 );
2966 3250
… …
2986sub set_range { shift->{slider}->set_range (@_) } 3270sub set_range { shift->{slider}->set_range (@_) }
2987sub set_value { shift->{slider}->set_value (@_) } 3271sub set_value { shift->{slider}->set_value (@_) }
2988 3272
2989############################################################################# 3273#############################################################################
2990 3274
2991package CFPlus::UI::TextScroller; 3275package DC::UI::TextScroller;
2992 3276
2993our @ISA = CFPlus::UI::HBox::; 3277our @ISA = DC::UI::HBox::;
2994 3278
2995use CFPlus::OpenGL; 3279use DC::OpenGL;
2996 3280
2997sub new { 3281sub new {
2998 my $class = shift; 3282 my $class = shift;
2999 3283
3000 my $self = $class->SUPER::new ( 3284 my $self = $class->SUPER::new (
… …
3002 can_events => 1, 3286 can_events => 1,
3003 indent => 0, 3287 indent => 0,
3004 #font => default_font 3288 #font => default_font
3005 @_, 3289 @_,
3006 3290
3007 layout => (new CFPlus::Layout), 3291 layout => (new DC::Layout),
3008 par => [], 3292 par => [],
3009 max_par => 0, 3293 max_par => 0,
3010 height => 0, 3294 height => 0,
3011 children => [ 3295 children => [
3012 (new CFPlus::UI::Empty expand => 1), 3296 (new DC::UI::Empty expand => 1),
3013 (new CFPlus::UI::Slider vertical => 1), 3297 (new DC::UI::Slider vertical => 1),
3014 ], 3298 ],
3015 ); 3299 );
3016 3300
3017 $self->{children}[1]->connect (changed => sub { $self->update }); 3301 $self->{children}[1]->connect (changed => sub { $self->update });
3018 3302
… …
3027} 3311}
3028 3312
3029sub size_request { 3313sub size_request {
3030 my ($self) = @_; 3314 my ($self) = @_;
3031 3315
3032 my ($empty, $slider) = @{ $self->{children} }; 3316 my ($empty, $slider) = $self->visible_children;
3033 3317
3034 local $self->{children} = [$empty, $slider]; 3318 local $self->{children} = [$empty, $slider];
3035 $self->SUPER::size_request 3319 $self->SUPER::size_request
3036} 3320}
3037 3321
… …
3074 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3358 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3075 $layout->set_markup ($para->{markup}); 3359 $layout->set_markup ($para->{markup});
3076 3360
3077 $layout->set_shapes ( 3361 $layout->set_shapes (
3078 map 3362 map
3079 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3363 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3080 @{$para->{widget}} 3364 @{$para->{widget}}
3081 ); 3365 );
3082 3366
3083 $layout 3367 $layout
3084} 3368}
… …
3201 $ROOT->on_post_alloc ($self => sub { 3485 $ROOT->on_post_alloc ($self => sub {
3202 $self->force_uptodate; 3486 $self->force_uptodate;
3203 3487
3204 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3488 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3205 3489
3206 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3490 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3207 glClearColor 0, 0, 0, 0; 3491 glClearColor 0, 0, 0, 0;
3208 glClear GL_COLOR_BUFFER_BIT; 3492 glClear GL_COLOR_BUFFER_BIT;
3209 3493
3210 package CFPlus::UI::Base; 3494 package DC::UI::Base;
3211 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3495 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3212 (0, 0, $self->{w}, $self->{h}); 3496 (0, 0, $self->{w}, $self->{h});
3213 3497
3214 my $top = int $self->{children}[1]{range}[0]; 3498 my $top = int $self->{children}[1]{range}[0];
3215 3499
… …
3226 3510
3227 if ($y0 < $y + $h && $y < $y1) { 3511 if ($y0 < $y + $h && $y < $y1) {
3228 my $layout = $self->get_layout ($para); 3512 my $layout = $self->get_layout ($para);
3229 3513
3230 $layout->render ($para->{indent}, $y - $y0); 3514 $layout->render ($para->{indent}, $y - $y0);
3515 $layout->draw;
3231 3516
3232 if (my @w = @{ $para->{widget} }) { 3517 if (my @w = @{ $para->{widget} }) {
3233 my @s = $layout->get_shapes; 3518 my @s = $layout->get_shapes;
3234 3519
3235 for (@w) { 3520 for (@w) {
… …
3273 $self->{children}[1]->draw; 3558 $self->{children}[1]->draw;
3274} 3559}
3275 3560
3276############################################################################# 3561#############################################################################
3277 3562
3278package CFPlus::UI::Animator; 3563package DC::UI::Animator;
3279 3564
3280use CFPlus::OpenGL; 3565use DC::OpenGL;
3281 3566
3282our @ISA = CFPlus::UI::Bin::; 3567our @ISA = DC::UI::Bin::;
3283 3568
3284sub moveto { 3569sub moveto {
3285 my ($self, $x, $y) = @_; 3570 my ($self, $x, $y) = @_;
3286 3571
3287 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3572 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3315 glPopMatrix; 3600 glPopMatrix;
3316} 3601}
3317 3602
3318############################################################################# 3603#############################################################################
3319 3604
3320package CFPlus::UI::Flopper; 3605package DC::UI::Flopper;
3321 3606
3322our @ISA = CFPlus::UI::Button::; 3607our @ISA = DC::UI::Button::;
3323 3608
3324sub new { 3609sub new {
3325 my $class = shift; 3610 my $class = shift;
3326 3611
3327 my $self = $class->SUPER::new ( 3612 my $self = $class->SUPER::new (
… …
3339 $self->{other}->toggle_visibility; 3624 $self->{other}->toggle_visibility;
3340} 3625}
3341 3626
3342############################################################################# 3627#############################################################################
3343 3628
3344package CFPlus::UI::Tooltip; 3629package DC::UI::Tooltip;
3345 3630
3346our @ISA = CFPlus::UI::Bin::; 3631our @ISA = DC::UI::Bin::;
3347 3632
3348use CFPlus::OpenGL; 3633use DC::OpenGL;
3349 3634
3350sub new { 3635sub new {
3351 my $class = shift; 3636 my $class = shift;
3352 3637
3353 $class->SUPER::new ( 3638 $class->SUPER::new (
… …
3357} 3642}
3358 3643
3359sub set_tooltip_from { 3644sub set_tooltip_from {
3360 my ($self, $widget) = @_; 3645 my ($self, $widget) = @_;
3361 3646
3362 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3363 if $widget->{tooltip} =~ /^#(.*)$/;
3364
3365 my $tooltip = $widget->{tooltip}; 3647 my $tip = $widget->{tooltip};
3648 $tip = $tip->($widget) if "CODE" eq ref $tip;
3649
3650 $tip = DC::Pod::section_label tooltip => $1
3651 if $tip =~ /^#(.*)$/;
3366 3652
3367 if ($ENV{CFPLUS_DEBUG} & 2) { 3653 if ($ENV{CFPLUS_DEBUG} & 2) {
3368 $tooltip .= "\n\n" . (ref $widget) . "\n" 3654 $tip .= "\n\n" . (ref $widget) . "\n"
3369 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3655 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3370 . "req $widget->{req_w} $widget->{req_h}\n" 3656 . "req $widget->{req_w} $widget->{req_h}\n"
3371 . "visible $widget->{visible}"; 3657 . "visible $widget->{visible}";
3372 } 3658 }
3373 3659
3374 $tooltip =~ s/^\n+//; 3660 $tip =~ s/^\n+//;
3375 $tooltip =~ s/\n+$//; 3661 $tip =~ s/\n+$//;
3376 3662
3377 $self->add (new CFPlus::UI::Label 3663 $self->add (new DC::UI::Label
3664 fg => $DC::THEME{tooltip_fg},
3378 markup => $tooltip, 3665 markup => $tip,
3379 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3666 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3667 align => 0,
3380 fontsize => 0.8, 3668 fontsize => 0.8,
3381 style => 1, # FLAG_INVERSE 3669 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3382 ellipsise => 0, 3670 ellipsise => 0,
3383 font => ($widget->{tooltip_font} || $::FONT_PROP), 3671 font => ($widget->{tooltip_font} || $::FONT_PROP),
3384 ); 3672 );
3385} 3673}
3386 3674
… …
3421} 3709}
3422 3710
3423sub _draw { 3711sub _draw {
3424 my ($self) = @_; 3712 my ($self) = @_;
3425 3713
3426 glTranslate 0.375, 0.375;
3427
3428 my ($w, $h) = @$self{qw(w h)}; 3714 my ($w, $h) = @$self{qw(w h)};
3429 3715
3430 glColor 1, 0.8, 0.4; 3716 glColor @{ $DC::THEME{tooltip_bg} };
3431 glBegin GL_QUADS; 3717 glRect 0, 0, $w, $h;
3432 glVertex 0 , 0;
3433 glVertex 0 , $h;
3434 glVertex $w, $h;
3435 glVertex $w, 0;
3436 glEnd;
3437 3718
3438 glColor 0, 0, 0; 3719 glColor @{ $DC::THEME{tooltip_border} };
3439 glBegin GL_LINE_LOOP; 3720 glRect_lineloop .5, .5, $w + .5, $h + .5;
3440 glVertex 0 , 0;
3441 glVertex 0 , $h;
3442 glVertex $w, $h;
3443 glVertex $w, 0;
3444 glEnd;
3445 3721
3446 glTranslate 2 - 0.375, 2 - 0.375; 3722 glTranslate 2, 2;
3447 3723
3448 $self->SUPER::_draw; 3724 $self->SUPER::_draw;
3449} 3725}
3450 3726
3451############################################################################# 3727#############################################################################
3452 3728
3453package CFPlus::UI::Face; 3729package DC::UI::Face;
3454 3730
3455our @ISA = CFPlus::UI::DrawBG::; 3731our @ISA = DC::UI::DrawBG::;
3456 3732
3457use CFPlus::OpenGL; 3733use DC::OpenGL;
3458 3734
3459sub new { 3735sub new {
3460 my $class = shift; 3736 my $class = shift;
3461 3737
3462 my $self = $class->SUPER::new ( 3738 my $self = $class->SUPER::new (
… …
3465 aspect => 1, 3741 aspect => 1,
3466 can_events => 0, 3742 can_events => 0,
3467 @_, 3743 @_,
3468 ); 3744 );
3469 3745
3470 if ($self->{anim} && $self->{animspeed}) {
3471 CFPlus::weaken (my $widget = $self);
3472
3473 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3474 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3475 $self->{timer} = Event->timer (
3476 parked => 1,
3477 cb => sub {
3478 return unless $::CONN && $widget;
3479
3480 ++$widget->{frame};
3481 $widget->update_face;
3482 $widget->update;
3483
3484 $widget->update_timer;
3485 },
3486 );
3487
3488 $self->update_face;
3489 $self->update_timer; 3746 $self->update_anim;
3490 }
3491 3747
3492 $self 3748 $self
3493} 3749}
3494 3750
3495sub update_timer { 3751sub update_timer {
3496 my ($self) = @_; 3752 my ($self) = @_;
3497 3753
3498 return unless $self->{timer}; 3754 return unless $self->{timer};
3499 3755
3500 if ($self->{visible}) { 3756 if ($self->{visible}) {
3501 $self->{timer}->at (
3502 $self->{anim_start}
3503 + $self->{animspeed}
3504 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3505 );
3506 $self->{timer}->start; 3757 $self->{timer}->start;
3507 } else { 3758 } else {
3508 $self->{timer}->stop; 3759 $self->{timer}->stop;
3509 } 3760 }
3510} 3761}
3511 3762
3512sub update_face { 3763sub update_face {
3513 my ($self) = @_; 3764 my ($self) = @_;
3514 3765
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
3525sub size_request {
3526 my ($self) = @_;
3527
3528 if ($::CONN) { 3766 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3767 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) { 3768 if ($anim && @$anim) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3769 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3532 } else { 3770 delete $self->{face_change_cb};
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3771
3534 $self->realloc; 3772 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3773 unless ($tex->{name} || $tex->{loading}) {
3774 $tex->upload (sub { $self->reconfigure });
3775 }
3535 }); 3776 }
3536 } 3777 }
3537 } 3778 }
3538 } 3779 }
3780}
3781
3782sub update_anim {
3783 my ($self) = @_;
3784
3785 if ($self->{anim} && $self->{animspeed}) {
3786 DC::weaken (my $widget = $self);
3787
3788 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3789 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3790 return unless $::CONN;
3791
3792 my $w = $widget
3793 or return;
3794
3795 ++$w->{frame};
3796 $w->update_face;
3797
3798 # somehow, $widget can go away
3799 $w->update;
3800 $w->update_timer;
3801 };
3802
3803 $self->update_face;
3804 $self->update_timer;
3805 } else {
3806 delete $self->{timer};
3807 }
3808}
3809
3810sub size_request {
3811 my ($self) = @_;
3812
3813 if ($::CONN) {
3814 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3815 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3816 if ($tex->{name}) {
3817 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3818 } elsif (!$tex->{loading}) {
3819 $tex->upload (sub { $self->reconfigure });
3820 }
3821 }
3822
3823 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3824 }
3825 }
3539 3826
3540 ($self->{size_w} || 8, $self->{size_h} || 8) 3827 ($self->{size_w} || 8, $self->{size_h} || 8)
3541} 3828}
3542 3829
3543sub update { 3830sub update {
… …
3546 return unless $self->{visible}; 3833 return unless $self->{visible};
3547 3834
3548 $self->SUPER::update; 3835 $self->SUPER::update;
3549} 3836}
3550 3837
3838sub set_face {
3839 my ($self, $face) = @_;
3840
3841 $self->{face} = $face;
3842 $self->reconfigure;
3843}
3844
3845sub set_anim {
3846 my ($self, $anim) = @_;
3847
3848 $self->{anim} = $anim;
3849 $self->update_anim;
3850}
3851
3852sub set_animspeed {
3853 my ($self, $animspeed) = @_;
3854
3855 $self->{animspeed} = $animspeed;
3856 $self->update_anim;
3857}
3858
3551sub invoke_visibility_change { 3859sub invoke_visibility_change {
3552 my ($self) = @_; 3860 my ($self) = @_;
3553 3861
3554 $self->update_timer; 3862 $self->update_timer;
3555 3863
… …
3557} 3865}
3558 3866
3559sub _draw { 3867sub _draw {
3560 my ($self) = @_; 3868 my ($self) = @_;
3561 3869
3562 return unless $::CONN;
3563
3564 $self->SUPER::_draw; 3870 $self->SUPER::_draw;
3565 3871
3566 my $faceid = $::CONN->{faceid}[$self->{face}] 3872 if (my $tex = $self->{tex}) {
3567 or return;
3568
3569 my $tex = $::CONN->{texture}[$faceid];
3570
3571 if ($tex) {
3572 glEnable GL_TEXTURE_2D; 3873 glEnable GL_TEXTURE_2D;
3573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3874 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3574 glColor 0, 0, 0, 1; 3875 glColor 0, 0, 0, 1;
3575 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3876 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3576 glDisable GL_TEXTURE_2D; 3877 glDisable GL_TEXTURE_2D;
… …
3586 $self->SUPER::destroy; 3887 $self->SUPER::destroy;
3587} 3888}
3588 3889
3589############################################################################# 3890#############################################################################
3590 3891
3591package CFPlus::UI::Buttonbar; 3892package DC::UI::Buttonbar;
3592 3893
3593our @ISA = CFPlus::UI::HBox::; 3894our @ISA = DC::UI::HBox::;
3594 3895
3595# TODO: should actually wrap buttons and other goodies. 3896# TODO: should actually wrap buttons and other goodies.
3596 3897
3597############################################################################# 3898#############################################################################
3598 3899
3599package CFPlus::UI::Menu; 3900package DC::UI::Menu;
3600 3901
3601our @ISA = CFPlus::UI::Toplevel::; 3902our @ISA = DC::UI::Toplevel::;
3602 3903
3603use CFPlus::OpenGL; 3904use DC::OpenGL;
3604 3905
3605sub new { 3906sub new {
3606 my $class = shift; 3907 my $class = shift;
3607 3908
3608 my $self = $class->SUPER::new ( 3909 my $self = $class->SUPER::new (
3609 items => [], 3910 items => [],
3610 z => 100, 3911 z => 100,
3611 @_, 3912 @_,
3612 ); 3913 );
3613 3914
3614 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3915 $self->add ($self->{vbox} = new DC::UI::VBox);
3615 3916
3616 for my $item (@{ $self->{items} }) { 3917 for my $item (@{ $self->{items} }) {
3617 my ($widget, $cb, $tooltip) = @$item; 3918 my ($widget, $cb, $tooltip) = @$item;
3618 3919
3619 # handle various types of items, only text for now 3920 # handle various types of items, only text for now
3620 if (!ref $widget) { 3921 if (!ref $widget) {
3621 if ($widget =~ /\t/) { 3922 if ($widget =~ /\t/) {
3622 my ($left, $right) = split /\t/, $widget, 2; 3923 my ($left, $right) = split /\t/, $widget, 2;
3623 3924
3624 $widget = new CFPlus::UI::HBox 3925 $widget = new DC::UI::HBox
3625 can_hover => 1, 3926 can_hover => 1,
3626 can_events => 1, 3927 can_events => 1,
3627 tooltip => $tooltip, 3928 tooltip => $tooltip,
3628 children => [ 3929 children => [
3629 (new CFPlus::UI::Label markup => $left, expand => 1), 3930 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3630 (new CFPlus::UI::Label markup => $right, align => +1), 3931 (new DC::UI::Label markup => $right, align => 1),
3631 ], 3932 ],
3632 ; 3933 ;
3633 3934
3634 } else { 3935 } else {
3635 $widget = new CFPlus::UI::Label 3936 $widget = new DC::UI::Label
3636 can_hover => 1, 3937 can_hover => 1,
3637 can_events => 1, 3938 can_events => 1,
3939 align => 0,
3638 markup => $widget, 3940 markup => $widget,
3639 tooltip => $tooltip; 3941 tooltip => $tooltip;
3640 } 3942 }
3641 } 3943 }
3642 3944
… …
3657 # maybe save $GRAB? must be careful about events... 3959 # maybe save $GRAB? must be careful about events...
3658 $GRAB = $self; 3960 $GRAB = $self;
3659 $self->{button} = $ev->{button}; 3961 $self->{button} = $ev->{button};
3660 3962
3661 $self->show; 3963 $self->show;
3662 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3964
3965 my $x = $ev->{x};
3966 my $y = $ev->{y};
3967
3968 $self->{root}->on_post_alloc ($self => sub {
3969 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3970 });
3971
3972 1 # so it can be used inside event handlers
3663} 3973}
3664 3974
3665sub invoke_mouse_motion { 3975sub invoke_mouse_motion {
3666 my ($self, $ev, $x, $y) = @_; 3976 my ($self, $ev, $x, $y) = @_;
3667 3977
… …
3688 1 3998 1
3689} 3999}
3690 4000
3691############################################################################# 4001#############################################################################
3692 4002
3693package CFPlus::UI::Multiplexer; 4003package DC::UI::Multiplexer;
3694 4004
3695our @ISA = CFPlus::UI::Container::; 4005our @ISA = DC::UI::Container::;
3696 4006
3697sub new { 4007sub new {
3698 my $class = shift; 4008 my $class = shift;
3699 4009
3700 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3701 @_, 4011 @_,
3702 ); 4012 );
3703 4013
3704 $self->{current} = $self->{children}[0] 4014 $self->set_current_page (0);
3705 if @{ $self->{children} };
3706 4015
3707 $self 4016 $self
3708} 4017}
3709 4018
3710sub add { 4019sub add {
3711 my ($self, @widgets) = @_; 4020 my ($self, @widgets) = @_;
3712 4021
3713 $self->SUPER::add (@widgets); 4022 $self->SUPER::add (@widgets);
3714 4023
3715 $self->{current} = $self->{children}[0] 4024 $self->set_current_page (0)
3716 if @{ $self->{children} }; 4025 if @widgets == @{ $self->{children} };
3717} 4026}
3718 4027
3719sub get_current_page { 4028sub get_current_page {
3720 my ($self) = @_; 4029 my ($self) = @_;
3721 4030
… …
3727 4036
3728 my $widget = ref $page_or_widget 4037 my $widget = ref $page_or_widget
3729 ? $page_or_widget 4038 ? $page_or_widget
3730 : $self->{children}[$page_or_widget]; 4039 : $self->{children}[$page_or_widget];
3731 4040
4041 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4042
3732 $self->{current} = $widget; 4043 if (($self->{current} = $widget)) {
4044 $self->{current}->set_visible if $self->{current} && $self->{visible};
3733 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4045 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3734 4046
3735 $self->emit (page_changed => $self->{current}); 4047 $self->emit (page_changed => $self->{current});
4048 }
3736 4049
3737 $self->realloc; 4050 $self->realloc;
3738} 4051}
3739 4052
3740sub visible_children { 4053sub visible_children {
3741 $_[0]{current} 4054 $_[0]{current} || ()
3742} 4055}
3743 4056
3744sub size_request { 4057sub size_request {
3745 my ($self) = @_; 4058 my ($self) = @_;
3746 4059
4060 $self->{current}
3747 $self->{current}->size_request 4061 ? $self->{current}->size_request
4062 : (0, 0)
3748} 4063}
3749 4064
3750sub invoke_size_allocate { 4065sub invoke_size_allocate {
3751 my ($self, $w, $h) = @_; 4066 my ($self, $w, $h) = @_;
3752 4067
3753 $self->{current}->configure (0, 0, $w, $h); 4068 $self->{current}->configure (0, 0, $w, $h)
4069 if $self->{current};
3754 4070
3755 1 4071 1
3756} 4072}
3757 4073
3758sub _draw { 4074sub _draw {
3759 my ($self) = @_; 4075 my ($self) = @_;
3760 4076
3761 $self->{current}->draw; 4077 $self->{current}->draw
4078 if $self->{current};
3762} 4079}
3763 4080
3764############################################################################# 4081#############################################################################
3765 4082
3766package CFPlus::UI::Notebook; 4083package DC::UI::Notebook;
3767 4084
4085use DC::OpenGL;
4086
3768our @ISA = CFPlus::UI::VBox::; 4087our @ISA = DC::UI::VBox::;
3769 4088
3770sub new { 4089sub new {
3771 my $class = shift; 4090 my $class = shift;
3772 4091
3773 my $self = $class->SUPER::new ( 4092 my $self = $class->SUPER::new (
3774 buttonbar => (new CFPlus::UI::Buttonbar), 4093 buttonbar => (new DC::UI::Buttonbar),
3775 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4094 multiplexer => (new DC::UI::Multiplexer expand => 1),
4095 active_outline => [.7, .7, 0.2],
3776 # filter => # will be put between multiplexer and $self 4096 # filter => # will be put between multiplexer and $self
3777 @_, 4097 @_,
3778 ); 4098 );
3779 4099
3780 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4100 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3781 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4101 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3782 4102
4103 {
4104 Scalar::Util::weaken (my $wself = $self);
4105
4106 $self->{multiplexer}->connect (c_add => sub {
4107 my ($mplex, $widgets) = @_;
4108
4109 for my $child (@$widgets) {
4110 Scalar::Util::weaken $child;
4111 $child->{c_tab_} ||= do {
4112 my $tab =
4113 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4114 ? $child->{c_tab}
4115 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4116
4117 $tab->connect (activate => sub {
4118 $wself->set_current_page ($child);
4119 });
4120
4121 $tab
4122 };
4123
4124 $self->{buttonbar}->add ($child->{c_tab_});
4125 }
4126 });
4127
4128 $self->{multiplexer}->connect (c_remove => sub {
4129 my ($mplex, $widgets) = @_;
4130
4131 for my $child (@$widgets) {
4132 $wself->{buttonbar}->remove ($child->{c_tab_});
4133 }
4134 });
4135 }
4136
3783 $self 4137 $self
3784} 4138}
3785 4139
3786sub add { 4140sub add {
4141 my ($self, @widgets) = @_;
4142
4143 $self->{multiplexer}->add (@widgets)
4144}
4145
4146sub remove {
4147 my ($self, @widgets) = @_;
4148
4149 $self->{multiplexer}->remove (@widgets)
4150}
4151
4152sub pages {
4153 my ($self) = @_;
4154 $self->{multiplexer}->children
4155}
4156
4157sub page_index {
4158 my ($self, $widget) = @_;
4159
4160 my $i = 0;
4161 for ($self->pages) {
4162 if ($_ eq $widget) { return $i };
4163 $i++;
4164 }
4165
4166 undef
4167}
4168
4169sub add_tab {
3787 my ($self, $title, $widget, $tooltip) = @_; 4170 my ($self, $title, $widget, $tooltip) = @_;
3788 4171
3789 CFPlus::weaken $self; 4172 $title = [$title, $tooltip] unless ref $title;
4173 $widget->{c_tab} = $title;
3790 4174
3791 $self->{buttonbar}->add (new CFPlus::UI::Button
3792 markup => $title,
3793 tooltip => $tooltip,
3794 on_activate => sub { $self->set_current_page ($widget) },
3795 );
3796
3797 $self->{multiplexer}->add ($widget); 4175 $self->add ($widget);
3798} 4176}
3799 4177
3800sub get_current_page { 4178sub get_current_page {
3801 my ($self) = @_; 4179 my ($self) = @_;
3802 4180
… …
3808 4186
3809 $self->{multiplexer}->set_current_page ($page); 4187 $self->{multiplexer}->set_current_page ($page);
3810 $self->emit (page_changed => $self->{multiplexer}{current}); 4188 $self->emit (page_changed => $self->{multiplexer}{current});
3811} 4189}
3812 4190
4191sub _draw {
4192 my ($self) = @_;
4193
4194 $self->SUPER::_draw ();
4195
4196 if (my $cur = $self->{multiplexer}{current}) {
4197 if ($cur = $cur->{c_tab_}) {
4198 glTranslate $self->{buttonbar}{x} + $cur->{x},
4199 $self->{buttonbar}{y} + $cur->{y};
4200 glLineWidth 3;
4201 #glEnable GL_BLEND;
4202 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4203 glColor @{$self->{active_outline}};
4204 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4205 glLineWidth 1;
4206 #glDisable GL_BLEND;
4207 }
4208 }
4209}
4210
3813############################################################################# 4211#############################################################################
3814 4212
3815package CFPlus::UI::Selector; 4213package DC::UI::Selector;
3816 4214
3817use utf8; 4215use utf8;
3818 4216
3819our @ISA = CFPlus::UI::Button::; 4217our @ISA = DC::UI::Button::;
3820 4218
3821sub new { 4219sub new {
3822 my $class = shift; 4220 my $class = shift;
3823 4221
3824 my $self = $class->SUPER::new ( 4222 my $self = $class->SUPER::new (
… …
3841 my ($value, $title, $tooltip) = @$_; 4239 my ($value, $title, $tooltip) = @$_;
3842 4240
3843 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4241 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3844 } 4242 }
3845 4243
3846 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4244 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3847} 4245}
3848 4246
3849sub _set_value { 4247sub _set_value {
3850 my ($self, $value) = @_; 4248 my ($self, $value) = @_;
3851 4249
3852 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4250 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4251 $item ||= $self->{options}[0]
3853 or return; 4252 or return;
3854 4253
3855 $self->{value} = $item->[0]; 4254 $self->{value} = $item->[0];
3856 $self->set_markup ("$item->[1] ⇓"); 4255 $self->set_markup ("$item->[1] ⇓");
3857 $self->set_tooltip ($item->[2]); 4256# $self->set_tooltip ($item->[2]);
3858} 4257}
3859 4258
3860sub set_value { 4259sub set_value {
3861 my ($self, $value) = @_; 4260 my ($self, $value) = @_;
3862 4261
… …
3864 4263
3865 $self->_set_value ($value); 4264 $self->_set_value ($value);
3866 $self->emit (changed => $value); 4265 $self->emit (changed => $value);
3867} 4266}
3868 4267
4268sub set_options {
4269 my ($self, $options) = @_;
4270
4271 $self->{options} = $options;
4272 $self->_set_value ($self->{value});
4273}
4274
3869############################################################################# 4275#############################################################################
3870 4276
3871package CFPlus::UI::Statusbox; 4277package DC::UI::Statusbox;
3872 4278
3873our @ISA = CFPlus::UI::VBox::; 4279our @ISA = DC::UI::VBox::;
3874 4280
3875sub new { 4281sub new {
3876 my $class = shift; 4282 my $class = shift;
3877 4283
3878 my $self = $class->SUPER::new ( 4284 my $self = $class->SUPER::new (
3879 fontsize => 0.8, 4285 fontsize => 0.8,
3880 @_, 4286 @_,
3881 ); 4287 );
3882 4288
3883 CFPlus::weaken (my $this = $self); 4289 DC::weaken (my $this = $self);
3884 4290
3885 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4291 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3886 4292
3887 $self 4293 $self
3888} 4294}
3889 4295
3890sub reorder { 4296sub reorder {
3891 my ($self) = @_; 4297 my ($self) = @_;
3892 my $NOW = Time::HiRes::time; 4298 my $NOW = AE::time;
3893 4299
3894 # freeze display when hovering over any label 4300 # freeze display when hovering over any label
3895 return if $CFPlus::UI::TOOLTIP->{owner} 4301 return if $DC::UI::TOOLTIP->{owner}
3896 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4302 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3897 values %{ $self->{item} }; 4303 values %{ $self->{item} };
3898 4304
3899 while (my ($k, $v) = each %{ $self->{item} }) { 4305 while (my ($k, $v) = each %{ $self->{item} }) {
3900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4306 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3901 } 4307 }
4308
4309 $self->{timer}->set (1, 1);
3902 4310
3903 my @widgets; 4311 my @widgets;
3904 4312
3905 my @items = sort { 4313 my @items = sort {
3906 $a->{pri} <=> $b->{pri} 4314 $a->{pri} <=> $b->{pri}
3907 or $b->{id} <=> $a->{id} 4315 or $b->{id} <=> $a->{id}
3908 } values %{ $self->{item} }; 4316 } values %{ $self->{item} };
3909
3910 $self->{timer}->interval (1);
3911 4317
3912 my $count = 10 + 1; 4318 my $count = 10 + 1;
3913 for my $item (@items) { 4319 for my $item (@items) {
3914 last unless --$count; 4320 last unless --$count;
3915 4321
… …
3922 for ($short) { 4328 for ($short) {
3923 s/^\s+//; 4329 s/^\s+//;
3924 s/\s+/ /g; 4330 s/\s+/ /g;
3925 } 4331 }
3926 4332
3927 new CFPlus::UI::Label 4333 new DC::UI::Label
3928 markup => $short, 4334 markup => $short,
3929 tooltip => $item->{tooltip}, 4335 tooltip => $item->{tooltip},
3930 tooltip_font => $::FONT_PROP, 4336 tooltip_font => $::FONT_PROP,
3931 tooltip_width => 0.67, 4337 tooltip_width => 0.67,
3932 fontsize => $item->{fontsize} || $self->{fontsize}, 4338 fontsize => $item->{fontsize} || $self->{fontsize},
3933 max_w => $::WIDTH * 0.44, 4339 max_w => $::WIDTH * 0.44,
4340 align => 0,
3934 fg => [@{ $item->{fg} }], 4341 fg => [@{ $item->{fg} }],
3935 can_events => 1, 4342 can_events => 1,
3936 can_hover => 1 4343 can_hover => 1
3937 }; 4344 };
3938 4345
3939 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4346 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3940 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4347 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3941 $label->update; 4348 $label->update;
3942 $label->set_max_size (undef, $label->{req_h} * $diff) 4349 $label->set_max_size (undef, $label->{req_h} * $diff)
3943 if $diff < 1; 4350 if $diff < 1;
3944 $self->{timer}->interval (1/30); 4351 $self->{timer}->set (1/30, 1/30);
3945 } else { 4352 } else {
3946 $label->{fg}[3] = $item->{fg}[3] || 1; 4353 $label->{fg}[3] = $item->{fg}[3] || 1;
3947 } 4354 }
3948 4355
3949 push @widgets, $label; 4356 push @widgets, $label;
3950 } 4357 }
4358
4359 my $hash = join ",", @widgets;
4360 return if $hash eq $self->{last_widget_hash};
4361 $self->{last_widget_hash} = $hash;
3951 4362
3952 $self->clear; 4363 $self->clear;
3953 $self->SUPER::add (reverse @widgets); 4364 $self->SUPER::add (reverse @widgets);
3954} 4365}
3955 4366
… …
4011 $self->SUPER::destroy; 4422 $self->SUPER::destroy;
4012} 4423}
4013 4424
4014############################################################################# 4425#############################################################################
4015 4426
4016package CFPlus::UI::Root; 4427package DC::UI::Root;
4017 4428
4018our @ISA = CFPlus::UI::Container::; 4429our @ISA = DC::UI::Container::;
4019 4430
4020use List::Util qw(min max); 4431use List::Util qw(min max);
4021 4432
4022use CFPlus::OpenGL; 4433use DC::OpenGL;
4023 4434
4024sub new { 4435sub new {
4025 my $class = shift; 4436 my $class = shift;
4026 4437
4027 my $self = $class->SUPER::new ( 4438 my $self = $class->SUPER::new (
4028 visible => 1, 4439 visible => 1,
4029 @_, 4440 @_,
4030 ); 4441 );
4031 4442
4032 CFPlus::weaken ($self->{root} = $self); 4443 DC::weaken ($self->{root} = $self);
4033 4444
4034 $self 4445 $self
4035} 4446}
4036 4447
4037sub size_request { 4448sub size_request {
… …
4085} 4496}
4086 4497
4087sub update { 4498sub update {
4088 my ($self) = @_; 4499 my ($self) = @_;
4089 4500
4090 $::WANT_REFRESH++; 4501 $::WANT_REFRESH = 1;
4091} 4502}
4092 4503
4093sub add { 4504sub add {
4094 my ($self, @children) = @_; 4505 my ($self, @children) = @_;
4095 4506
… …
4132 while ($self->{refresh_hook}) { 4543 while ($self->{refresh_hook}) {
4133 $_->() 4544 $_->()
4134 for values %{delete $self->{refresh_hook}}; 4545 for values %{delete $self->{refresh_hook}};
4135 } 4546 }
4136 4547
4137 if ($self->{realloc}) { 4548 while ($self->{realloc}) {
4138 my %queue; 4549 my %queue;
4139 my @queue; 4550 my @queue;
4140 my $widget; 4551 my $widget;
4141 4552
4142 outer: 4553 outer:
… …
4162 4573
4163 delete $queue{$widget+0}; 4574 delete $queue{$widget+0};
4164 4575
4165 my ($w, $h) = $widget->size_request; 4576 my ($w, $h) = $widget->size_request;
4166 4577
4167 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4578 $w += $widget->{padding_x} * 2;
4168 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4579 $h += $widget->{padding_y} * 2;
4580
4581 $w = max $widget->{min_w}, $w;
4582 $h = max $widget->{min_h}, $h;
4169 4583
4170 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4584 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4171 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4585 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4172 4586
4173 $w = $widget->{force_w} if exists $widget->{force_w}; 4587 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4189 } 4603 }
4190 } 4604 }
4191 4605
4192 delete $self->{realloc}{$widget+0}; 4606 delete $self->{realloc}{$widget+0};
4193 } 4607 }
4194 }
4195 4608
4196 while (my $size_alloc = delete $self->{size_alloc}) { 4609 while (my $size_alloc = delete $self->{size_alloc}) {
4197 my @queue = sort { $b->{visible} <=> $a->{visible} } 4610 my @queue = sort { $a->{visible} <=> $b->{visible} }
4198 values %$size_alloc; 4611 values %$size_alloc;
4199 4612
4200 while () { 4613 while () {
4201 my $widget = pop @queue || last; 4614 my $widget = pop @queue || last;
4202 4615
4203 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4616 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4204 4617
4205 $w = 0 if $w < 0;
4206 $h = 0 if $h < 0;
4207
4208 $w = max $widget->{min_w}, $w; 4618 $w = max $widget->{min_w}, $w;
4209 $h = max $widget->{min_h}, $h; 4619 $h = max $widget->{min_h}, $h;
4210 4620
4211# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4621# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4212# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4622# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4213 4623
4214 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4624 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4215 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4625 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4216 4626
4217 $w = int $w + 0.5; 4627 $w = int $w + 0.5;
4218 $h = int $h + 0.5; 4628 $h = int $h + 0.5;
4219 4629
4220 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4630 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4221 $widget->{old_w} = $widget->{w}; 4631 $widget->{old_w} = $widget->{w};
4222 $widget->{old_h} = $widget->{h}; 4632 $widget->{old_h} = $widget->{h};
4223 4633
4224 $widget->{w} = $w; 4634 $widget->{w} = $w;
4225 $widget->{h} = $h; 4635 $widget->{h} = $h;
4226 4636
4227 $widget->emit (size_allocate => $w, $h); 4637 $widget->emit (size_allocate => $w, $h);
4638 }
4228 } 4639 }
4229 } 4640 }
4230 } 4641 }
4231 4642
4232 while ($self->{post_alloc_hook}) { 4643 while ($self->{post_alloc_hook}) {
… …
4243 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4654 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4244 glMatrixMode GL_MODELVIEW; 4655 glMatrixMode GL_MODELVIEW;
4245 glLoadIdentity; 4656 glLoadIdentity;
4246 4657
4247 { 4658 {
4248 package CFPlus::UI::Base; 4659 package DC::UI::Base;
4249 4660
4250 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4661 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4251 (0, 0, $self->{w}, $self->{h}); 4662 (0, 0, $self->{w}, $self->{h});
4252 4663
4253 $self->_draw; 4664 $self->_draw;
4254 } 4665 }
4255} 4666}
4256 4667
4257############################################################################# 4668#############################################################################
4258 4669
4259package CFPlus::UI; 4670package DC::UI;
4260 4671
4261$ROOT = new CFPlus::UI::Root; 4672$ROOT = new DC::UI::Root;
4262$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4673$TOOLTIP = new DC::UI::Tooltip z => 900;
4263 4674
42641 46751
4265

Diff Legend

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