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.385 by root, Fri Jul 20 16:32:17 2007 UTC vs.
Revision 1.476 by root, Sun Jan 11 23:45:52 2009 UTC

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

Diff Legend

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