ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC vs.
Revision 1.480 by root, Sat Apr 3 02:58:25 2010 UTC

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

Diff Legend

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