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.387 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

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

Diff Legend

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