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.381 by root, Thu Jul 19 13:45:18 2007 UTC vs.
Revision 1.475 by root, Sun Jan 11 22:15:23 2009 UTC

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

Diff Legend

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