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.388 by root, Fri Jul 20 18:30:03 2007 UTC vs.
Revision 1.475 by root, Sun Jan 11 22:15:23 2009 UTC

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

Diff Legend

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