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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 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 @_
686 ) 658 )
687} 659}
688 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
689sub _draw { 668sub _draw {
690 my ($self) = @_; 669 my ($self) = @_;
691 670
692 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self && $self->{active_bg}
693 ? $self->{active_bg} 672 ? $self->{active_bg}
… …
697 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
698 677
699 glEnable GL_BLEND; 678 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 680 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 682 glDisable GL_BLEND;
711 } 683 }
712} 684}
713 685
714############################################################################# 686#############################################################################
715 687
716package CFPlus::UI::Empty; 688package DC::UI::Empty;
717 689
718our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
719 691
720sub new { 692sub new {
721 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
723} 695}
… …
730 702
731sub draw { } 703sub draw { }
732 704
733############################################################################# 705#############################################################################
734 706
735package CFPlus::UI::Container; 707package DC::UI::Container;
736 708
737our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
738 710
739sub new { 711sub new {
740 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
741 713
742 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
746 can_events => 0, 718 can_events => 0,
747 %arg, 719 %arg,
748 ); 720 );
749 721
750 $self->add (@$children) 722 $self->add (@$children)
751 if $children; 723 if $children && @$children;
752 724
753 $self 725 $self
754} 726}
755 727
756sub realloc { 728sub realloc {
… …
765 my ($self, @widgets) = @_; 737 my ($self, @widgets) = @_;
766 738
767 $_->set_parent ($self) 739 $_->set_parent ($self)
768 for @widgets; 740 for @widgets;
769 741
742 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 743 use sort 'stable';
771 744
772 $self->{children} = [ 745 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 746 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
775 ]; 748 ];
776 749
777 $self->realloc; 750 $self->realloc;
751
752 $self->emit (c_add => \@widgets);
753
754 map $_+0, @widgets
778} 755}
779 756
780sub children { 757sub children {
781 @{ $_[0]{children} } 758 @{ $_[0]{children} }
782} 759}
783 760
784sub remove { 761sub remove {
785 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
786 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
787 delete $child->{parent}; 767 delete $child->{parent};
788 $child->hide; 768 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
791 771
792 $self->realloc; 772 $self->realloc;
793} 773}
794 774
795sub clear { 775sub clear {
796 my ($self) = @_; 776 my ($self) = @_;
797 777
798 my $children = delete $self->{children}; 778 my $children = $self->{children};
799 $self->{children} = []; 779 $self->{children} = [];
800 780
801 for (@$children) { 781 for (@$children) {
802 delete $_->{parent}; 782 delete $_->{parent};
803 $_->hide; 783 $_->hide;
… …
823} 803}
824 804
825sub _draw { 805sub _draw {
826 my ($self) = @_; 806 my ($self) = @_;
827 807
828 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
829} 809}
830 810
831############################################################################# 811#############################################################################
832 812
833package CFPlus::UI::Bin; 813package DC::UI::Bin;
834 814
835our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
836 816
837sub new { 817sub new {
838 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
839 819
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 821
842 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
843} 823}
844 824
845sub add { 825sub add {
846 my ($self, $child) = @_; 826 my ($self, $child) = @_;
847 827
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
849 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
850} 830}
851 831
852sub remove { 832sub remove {
853 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
854 834
855 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
856 836
857 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 838 unless @{$self->{children}};
859} 839}
860 840
861sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
862 842
… …
871 851
872 1 852 1
873} 853}
874 854
875############################################################################# 855#############################################################################
876
877# back-buffered drawing area 856# back-buffered drawing area
878 857
879package CFPlus::UI::Window; 858package DC::UI::Window;
880 859
881our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
882 861
883use CFPlus::OpenGL; 862use DC::OpenGL;
884 863
885sub new { 864sub new {
886 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
887 866
888 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
910} 889}
911 890
912sub render_child { 891sub render_child {
913 my ($self) = @_; 892 my ($self) = @_;
914 893
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 894 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
918 897
919 { 898 {
920 package CFPlus::UI::Base; 899 package DC::UI::Base;
921 900
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
924 903
925 $self->_render; 904 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
943} 922}
944 923
945############################################################################# 924#############################################################################
946 925
947package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
948 927
949use List::Util qw(min max); 928use List::Util qw(min max);
950 929
951our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
952 931
953sub new { 932sub new {
954 my $class = shift; 933 my $class = shift;
955 934
956 $class->SUPER::new ( 935 $class->SUPER::new (
… …
963sub size_request { 942sub size_request {
964 my ($self) = @_; 943 my ($self) = @_;
965 944
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 946
968 $w = 10 if $self->{scroll_x}; 947 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 948 $h = 1 if $self->{scroll_y};
970 949
971 ($w, $h) 950 ($w, $h)
972} 951}
973 952
974sub invoke_size_allocate { 953sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 977 $self->emit (changed => $x, $y);
999 $self->update; 978 $self->update;
1000 } 979 }
1001} 980}
1002 981
982sub set_center {
983 my ($self, $x, $y) = @_;
984
985 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
986}
987
988sub make_visible {
989 my ($self, $x, $y, $border) = @_;
990
991 if ( $x < $self->{view_x} + $self->{w} * $border
992 || $x > $self->{view_x} + $self->{w} * (1 - $border)
993 || $y < $self->{view_y} + $self->{h} * $border
994 || $y > $self->{view_y} + $self->{h} * (1 - $border)
995 ) {
996 $self->set_center ($x, $y);
997 }
998}
999
1003# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
1004sub coord2local { 1001sub coord2local {
1005 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
1006 1003
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1004 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1021 1018
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1021 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1023 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1028 } 1025 }
1029} 1026}
1030 1027
1031sub _render { 1028sub _render {
1032 my ($self) = @_; 1029 my ($self) = @_;
1033 1030
1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1031 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1032 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1036 1033
1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1038 1035
1039 $self->SUPER::_render; 1036 $self->SUPER::_render;
1040} 1037}
1041 1038
1042############################################################################# 1039#############################################################################
1043 1040
1044package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1045 1042
1046our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1047 1044
1048sub new { 1045sub new {
1049 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1050 1047
1051 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1052 1049
1053 my $self; 1050 my $self;
1054 1051
1055 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1053 c_col => 0,
1054 c_row => 1,
1056 vertical => 0, 1055 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1057 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1060 },
1062 ; 1061 ;
1063 1062
1064 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1064 c_col => 1,
1065 c_row => 0,
1065 vertical => 1, 1066 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1068 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1079 col_expand => [1, 0], 1080 col_expand => [1, 0],
1080 row_expand => [1, 0], 1081 row_expand => [1, 0],
1081 %arg, 1082 %arg,
1082 ); 1083 );
1083 1084
1084 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new DC::UI::ViewPort
1086 c_col => 0,
1087 c_row => 0,
1085 expand => 1, 1088 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1091 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1092 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1094 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1095 $vp->{parent}{vslider}->set_value ($y);
1093 1096
1094 0 1097 0
1095 }, 1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1096 ; 1104 ;
1097 1105
1098 $self->SUPER::add_at (0, 0, $self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1099 1107
1100 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1101 1109
1102 $self 1110 $self
1103} 1111}
1104
1105#TODO# update range on size_allocate depending on child
1106 1112
1107sub add { 1113sub add {
1108 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1109 1115
1110 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1111} 1117}
1112 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
1113sub update_slider { 1123sub update_slider {
1114 my ($self) = @_; 1124 my ($self) = @_;
1115 1125
1116 my $child = ($self->{vp} or return)->child; 1126 my $child = ($self->{vp} or return)->child;
1117 1127
1128 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1129 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1130 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1131
1121 my $visible = $w1 > $w2; 1132 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1133 if ($visible != $self->{hslider_visible}) {
1134 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1135 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1136 : $self->SUPER::remove ($self->{hslider});
1137 }
1125 } 1138 }
1126 1139
1140 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1141 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1142 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1143
1130 my $visible = $h1 > $h2; 1144 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1145 if ($visible != $self->{vslider_visible}) {
1146 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1147 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1148 : $self->SUPER::remove ($self->{vslider});
1149 }
1150 }
1151}
1152
1153sub start_dragging {
1154 my ($self, $ev) = @_;
1155
1156 $self->grab_focus;
1157
1158 my $ox = $self->{vp}{view_x};
1159 my $oy = $self->{vp}{view_y};
1160
1161 $self->{motion} = sub {
1162 my ($ev, $x, $y) = @_;
1163
1164 $ox -= $ev->{xrel};
1165 $oy -= $ev->{yrel};
1166
1167 $self->{vp}->set_offset ($ox, $oy);
1134 } 1168 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1169}
1143 1170
1144sub invoke_mouse_wheel { 1171sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1172 my ($self, $ev) = @_;
1146 1173
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1174 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1175 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1176
1151 1 1177 1
1152} 1178}
1153 1179
1154sub invoke_button_down { 1180sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1156 1182
1157 if ($ev->{button} == 2) { 1183 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1184 $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; 1185 return 1;
1171 } 1186 }
1172 1187
1173 0 1188 0
1174} 1189}
… …
1201 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1202} 1217}
1203 1218
1204############################################################################# 1219#############################################################################
1205 1220
1206package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1207 1222
1208our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1209 1224
1210use CFPlus::OpenGL; 1225use DC::OpenGL;
1211 1226
1212sub new { 1227sub new {
1213 my $class = shift; 1228 my $class = shift;
1214 1229
1215 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1225 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1226 1241
1227 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1230
1231 glBegin GL_QUADS;
1232 glVertex 0 , 0;
1233 glVertex 0 , $h;
1234 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1235 glVertex $w, 0;
1236 glEnd;
1237
1238 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1239 } 1247 }
1240 1248
1241 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1242} 1250}
1243 1251
1244############################################################################# 1252#############################################################################
1245 1253
1246package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1247 1255
1248our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1249 1257
1250use CFPlus::OpenGL; 1258use DC::OpenGL;
1251 1259
1252sub new { 1260sub new {
1253 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1254 1262
1255 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1257 align => 1, 1265 align => 1,
1258 valign => 0, 1266 valign => 0.5,
1259 text => $arg{label}, 1267 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1261 } 1269 }
1262 1270
1263 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1264 # label => "", 1272 # label => "",
1265 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1266 border => 0.8, 1274 border => 0.8,
1267 style => 'single', 1275 style => 'single',
1268 %arg, 1276 %arg,
1269 ); 1277 );
1270 1278
… …
1273 1281
1274sub add { 1282sub add {
1275 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1276 1284
1277 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1279} 1287}
1280 1288
1281sub border { 1289sub border {
1282 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1283} 1291}
… …
1323 my $border = $self->border; 1331 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1325 1333
1326 $child->draw; 1334 $child->draw;
1327 1335
1328 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1329 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1341 } 1349 }
1342} 1350}
1343 1351
1344############################################################################# 1352#############################################################################
1345 1353
1346package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1347 1355
1348our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1349 1357
1350use CFPlus::OpenGL; 1358use DC::OpenGL;
1351 1359
1352my $bg = 1360my $bg =
1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1354 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1355 1363
1356my @border = 1364my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 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); 1366 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359 1367
1360my @icon = 1368my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png); 1370 qw(x1_move.png x1_resize.png);
1363 1371
1364sub new { 1372sub new {
1365 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1366 1374
1367 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1368 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1369 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1370 border => 0.6, 1378 border => 0.8,
1371 can_events => 1, 1379 can_events => 1,
1372 min_w => 64, 1380 min_w => 64,
1373 min_h => 32, 1381 min_h => 32,
1374 %arg, 1382 %arg,
1375 ); 1383 );
1376 1384
1377 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1378 align => 0, 1386 align => 0.5,
1379 valign => 1, 1387 valign => 1,
1380 text => $self->{title}, 1388 text => $self->{title},
1381 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1382 if exists $self->{title}; 1390 if exists $self->{title};
1383 1391
1384 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1385 $self->{close_button} = 1393 $self->{close_button} =
1386 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1387 path => 'x1_close.png', 1395 path => 'x1_close.png',
1388 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1389 1397
1390 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1391 } 1399 }
1392 1400
1393 $self 1401 $self
1394} 1402}
1395 1403
1396sub add { 1404sub add {
1397 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1398 1406
1399 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1400 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1401 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1402} 1410}
1403 1411
1404sub border { 1412sub border {
1405 int $_[0]{border} * $::FONTSIZE 1413 int $_[0]{border} * $::FONTSIZE
1414}
1415
1416sub get_max_wh {
1417 my ($self) = @_;
1418
1419 return ($self->{w}, $self->{h})
1420 if $self->{visible} && $self->{w};
1421
1422 $self->SUPER::get_max_wh
1406} 1423}
1407 1424
1408sub size_request { 1425sub size_request {
1409 my ($self) = @_; 1426 my ($self) = @_;
1410 1427
… …
1535 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1537 1554
1538 my $border = $self->border; 1555 my $border = $self->border;
1539 1556
1557 if ($border) {
1540 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545 1563
1546 # move 1564 # move
1547 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552 1570
1553 # resize 1571 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1559 1578
1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1561 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1562 1581
1563 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1582 if $self->{close_button}; 1601 if $self->{close_button};
1583} 1602}
1584 1603
1585############################################################################# 1604#############################################################################
1586 1605
1587package CFPlus::UI::Table; 1606package DC::UI::Table;
1588 1607
1589our @ISA = CFPlus::UI::Base::; 1608our @ISA = DC::UI::Container::;
1590 1609
1591use List::Util qw(max sum); 1610use List::Util qw(max sum);
1592 1611
1593use CFPlus::OpenGL; 1612use DC::OpenGL;
1594 1613
1595sub new { 1614sub new {
1596 my $class = shift; 1615 my $class = shift;
1597 1616
1598 $class->SUPER::new ( 1617 $class->SUPER::new (
1599 children => [],
1600 col_expand => [], 1618 col_expand => [],
1601 row_expand => [], 1619 row_expand => [],
1602 @_, 1620 @_,
1603 ) 1621 )
1604} 1622}
1605 1623
1606sub children {
1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1608}
1609
1610# TODO: store row/col info in child widget and use standard add/del
1611sub add { 1624sub add {
1612 my $self = shift; 1625 my ($self, @widgets) = @_;
1613 1626
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1627 for my $child (@widgets) {
1615 $self->add_at (@_); 1628 $child->{c_rowspan} ||= 1;
1629 $child->{c_colspan} ||= 1;
1630 }
1631
1632 $self->SUPER::add (@widgets);
1616} 1633}
1617 1634
1618sub add_at { 1635sub add_at {
1619 my $self = shift; 1636 my $self = shift;
1620 1637
1638 my @widgets;
1639
1621 while (@_) { 1640 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1623 1642
1624 $child->set_parent ($self); 1643 $child->{c_row} = $row;
1625 $self->{children}[$row][$col] = $child; 1644 $child->{c_col} = $col;
1626 }
1627 1645
1628 $self->{force_realloc} = 1; 1646 push @widgets, $child;
1629 $self->{force_size_alloc} = 1; 1647 }
1630 $self->realloc;
1631}
1632 1648
1633sub remove { 1649 $self->add (@widgets);
1650}
1651
1652sub get_wh {
1634 my ($self, $child) = @_; 1653 my ($self) = @_;
1635 1654
1636 for (@{ $self->{children} }) { 1655 my (@w, @h);
1637 for (@{ $_ || [] }) { 1656
1638 $_ = undef if $_ == $child; 1657 my @children = $self->children;
1658
1659 # first pass, columns
1660 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1661 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1662
1663 my $sw = sum @w[$c .. $c + $cs - 1];
1664
1665 if ($w > $sw) {
1666 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1639 } 1667 }
1640 } 1668 }
1641}
1642 1669
1643# TODO: move to container class maybe? send children a signal on removal? 1670 # second pass, rows
1644sub clear { 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1645 my ($self) = @_;
1646
1647 my @children = $self->children;
1648 delete $self->{children};
1649
1650 for (@children) {
1651 delete $_->{parent};
1652 $_->hide;
1653 }
1654
1655 $self->realloc;
1656}
1657
1658sub get_wh {
1659 my ($self) = @_;
1660
1661 my (@w, @h);
1662
1663 for my $y (0 .. $#{$self->{children}}) {
1664 my $row = $self->{children}[$y]
1665 or next;
1666
1667 for my $x (0 .. $#$row) {
1668 my $widget = $row->[$x]
1669 or next;
1670 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1671 1673
1672 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1673 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1674 } 1678 }
1675 } 1679 }
1676 1680
1677 (\@w, \@h) 1681 (\@w, \@h)
1678} 1682}
… …
1694 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1695 1699
1696 my $req_w = (sum @$ws) || 1; 1700 my $req_w = (sum @$ws) || 1;
1697 my $req_h = (sum @$hs) || 1; 1701 my $req_h = (sum @$hs) || 1;
1698 1702
1699 # TODO: nicer code 1703 # now linearly scale the rows/columns to the allocated size
1700 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1701 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1702 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1703 1707
1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1705 1709
1706 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1707 1711
1708 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1711 1715
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713 1717
1714 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1715 1719
1716 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1717 1722
1718 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1719 my $row = $self->{children}[$r] 1724 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1720 or next;
1721 1725
1722 my $x = 0; 1726 $widget->configure (
1723 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1724 1729 );
1725 for my $c (0 .. $#$row) {
1726 my $col_w = $ws->[$c];
1727
1728 if (my $widget = $row->[$c]) {
1729 $widget->configure ($x, $y, $col_w, $row_h);
1730 }
1731
1732 $x += $col_w;
1733 }
1734
1735 $y += $row_h;
1736 } 1730 }
1737 1731
1738 1 1732 1
1739} 1733}
1740 1734
1741sub find_widget {
1742 my ($self, $x, $y) = @_;
1743
1744 $x -= $self->{x};
1745 $y -= $self->{y};
1746
1747 my $res;
1748
1749 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1750 $res = $_->find_widget ($x, $y)
1751 and return $res;
1752 }
1753
1754 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 for (grep $_, @{$self->{children}}) {
1761 $_->draw for grep $_, @$_;
1762 }
1763}
1764
1765############################################################################# 1735#############################################################################
1766 1736
1767package CFPlus::UI::Fixed; 1737package DC::UI::Fixed;
1768 1738
1769use List::Util qw(min max); 1739use List::Util qw(min max);
1770 1740
1771our @ISA = CFPlus::UI::Container::; 1741our @ISA = DC::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779 1742
1780sub _scale($$$) { 1743sub _scale($$$) {
1781 my ($mode, $val, $max) = @_; 1744 my ($rel, $val, $max) = @_;
1782 1745
1783 $mode eq "abs" ? $val 1746 $rel ? $val * $max : $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786} 1747}
1787 1748
1788sub size_request { 1749sub size_request {
1789 my ($self) = @_; 1750 my ($self) = @_;
1790 1751
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1752 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792 1753
1793 # determine overall size by querying abs widgets 1754 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) { 1755 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1756 unless ($child->{c_rel}) {
1757 my $x = $child->{c_x};
1758 my $y = $child->{c_y};
1796 1759
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1803 } 1762 }
1804 } 1763 }
1805 1764
1806 my $W = $x2 - $x1; 1765 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1; 1766 my $H = $y2 - $y1;
1808 1767
1809 # now layout remaining widgets 1768 # now layout remaining widgets
1810 for my $child ($self->visible_children) { 1769 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1770 if ($child->{c_rel}) {
1771 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1772 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1812 1773
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1821 } 1776 }
1822 } 1777 }
1823 1778
1824 my $W = $x2 - $x1; 1779 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1; 1780 my $H = $y2 - $y1;
… …
1829 1784
1830sub invoke_size_allocate { 1785sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_; 1786 my ($self, $W, $H) = @_;
1832 1787
1833 for my $child ($self->visible_children) { 1788 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1789 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1790 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1835 1791
1836 $x = _scale $pos, $x, $W; 1792 $x += $child->{c_halign} * $child->{req_w};
1837 $y = _scale $pos, $x, $H; 1793 $y += $child->{c_valign} * $child->{req_h};
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840 1794
1841 $child->configure ($x, $y, $w, $h); 1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1842 } 1796 }
1843 1797
1844 1 1798 1
1845} 1799}
1846 1800
1847############################################################################# 1801#############################################################################
1848 1802
1849package CFPlus::UI::Box; 1803package DC::UI::Box;
1850 1804
1851our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1852 1806
1853sub size_request { 1807sub size_request {
1854 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1855 1811
1856 $self->{vertical} 1812 $self->{vertical}
1857 ? ( 1813 ? (
1858 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1859 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1860 ) 1816 )
1861 : ( 1817 : (
1862 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1863 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1864 ) 1820 )
1865} 1821}
1866 1822
1867sub invoke_size_allocate { 1823sub invoke_size_allocate {
1868 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1889 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1890 for 0 .. $#children; 1846 for 0 .. $#children;
1891 } 1847 }
1892 } 1848 }
1893 1849
1894 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1895 1851
1896 my $pos = 0; 1852 my $pos = 0;
1897 for (0 .. $#children) { 1853 for (0 .. $#children) {
1898 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1899 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1855 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1904 1 1860 1
1905} 1861}
1906 1862
1907############################################################################# 1863#############################################################################
1908 1864
1909package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1910 1866
1911our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1912 1868
1913sub new { 1869sub new {
1914 my $class = shift; 1870 my $class = shift;
1915 1871
1916 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1919 ) 1875 )
1920} 1876}
1921 1877
1922############################################################################# 1878#############################################################################
1923 1879
1924package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1925 1881
1926our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1927 1883
1928sub new { 1884sub new {
1929 my $class = shift; 1885 my $class = shift;
1930 1886
1931 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1934 ) 1890 )
1935} 1891}
1936 1892
1937############################################################################# 1893#############################################################################
1938 1894
1939package CFPlus::UI::Label; 1895package DC::UI::Label;
1940 1896
1941our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1942 1898
1943use CFPlus::OpenGL; 1899use DC::OpenGL;
1944 1900
1945sub new { 1901sub new {
1946 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1947 1903
1948 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1953 #text => initial text 1909 #text => initial text
1954 #markup => initial narkup 1910 #markup => initial narkup
1955 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1956 #style => 0, # render flags 1912 #style => 0, # render flags
1957 ellipsise => 3, # end 1913 ellipsise => 3, # end
1958 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1959 fontsize => 1, 1915 fontsize => 1,
1960 align => -1, 1916 align => 0.5,
1961 valign => -1, 1917 valign => 0.5,
1962 padding_x => 2, 1918 padding_x => 4,
1963 padding_y => 2, 1919 padding_y => 2,
1964 can_events => 0, 1920 can_events => 0,
1965 %arg 1921 %arg
1966 ); 1922 );
1967 1923
1968 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1969 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1970 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1971 $self->{template} = $layout; 1927 $self->{template} = $layout;
1972 } 1928 }
1973 1929
1974 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1992 1948
1993 delete $self->{ox}; 1949 delete $self->{ox};
1994 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1995} 1951}
1996 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1997sub set_text { 1959sub set_text {
1998 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1999 1961
2000 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
2001 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
… …
2024 1986
2025sub size_request { 1987sub size_request {
2026 my ($self) = @_; 1988 my ($self) = @_;
2027 1989
2028 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
2029 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
2030 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
2031 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
2032 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2033 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2034 1998
2035 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
2036 2000
2037 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
2038 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
2039 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
2040 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2041 2005
2042 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
2043 2007
2044 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
2100 2064
2101 [$self->{layout}->size] 2065 [$self->{layout}->size]
2102 }; 2066 };
2103 2067
2104 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
2105 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2069 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2106 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2070 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2107 : ($self->{w} - $size->[0]) * 0.5);
2108 2071
2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2111 : ($self->{h} - $size->[1]) * 0.5);
2112 }; 2073 };
2113 2074
2114 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2075# unless ($self->{list}) {
2115 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2076# $self->{list} = DC::OpenGL::glGenList;
2116 2077# DC::OpenGL::glNewList $self->{list};
2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2079# DC::OpenGL::glEndList;
2080# }
2081#
2082# DC::OpenGL::glCallList $self->{list};
2083
2084 $self->{layout}->draw;
2118} 2085}
2086
2087#sub destroy {
2088# my ($self) = @_;
2089#
2090# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2091#
2092# $self->SUPER::destroy;
2093#}
2119 2094
2120############################################################################# 2095#############################################################################
2121 2096
2122package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
2123 2098
2124our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
2125 2100
2126use CFPlus::OpenGL; 2101use DC::OpenGL;
2127 2102
2128sub new { 2103sub new {
2129 my $class = shift; 2104 my $class = shift;
2130 2105
2131 $class->SUPER::new ( 2106 $class->SUPER::new (
2132 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2133 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
2134 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
2135 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
2136 can_hover => 1, 2113 can_hover => 1,
2137 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
2138 valign => 0, 2116 valign => 0.5,
2139 can_events => 1, 2117 can_events => 1,
2140 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
2141 #text => ... 2121 #text => ...
2142 #hidden => "*", 2122 #hidden => "*",
2143 @_ 2123 @_
2144 ) 2124 )
2145} 2125}
… …
2192 2172
2193 my $text = $self->get_text; 2173 my $text = $self->get_text;
2194 2174
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2196 2176
2197 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2199 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2200 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2201 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2202 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2203 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2204 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2205 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2206 # what a hack 2186 # what a hack
2207 $self->{cursor} = 2187 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1 2189 ? length $1
2210 : 0; 2190 : 0;
2211 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2212 # uh, again 2192 # uh, again
2213 $self->{cursor} = 2193 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2215 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2216 : length $self->{text}; 2196 : length $self->{text};
… …
2280 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2281 } 2261 }
2282 2262
2283 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2284 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2285 glBegin GL_QUADS;
2286 glVertex 0 , 0;
2287 glVertex 0 , $self->{h};
2288 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2289 glVertex $self->{w}, 0;
2290 glEnd;
2291 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2292 2267
2293 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2294 2269
2295 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
2297 2272
2298 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
2299 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
2300 utf8::encode $text; 2275 utf8::encode $text;
2301 2276
2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2277 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2303 } 2278 }
2304 2279
2280 glColor_premultiply @{$self->{active_fg}};
2305 glBegin GL_LINES; 2281 glBegin GL_LINES;
2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2308 glEnd; 2284 glEnd;
2285
2286 glLineWidth 3;
2287 glColor @{$self->{active_outline}};
2288 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2289 glLineWidth 1;
2290
2291 } else {
2292 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2293 glBegin GL_LINE_STRIP;
2294 glVertex .5, $self->{h} * .5;
2295 glVertex .5, $self->{h} - 2.5;
2296 glVertex $self->{w} - .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} * .5;
2298 glEnd;
2309 } 2299 }
2310} 2300}
2311 2301
2312############################################################################# 2302#############################################################################
2313 2303
2314package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2315 2305
2316our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2317 2307
2318use CFPlus::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2319 2319
2320sub invoke_key_down { 2320sub invoke_key_down {
2321 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2322 2322
2323 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2329 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2330 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2331 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2332 $self->update; 2332 $self->update;
2333 2333
2334 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2335 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2336 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2337 } 2337 }
2338 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2339 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2341 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2342 } 2342 }
2343 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2344 } 2344 }
2345 2345
2346 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2347 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2349 2349
2350 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2351 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2352 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2353 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2354 } 2357 }
2355 2358
2356 } else { 2359 } else {
2357 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2358 } 2361 }
… …
2360 1 2363 1
2361} 2364}
2362 2365
2363############################################################################# 2366#############################################################################
2364 2367
2365package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2366 2369
2367our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2368 2371
2369use CFPlus::OpenGL; 2372use DC::OpenGL;
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 padding_y => 4,
2379
2380 @_
2381 )
2382}
2370 2383
2371sub move_cursor_ver { 2384sub move_cursor_ver {
2372 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2373 2386
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375 2388
2376 $y += $dy; 2389 $line += $dy;
2377 2390
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2391 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2379 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2380 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2381 $self->update; 2394 $self->update;
2382 return; 2395 return;
2383 } 2396 }
… …
2386sub invoke_key_down { 2399sub invoke_key_down {
2387 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2388 2401
2389 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2390 2403
2391 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2392 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2395 } else { 2408 } else {
2396 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2397 } 2410 }
2398 2411
2399 1 2412 1
2400} 2413}
2401 2414
2402############################################################################# 2415#############################################################################
2403 2416
2404package CFPlus::UI::Button; 2417package DC::UI::ButtonBin;
2405 2418
2406our @ISA = CFPlus::UI::Label::; 2419our @ISA = DC::UI::Bin::;
2407 2420
2408use CFPlus::OpenGL; 2421use DC::OpenGL;
2409 2422
2410my @tex = 2423my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2413 2426
2414sub new { 2427sub new {
2415 my $class = shift; 2428 my $class = shift;
2416 2429
2417 $class->SUPER::new ( 2430 $class->SUPER::new (
2431 can_hover => 1,
2432 align => 0.5,
2433 valign => 0.5,
2434 can_events => 1,
2435 @_
2436 )
2437}
2438
2439sub invoke_button_up {
2440 my ($self, $ev, $x, $y) = @_;
2441
2442 $self->emit ("activate")
2443 if $x >= 0 && $x < $self->{w}
2444 && $y >= 0 && $y < $self->{h};
2445
2446 1
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 glEnable GL_TEXTURE_2D;
2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2454 glColor 0, 0, 0, 1;
2455
2456 my $tex = $tex[$GRAB == $self];
2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2458
2459 glDisable GL_TEXTURE_2D;
2460
2461 $self->SUPER::_draw;
2462}
2463
2464#############################################################################
2465
2466package DC::UI::Button;
2467
2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
2471
2472my @tex =
2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2474 qw(b1_button_inactive.png b1_button_active.png);
2475
2476sub new {
2477 my $class = shift;
2478
2479 $class->SUPER::new (
2418 padding_x => 4, 2480 padding_x => 8,
2419 padding_y => 4, 2481 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0], 2482 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8], 2483 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1, 2484 can_hover => 1,
2423 align => 0, 2485 align => 0.5,
2424 valign => 0, 2486 valign => 0.5,
2425 can_events => 1, 2487 can_events => 1,
2426 @_ 2488 @_
2427 ) 2489 )
2428} 2490}
2429 2491
… …
2454 $self->SUPER::_draw; 2516 $self->SUPER::_draw;
2455} 2517}
2456 2518
2457############################################################################# 2519#############################################################################
2458 2520
2459package CFPlus::UI::CheckBox; 2521package DC::UI::CheckBox;
2460 2522
2461our @ISA = CFPlus::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2462 2524
2463my @tex = 2525my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2465 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2466 2528
2467use CFPlus::OpenGL; 2529use DC::OpenGL;
2468 2530
2469sub new { 2531sub new {
2470 my $class = shift; 2532 my $class = shift;
2471 2533
2472 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2473 padding_x => 2, 2536 padding_x => 2,
2474 padding_y => 2, 2537 padding_y => 2,
2475 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2476 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2477 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2483} 2546}
2484 2547
2485sub size_request { 2548sub size_request {
2486 my ($self) = @_; 2549 my ($self) = @_;
2487 2550
2488 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2489} 2552}
2490 2553
2491sub toggle { 2554sub toggle {
2492 my ($self) = @_; 2555 my ($self) = @_;
2493 2556
… …
2512sub _draw { 2575sub _draw {
2513 my ($self) = @_; 2576 my ($self) = @_;
2514 2577
2515 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2516 2579
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2518 2581
2519 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2520 2583
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2584 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522 2585
… …
2529 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2530} 2593}
2531 2594
2532############################################################################# 2595#############################################################################
2533 2596
2534package CFPlus::UI::Image; 2597package DC::UI::Image;
2535 2598
2536our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::Base::;
2537 2600
2538use CFPlus::OpenGL; 2601use DC::OpenGL;
2539 2602
2540our %texture_cache; 2603our %texture_cache;
2541 2604
2542sub new { 2605sub new {
2543 my $class = shift; 2606 my $class = shift;
2544 2607
2545 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2546 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2547 @_, 2611 @_,
2548 ); 2612 );
2549 2613
2550 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2552 2616
2553 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2555 2619
2556 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2557 2621
2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2559 2623
2560 $self 2624 $self
2561} 2625}
2562 2626
2563sub STORABLE_freeze { 2627sub STORABLE_freeze {
2564 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2565 2629
2566 $self->{path} 2630 $self->{path}
2567 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2568 2632
2569 $self->{path} 2633 $self->{path}
2570} 2634}
2571 2635
2572sub STORABLE_attach { 2636sub STORABLE_attach {
… …
2576} 2640}
2577 2641
2578sub size_request { 2642sub size_request {
2579 my ($self) = @_; 2643 my ($self) = @_;
2580 2644
2581 ($self->{tex}{w}, $self->{tex}{h}) 2645 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2582} 2646}
2583 2647
2584sub _draw { 2648sub _draw {
2585 my ($self) = @_; 2649 my ($self) = @_;
2586 2650
… …
2596 } 2660 }
2597 2661
2598 glEnable GL_TEXTURE_2D; 2662 glEnable GL_TEXTURE_2D;
2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2600 2664
2601 $tex->draw_quad (0, 0, $w, $h); 2665 $tex->draw_quad_alpha (0, 0, $w, $h);
2602 2666
2603 glDisable GL_TEXTURE_2D; 2667 glDisable GL_TEXTURE_2D;
2604} 2668}
2605 2669
2606############################################################################# 2670#############################################################################
2607 2671
2608package CFPlus::UI::ImageButton; 2672package DC::UI::ImageButton;
2609 2673
2610our @ISA = CFPlus::UI::Image::; 2674our @ISA = DC::UI::Image::;
2611 2675
2612use CFPlus::OpenGL; 2676use DC::OpenGL;
2613 2677
2614my %textures; 2678my %textures;
2615 2679
2616sub new { 2680sub new {
2617 my $class = shift; 2681 my $class = shift;
… …
2620 padding_x => 4, 2684 padding_x => 4,
2621 padding_y => 4, 2685 padding_y => 4,
2622 fg => [1, 1, 1], 2686 fg => [1, 1, 1],
2623 active_fg => [0, 0, 1], 2687 active_fg => [0, 0, 1],
2624 can_hover => 1, 2688 can_hover => 1,
2625 align => 0, 2689 align => 0.5,
2626 valign => 0, 2690 valign => 0.5,
2627 can_events => 1, 2691 can_events => 1,
2628 @_ 2692 @_
2629 ); 2693 );
2630} 2694}
2631 2695
2696sub invoke_button_down {
2697 my ($self, $ev, $x, $y) = @_;
2698
2699 1
2700}
2701
2632sub invoke_button_up { 2702sub invoke_button_up {
2633 my ($self, $ev, $x, $y) = @_; 2703 my ($self, $ev, $x, $y) = @_;
2634 2704
2635 $self->emit ("activate") 2705 $self->emit ("activate")
2636 if $x >= 0 && $x < $self->{w} 2706 if $x >= 0 && $x < $self->{w}
… …
2639 1 2709 1
2640} 2710}
2641 2711
2642############################################################################# 2712#############################################################################
2643 2713
2644package CFPlus::UI::VGauge; 2714package DC::UI::VGauge;
2645 2715
2646our @ISA = CFPlus::UI::Base::; 2716our @ISA = DC::UI::Base::;
2647 2717
2648use List::Util qw(min max); 2718use List::Util qw(min max);
2649 2719
2650use CFPlus::OpenGL; 2720use DC::OpenGL;
2651 2721
2652my %tex = ( 2722my %tex = (
2653 food => [ 2723 food => [
2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2655 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2725 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2656 ], 2726 ],
2657 grace => [ 2727 grace => [
2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2728 map { new_from_resource DC::Texture $_, mipmap => 1 }
2659 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2729 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2660 ], 2730 ],
2661 hp => [ 2731 hp => [
2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2663 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2733 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2664 ], 2734 ],
2665 mana => [ 2735 mana => [
2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2667 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2737 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2668 ], 2738 ],
2669); 2739);
2670 2740
2671# eg. VGauge->new (gauge => 'food'), default gauge: food 2741# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2774 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2775} 2845}
2776 2846
2777############################################################################# 2847#############################################################################
2778 2848
2849package DC::UI::Progress;
2850
2851our @ISA = DC::UI::Label::;
2852
2853use DC::OpenGL;
2854
2855sub new {
2856 my ($class, %arg) = @_;
2857
2858 my $self = $class->SUPER::new (
2859 padding_x => 2,
2860 padding_y => 2,
2861 fg => [1, 1, 1],
2862 bg => [0, 0, 1, 0.2],
2863 bar => [0.7, 0.5, 0.1, 0.8],
2864 outline => [0.4, 0.3, 0],
2865 fontsize => 0.9,
2866 valign => 0.5,
2867 align => 0.5,
2868 can_events => 1,
2869 ellipsise => 1,
2870 label => "%d%%",
2871 %arg,
2872 );
2873
2874 $self->set_value ($arg{value} || -1);
2875
2876 $self
2877}
2878
2879sub set_label {
2880 my ($self, $label) = @_;
2881
2882 return if $self->{label} eq $label;
2883 $self->{label} = $label;
2884
2885 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2886}
2887
2888sub set_value {
2889 my ($self, $value) = @_;
2890
2891 if ($self->{value} ne $value) {
2892 $self->{value} = $value;
2893
2894 if ($value < 0) {
2895 $self->set_text ("-");
2896 } else {
2897 $self->set_text (sprintf $self->{label}, $value * 100);
2898 }
2899
2900 $self->update;
2901 }
2902}
2903
2904sub _draw {
2905 my ($self) = @_;
2906
2907 glEnable GL_BLEND;
2908 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2909
2910 my $px = $self->{padding_x};
2911 my $py = $self->{padding_y};
2912
2913 if ($self->{value} >= 0) {
2914 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2915
2916 glColor_premultiply @{$self->{bar}};
2917 glRect $px, $py, $s, $self->{h} - $py;
2918 glColor_premultiply @{$self->{bg}};
2919 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2920 }
2921
2922 glColor_premultiply @{$self->{outline}};
2923
2924 $px -= .5;
2925 $py -= .5;
2926
2927 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2928
2929 glDisable GL_BLEND;
2930
2931 {
2932 local $self->{bg}; # do not draw background
2933 $self->SUPER::_draw;
2934 }
2935}
2936
2937#############################################################################
2938
2939package DC::UI::ExperienceProgress;
2940
2941our @ISA = DC::UI::Progress::;
2942
2943sub new {
2944 my ($class, %arg) = @_;
2945
2946 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2947
2948 my $self = $class->SUPER::new (
2949 %arg,
2950 tooltip => sub {
2951 my ($self) = @_;
2952
2953 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2954 $tt,
2955 $self->{lvl},
2956 ::formsep ($self->{exp}),
2957 ::formsep ($self->{nxt}),
2958 ::formsep ($self->{nxt} - $self->{exp}),
2959 $self->_percent * 100,
2960 },
2961 );
2962
2963 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2964 if $::CONN;
2965
2966 $self
2967}
2968
2969sub DESTROY {
2970 my ($self) = @_;
2971
2972 delete $::CONN->{on_exp_update}{$self+0}
2973 if $::CONN;
2974
2975 $self->SUPER::DESTROY;
2976}
2977
2978sub _percent {
2979 my ($self) = @_;
2980
2981 my $table = $::CONN && $::CONN->{exp_table}
2982 or return -1;
2983
2984 my $l0 = $table->[$self->{lvl} - 1];
2985 my $l1 = $table->[$self->{lvl}];
2986
2987 $self->{nxt} = $l1;
2988
2989 ($self->{exp} - $l0) / ($l1 - $l0)
2990}
2991
2992sub set_value {
2993 my ($self, $lvl, $exp) = @_;
2994
2995 $self->{lvl} = $lvl;
2996 $self->{exp} = $exp;
2997
2998 $self->SUPER::set_value ($self->_percent);
2999}
3000
3001#############################################################################
3002
2779package CFPlus::UI::Gauge; 3003package DC::UI::Gauge;
2780 3004
2781our @ISA = CFPlus::UI::VBox::; 3005our @ISA = DC::UI::VBox::;
2782 3006
2783sub new { 3007sub new {
2784 my ($class, %arg) = @_; 3008 my ($class, %arg) = @_;
2785 3009
2786 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
… …
2788 can_hover => 1, 3012 can_hover => 1,
2789 can_events => 1, 3013 can_events => 1,
2790 %arg, 3014 %arg,
2791 ); 3015 );
2792 3016
2793 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3017 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2794 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3018 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2795 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3019 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2796 3020
2797 $self 3021 $self
2798} 3022}
2799 3023
2800sub set_fontsize { 3024sub set_fontsize {
… …
2821 $self->{value}->set_text ($val); 3045 $self->{value}->set_text ($val);
2822} 3046}
2823 3047
2824############################################################################# 3048#############################################################################
2825 3049
2826package CFPlus::UI::Slider; 3050package DC::UI::Slider;
2827 3051
2828use strict; 3052use strict;
2829 3053
2830use CFPlus::OpenGL; 3054use DC::OpenGL;
2831 3055
2832our @ISA = CFPlus::UI::DrawBG::; 3056our @ISA = DC::UI::DrawBG::;
2833 3057
2834my @tex = 3058my @tex =
2835 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3059 map { new_from_resource DC::Texture $_ }
2836 qw(s1_slider.png s1_slider_bg.png); 3060 qw(s1_slider.png s1_slider_bg.png);
2837 3061
2838sub new { 3062sub new {
2839 my $class = shift; 3063 my $class = shift;
2840 3064
… …
2877sub set_value { 3101sub set_value {
2878 my ($self, $value) = @_; 3102 my ($self, $value) = @_;
2879 3103
2880 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3104 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2881 3105
2882 $hi = $lo + 1 if $hi <= $lo; 3106 $hi = $lo if $hi < $lo;
2883 3107
2884 $page = $hi - $lo if $page > $hi - $lo; 3108 $value = $hi - $page if $value > $hi - $page;
2885
2886 $value = $lo if $value < $lo; 3109 $value = $lo if $value < $lo;
2887 $value = $hi - $page if $value > $hi - $page;
2888 3110
2889 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3111 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2890 if $unit; 3112 if $unit;
2891 3113
2892 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3114 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2908 3130
2909 $self->SUPER::invoke_button_down ($ev, $x, $y); 3131 $self->SUPER::invoke_button_down ($ev, $x, $y);
2910 3132
2911 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3133 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2912 3134
2913 $self->invoke_mouse_motion ($ev, $x, $y) 3135 $self->invoke_mouse_motion ($ev, $x, $y);
3136
3137 1
2914} 3138}
2915 3139
2916sub invoke_mouse_motion { 3140sub invoke_mouse_motion {
2917 my ($self, $ev, $x, $y) = @_; 3141 my ($self, $ev, $x, $y) = @_;
2918 3142
… …
2934sub invoke_mouse_wheel { 3158sub invoke_mouse_wheel {
2935 my ($self, $ev) = @_; 3159 my ($self, $ev) = @_;
2936 3160
2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3161 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2938 3162
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3163 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2940 3164
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3165 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942 3166
2943 ! ! $delta 3167 1
2944} 3168}
2945 3169
2946sub update { 3170sub update {
2947 my ($self) = @_; 3171 my ($self) = @_;
2948 3172
… …
2954 my ($self) = @_; 3178 my ($self) = @_;
2955 3179
2956 unless ($self->{knob_w}) { 3180 unless ($self->{knob_w}) {
2957 $self->set_value ($self->{range}[0]); 3181 $self->set_value ($self->{range}[0]);
2958 3182
2959 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3183 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2960 my $range = ($hi - $page - $lo) || 1e-100; 3184 my $range = ($hi - $page - $lo) || 1e-10;
2961 3185
2962 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3186 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2963 3187
2964 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3188 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2965 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3189 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2966 3190
2967 $value = ($value - $lo) / $range; 3191 $value = ($value - $lo) / $range;
… …
2997 glDisable GL_TEXTURE_2D; 3221 glDisable GL_TEXTURE_2D;
2998} 3222}
2999 3223
3000############################################################################# 3224#############################################################################
3001 3225
3002package CFPlus::UI::ValSlider; 3226package DC::UI::ValSlider;
3003 3227
3004our @ISA = CFPlus::UI::HBox::; 3228our @ISA = DC::UI::HBox::;
3005 3229
3006sub new { 3230sub new {
3007 my ($class, %arg) = @_; 3231 my ($class, %arg) = @_;
3008 3232
3009 my $range = delete $arg{range}; 3233 my $range = delete $arg{range};
3010 3234
3011 my $self = $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
3012 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3236 slider => (new DC::UI::Slider expand => 1, range => $range),
3013 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3237 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3014 to_value => sub { shift }, 3238 to_value => sub { shift },
3015 from_value => sub { shift }, 3239 from_value => sub { shift },
3016 %arg, 3240 %arg,
3017 ); 3241 );
3018 3242
… …
3038sub set_range { shift->{slider}->set_range (@_) } 3262sub set_range { shift->{slider}->set_range (@_) }
3039sub set_value { shift->{slider}->set_value (@_) } 3263sub set_value { shift->{slider}->set_value (@_) }
3040 3264
3041############################################################################# 3265#############################################################################
3042 3266
3043package CFPlus::UI::TextScroller; 3267package DC::UI::TextScroller;
3044 3268
3045our @ISA = CFPlus::UI::HBox::; 3269our @ISA = DC::UI::HBox::;
3046 3270
3047use CFPlus::OpenGL; 3271use DC::OpenGL;
3048 3272
3049sub new { 3273sub new {
3050 my $class = shift; 3274 my $class = shift;
3051 3275
3052 my $self = $class->SUPER::new ( 3276 my $self = $class->SUPER::new (
… …
3054 can_events => 1, 3278 can_events => 1,
3055 indent => 0, 3279 indent => 0,
3056 #font => default_font 3280 #font => default_font
3057 @_, 3281 @_,
3058 3282
3059 layout => (new CFPlus::Layout), 3283 layout => (new DC::Layout),
3060 par => [], 3284 par => [],
3061 max_par => 0, 3285 max_par => 0,
3062 height => 0, 3286 height => 0,
3063 children => [ 3287 children => [
3064 (new CFPlus::UI::Empty expand => 1), 3288 (new DC::UI::Empty expand => 1),
3065 (new CFPlus::UI::Slider vertical => 1), 3289 (new DC::UI::Slider vertical => 1),
3066 ], 3290 ],
3067 ); 3291 );
3068 3292
3069 $self->{children}[1]->connect (changed => sub { $self->update }); 3293 $self->{children}[1]->connect (changed => sub { $self->update });
3070 3294
… …
3079} 3303}
3080 3304
3081sub size_request { 3305sub size_request {
3082 my ($self) = @_; 3306 my ($self) = @_;
3083 3307
3084 my ($empty, $slider) = @{ $self->{children} }; 3308 my ($empty, $slider) = $self->visible_children;
3085 3309
3086 local $self->{children} = [$empty, $slider]; 3310 local $self->{children} = [$empty, $slider];
3087 $self->SUPER::size_request 3311 $self->SUPER::size_request
3088} 3312}
3089 3313
… …
3126 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3350 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3127 $layout->set_markup ($para->{markup}); 3351 $layout->set_markup ($para->{markup});
3128 3352
3129 $layout->set_shapes ( 3353 $layout->set_shapes (
3130 map 3354 map
3131 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3355 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3132 @{$para->{widget}} 3356 @{$para->{widget}}
3133 ); 3357 );
3134 3358
3135 $layout 3359 $layout
3136} 3360}
… …
3253 $ROOT->on_post_alloc ($self => sub { 3477 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate; 3478 $self->force_uptodate;
3255 3479
3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3480 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3257 3481
3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3482 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3259 glClearColor 0, 0, 0, 0; 3483 glClearColor 0, 0, 0, 0;
3260 glClear GL_COLOR_BUFFER_BIT; 3484 glClear GL_COLOR_BUFFER_BIT;
3261 3485
3262 package CFPlus::UI::Base; 3486 package DC::UI::Base;
3263 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3487 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3264 (0, 0, $self->{w}, $self->{h}); 3488 (0, 0, $self->{w}, $self->{h});
3265 3489
3266 my $top = int $self->{children}[1]{range}[0]; 3490 my $top = int $self->{children}[1]{range}[0];
3267 3491
… …
3278 3502
3279 if ($y0 < $y + $h && $y < $y1) { 3503 if ($y0 < $y + $h && $y < $y1) {
3280 my $layout = $self->get_layout ($para); 3504 my $layout = $self->get_layout ($para);
3281 3505
3282 $layout->render ($para->{indent}, $y - $y0); 3506 $layout->render ($para->{indent}, $y - $y0);
3507 $layout->draw;
3283 3508
3284 if (my @w = @{ $para->{widget} }) { 3509 if (my @w = @{ $para->{widget} }) {
3285 my @s = $layout->get_shapes; 3510 my @s = $layout->get_shapes;
3286 3511
3287 for (@w) { 3512 for (@w) {
… …
3325 $self->{children}[1]->draw; 3550 $self->{children}[1]->draw;
3326} 3551}
3327 3552
3328############################################################################# 3553#############################################################################
3329 3554
3330package CFPlus::UI::Animator; 3555package DC::UI::Animator;
3331 3556
3332use CFPlus::OpenGL; 3557use DC::OpenGL;
3333 3558
3334our @ISA = CFPlus::UI::Bin::; 3559our @ISA = DC::UI::Bin::;
3335 3560
3336sub moveto { 3561sub moveto {
3337 my ($self, $x, $y) = @_; 3562 my ($self, $x, $y) = @_;
3338 3563
3339 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3564 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3367 glPopMatrix; 3592 glPopMatrix;
3368} 3593}
3369 3594
3370############################################################################# 3595#############################################################################
3371 3596
3372package CFPlus::UI::Flopper; 3597package DC::UI::Flopper;
3373 3598
3374our @ISA = CFPlus::UI::Button::; 3599our @ISA = DC::UI::Button::;
3375 3600
3376sub new { 3601sub new {
3377 my $class = shift; 3602 my $class = shift;
3378 3603
3379 my $self = $class->SUPER::new ( 3604 my $self = $class->SUPER::new (
… …
3391 $self->{other}->toggle_visibility; 3616 $self->{other}->toggle_visibility;
3392} 3617}
3393 3618
3394############################################################################# 3619#############################################################################
3395 3620
3396package CFPlus::UI::Tooltip; 3621package DC::UI::Tooltip;
3397 3622
3398our @ISA = CFPlus::UI::Bin::; 3623our @ISA = DC::UI::Bin::;
3399 3624
3400use CFPlus::OpenGL; 3625use DC::OpenGL;
3401 3626
3402sub new { 3627sub new {
3403 my $class = shift; 3628 my $class = shift;
3404 3629
3405 $class->SUPER::new ( 3630 $class->SUPER::new (
… …
3409} 3634}
3410 3635
3411sub set_tooltip_from { 3636sub set_tooltip_from {
3412 my ($self, $widget) = @_; 3637 my ($self, $widget) = @_;
3413 3638
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
3416
3417 my $tooltip = $widget->{tooltip}; 3639 my $tip = $widget->{tooltip};
3640 $tip = $tip->($widget) if "CODE" eq ref $tip;
3641
3642 $tip = DC::Pod::section_label tooltip => $1
3643 if $tip =~ /^#(.*)$/;
3418 3644
3419 if ($ENV{CFPLUS_DEBUG} & 2) { 3645 if ($ENV{CFPLUS_DEBUG} & 2) {
3420 $tooltip .= "\n\n" . (ref $widget) . "\n" 3646 $tip .= "\n\n" . (ref $widget) . "\n"
3421 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3647 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3422 . "req $widget->{req_w} $widget->{req_h}\n" 3648 . "req $widget->{req_w} $widget->{req_h}\n"
3423 . "visible $widget->{visible}"; 3649 . "visible $widget->{visible}";
3424 } 3650 }
3425 3651
3426 $tooltip =~ s/^\n+//; 3652 $tip =~ s/^\n+//;
3427 $tooltip =~ s/\n+$//; 3653 $tip =~ s/\n+$//;
3428 3654
3429 $self->add (new CFPlus::UI::Label 3655 $self->add (new DC::UI::Label
3656 fg => $DC::THEME{tooltip_fg},
3430 markup => $tooltip, 3657 markup => $tip,
3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3658 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3659 align => 0,
3432 fontsize => 0.8, 3660 fontsize => 0.8,
3433 style => 1, # FLAG_INVERSE 3661 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3434 ellipsise => 0, 3662 ellipsise => 0,
3435 font => ($widget->{tooltip_font} || $::FONT_PROP), 3663 font => ($widget->{tooltip_font} || $::FONT_PROP),
3436 ); 3664 );
3437} 3665}
3438 3666
… …
3473} 3701}
3474 3702
3475sub _draw { 3703sub _draw {
3476 my ($self) = @_; 3704 my ($self) = @_;
3477 3705
3478 glTranslate 0.375, 0.375;
3479
3480 my ($w, $h) = @$self{qw(w h)}; 3706 my ($w, $h) = @$self{qw(w h)};
3481 3707
3482 glColor 1, 0.8, 0.4; 3708 glColor @{ $DC::THEME{tooltip_bg} };
3483 glBegin GL_QUADS; 3709 glRect 0, 0, $w, $h;
3484 glVertex 0 , 0;
3485 glVertex 0 , $h;
3486 glVertex $w, $h;
3487 glVertex $w, 0;
3488 glEnd;
3489 3710
3490 glColor 0, 0, 0; 3711 glColor @{ $DC::THEME{tooltip_border} };
3491 glBegin GL_LINE_LOOP; 3712 glRect_lineloop .5, .5, $w + .5, $h + .5;
3492 glVertex 0 , 0;
3493 glVertex 0 , $h;
3494 glVertex $w, $h;
3495 glVertex $w, 0;
3496 glEnd;
3497 3713
3498 glTranslate 2 - 0.375, 2 - 0.375; 3714 glTranslate 2, 2;
3499 3715
3500 $self->SUPER::_draw; 3716 $self->SUPER::_draw;
3501} 3717}
3502 3718
3503############################################################################# 3719#############################################################################
3504 3720
3505package CFPlus::UI::Face; 3721package DC::UI::Face;
3506 3722
3507our @ISA = CFPlus::UI::DrawBG::; 3723our @ISA = DC::UI::DrawBG::;
3508 3724
3509use CFPlus::OpenGL; 3725use DC::OpenGL;
3510 3726
3511sub new { 3727sub new {
3512 my $class = shift; 3728 my $class = shift;
3513 3729
3514 my $self = $class->SUPER::new ( 3730 my $self = $class->SUPER::new (
… …
3517 aspect => 1, 3733 aspect => 1,
3518 can_events => 0, 3734 can_events => 0,
3519 @_, 3735 @_,
3520 ); 3736 );
3521 3737
3522 if ($self->{anim} && $self->{animspeed}) {
3523 CFPlus::weaken (my $widget = $self);
3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3527 $self->{timer} = Event->timer (
3528 parked => 1,
3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
3532 ++$widget->{frame};
3533 $widget->update_face;
3534 $widget->update;
3535
3536 $widget->update_timer;
3537 },
3538 );
3539
3540 $self->update_face;
3541 $self->update_timer; 3738 $self->update_anim;
3542 }
3543 3739
3544 $self 3740 $self
3545} 3741}
3546 3742
3547sub update_timer { 3743sub update_timer {
3548 my ($self) = @_; 3744 my ($self) = @_;
3549 3745
3550 return unless $self->{timer}; 3746 return unless $self->{timer};
3551 3747
3552 if ($self->{visible}) { 3748 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start; 3749 $self->{timer}->start;
3559 } else { 3750 } else {
3560 $self->{timer}->stop; 3751 $self->{timer}->stop;
3561 } 3752 }
3562} 3753}
3563 3754
3564sub update_face { 3755sub update_face {
3565 my ($self) = @_; 3756 my ($self) = @_;
3566 3757
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3577sub size_request {
3578 my ($self) = @_;
3579
3580 if ($::CONN) { 3758 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3759 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) { 3760 if ($anim && @$anim) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3761 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3584 } else { 3762 delete $self->{face_change_cb};
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3763
3586 $self->realloc; 3764 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3765 unless ($tex->{name} || $tex->{loading}) {
3766 $tex->upload (sub { $self->reconfigure });
3767 }
3587 }); 3768 }
3588 } 3769 }
3589 } 3770 }
3590 } 3771 }
3772}
3773
3774sub update_anim {
3775 my ($self) = @_;
3776
3777 if ($self->{anim} && $self->{animspeed}) {
3778 DC::weaken (my $widget = $self);
3779
3780 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3781 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3782 return unless $::CONN;
3783
3784 my $w = $widget
3785 or return;
3786
3787 ++$w->{frame};
3788 $w->update_face;
3789
3790 # somehow, $widget can go away
3791 $w->update;
3792 $w->update_timer;
3793 };
3794
3795 $self->update_face;
3796 $self->update_timer;
3797 } else {
3798 delete $self->{timer};
3799 }
3800}
3801
3802sub size_request {
3803 my ($self) = @_;
3804
3805 if ($::CONN) {
3806 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3807 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3808 if ($tex->{name}) {
3809 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3810 } elsif (!$tex->{loading}) {
3811 $tex->upload (sub { $self->reconfigure });
3812 }
3813 }
3814
3815 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3816 }
3817 }
3591 3818
3592 ($self->{size_w} || 8, $self->{size_h} || 8) 3819 ($self->{size_w} || 8, $self->{size_h} || 8)
3593} 3820}
3594 3821
3595sub update { 3822sub update {
… …
3598 return unless $self->{visible}; 3825 return unless $self->{visible};
3599 3826
3600 $self->SUPER::update; 3827 $self->SUPER::update;
3601} 3828}
3602 3829
3830sub set_face {
3831 my ($self, $face) = @_;
3832
3833 $self->{face} = $face;
3834 $self->reconfigure;
3835}
3836
3837sub set_anim {
3838 my ($self, $anim) = @_;
3839
3840 $self->{anim} = $anim;
3841 $self->update_anim;
3842}
3843
3844sub set_animspeed {
3845 my ($self, $animspeed) = @_;
3846
3847 $self->{animspeed} = $animspeed;
3848 $self->update_anim;
3849}
3850
3603sub invoke_visibility_change { 3851sub invoke_visibility_change {
3604 my ($self) = @_; 3852 my ($self) = @_;
3605 3853
3606 $self->update_timer; 3854 $self->update_timer;
3607 3855
… …
3609} 3857}
3610 3858
3611sub _draw { 3859sub _draw {
3612 my ($self) = @_; 3860 my ($self) = @_;
3613 3861
3614 return unless $::CONN;
3615
3616 $self->SUPER::_draw; 3862 $self->SUPER::_draw;
3617 3863
3618 my $faceid = $::CONN->{faceid}[$self->{face}] 3864 if (my $tex = $self->{tex}) {
3619 or return;
3620
3621 my $tex = $::CONN->{texture}[$faceid];
3622
3623 if ($tex) {
3624 glEnable GL_TEXTURE_2D; 3865 glEnable GL_TEXTURE_2D;
3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3626 glColor 0, 0, 0, 1; 3867 glColor 0, 0, 0, 1;
3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3868 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3628 glDisable GL_TEXTURE_2D; 3869 glDisable GL_TEXTURE_2D;
… …
3638 $self->SUPER::destroy; 3879 $self->SUPER::destroy;
3639} 3880}
3640 3881
3641############################################################################# 3882#############################################################################
3642 3883
3643package CFPlus::UI::Buttonbar; 3884package DC::UI::Buttonbar;
3644 3885
3645our @ISA = CFPlus::UI::HBox::; 3886our @ISA = DC::UI::HBox::;
3646 3887
3647# TODO: should actually wrap buttons and other goodies. 3888# TODO: should actually wrap buttons and other goodies.
3648 3889
3649############################################################################# 3890#############################################################################
3650 3891
3651package CFPlus::UI::Menu; 3892package DC::UI::Menu;
3652 3893
3653our @ISA = CFPlus::UI::Toplevel::; 3894our @ISA = DC::UI::Toplevel::;
3654 3895
3655use CFPlus::OpenGL; 3896use DC::OpenGL;
3656 3897
3657sub new { 3898sub new {
3658 my $class = shift; 3899 my $class = shift;
3659 3900
3660 my $self = $class->SUPER::new ( 3901 my $self = $class->SUPER::new (
3661 items => [], 3902 items => [],
3662 z => 100, 3903 z => 100,
3663 @_, 3904 @_,
3664 ); 3905 );
3665 3906
3666 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3907 $self->add ($self->{vbox} = new DC::UI::VBox);
3667 3908
3668 for my $item (@{ $self->{items} }) { 3909 for my $item (@{ $self->{items} }) {
3669 my ($widget, $cb, $tooltip) = @$item; 3910 my ($widget, $cb, $tooltip) = @$item;
3670 3911
3671 # handle various types of items, only text for now 3912 # handle various types of items, only text for now
3672 if (!ref $widget) { 3913 if (!ref $widget) {
3673 if ($widget =~ /\t/) { 3914 if ($widget =~ /\t/) {
3674 my ($left, $right) = split /\t/, $widget, 2; 3915 my ($left, $right) = split /\t/, $widget, 2;
3675 3916
3676 $widget = new CFPlus::UI::HBox 3917 $widget = new DC::UI::HBox
3677 can_hover => 1, 3918 can_hover => 1,
3678 can_events => 1, 3919 can_events => 1,
3679 tooltip => $tooltip, 3920 tooltip => $tooltip,
3680 children => [ 3921 children => [
3681 (new CFPlus::UI::Label markup => $left, expand => 1), 3922 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3682 (new CFPlus::UI::Label markup => $right, align => +1), 3923 (new DC::UI::Label markup => $right, align => 1),
3683 ], 3924 ],
3684 ; 3925 ;
3685 3926
3686 } else { 3927 } else {
3687 $widget = new CFPlus::UI::Label 3928 $widget = new DC::UI::Label
3688 can_hover => 1, 3929 can_hover => 1,
3689 can_events => 1, 3930 can_events => 1,
3931 align => 0,
3690 markup => $widget, 3932 markup => $widget,
3691 tooltip => $tooltip; 3933 tooltip => $tooltip;
3692 } 3934 }
3693 } 3935 }
3694 3936
… …
3709 # maybe save $GRAB? must be careful about events... 3951 # maybe save $GRAB? must be careful about events...
3710 $GRAB = $self; 3952 $GRAB = $self;
3711 $self->{button} = $ev->{button}; 3953 $self->{button} = $ev->{button};
3712 3954
3713 $self->show; 3955 $self->show;
3714 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3956
3957 my $x = $ev->{x};
3958 my $y = $ev->{y};
3959
3960 $self->{root}->on_post_alloc ($self => sub {
3961 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3962 });
3963
3964 1 # so it can be used inside event handlers
3715} 3965}
3716 3966
3717sub invoke_mouse_motion { 3967sub invoke_mouse_motion {
3718 my ($self, $ev, $x, $y) = @_; 3968 my ($self, $ev, $x, $y) = @_;
3719 3969
… …
3740 1 3990 1
3741} 3991}
3742 3992
3743############################################################################# 3993#############################################################################
3744 3994
3745package CFPlus::UI::Multiplexer; 3995package DC::UI::Multiplexer;
3746 3996
3747our @ISA = CFPlus::UI::Container::; 3997our @ISA = DC::UI::Container::;
3748 3998
3749sub new { 3999sub new {
3750 my $class = shift; 4000 my $class = shift;
3751 4001
3752 my $self = $class->SUPER::new ( 4002 my $self = $class->SUPER::new (
3753 @_, 4003 @_,
3754 ); 4004 );
3755 4005
3756 $self->{current} = $self->{children}[0] 4006 $self->set_current_page (0);
3757 if @{ $self->{children} };
3758 4007
3759 $self 4008 $self
3760} 4009}
3761 4010
3762sub add { 4011sub add {
3763 my ($self, @widgets) = @_; 4012 my ($self, @widgets) = @_;
3764 4013
3765 $self->SUPER::add (@widgets); 4014 $self->SUPER::add (@widgets);
3766 4015
3767 $self->{current} = $self->{children}[0] 4016 $self->set_current_page (0)
3768 if @{ $self->{children} }; 4017 if @widgets == @{ $self->{children} };
3769} 4018}
3770 4019
3771sub get_current_page { 4020sub get_current_page {
3772 my ($self) = @_; 4021 my ($self) = @_;
3773 4022
… …
3779 4028
3780 my $widget = ref $page_or_widget 4029 my $widget = ref $page_or_widget
3781 ? $page_or_widget 4030 ? $page_or_widget
3782 : $self->{children}[$page_or_widget]; 4031 : $self->{children}[$page_or_widget];
3783 4032
4033 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4034
3784 $self->{current} = $widget; 4035 if (($self->{current} = $widget)) {
4036 $self->{current}->set_visible if $self->{current} && $self->{visible};
3785 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4037 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3786 4038
3787 $self->emit (page_changed => $self->{current}); 4039 $self->emit (page_changed => $self->{current});
4040 }
3788 4041
3789 $self->realloc; 4042 $self->realloc;
3790} 4043}
3791 4044
3792sub visible_children { 4045sub visible_children {
3793 $_[0]{current} 4046 $_[0]{current} || ()
3794} 4047}
3795 4048
3796sub size_request { 4049sub size_request {
3797 my ($self) = @_; 4050 my ($self) = @_;
3798 4051
4052 $self->{current}
3799 $self->{current}->size_request 4053 ? $self->{current}->size_request
4054 : (0, 0)
3800} 4055}
3801 4056
3802sub invoke_size_allocate { 4057sub invoke_size_allocate {
3803 my ($self, $w, $h) = @_; 4058 my ($self, $w, $h) = @_;
3804 4059
3805 $self->{current}->configure (0, 0, $w, $h); 4060 $self->{current}->configure (0, 0, $w, $h)
4061 if $self->{current};
3806 4062
3807 1 4063 1
3808} 4064}
3809 4065
3810sub _draw { 4066sub _draw {
3811 my ($self) = @_; 4067 my ($self) = @_;
3812 4068
3813 $self->{current}->draw; 4069 $self->{current}->draw
4070 if $self->{current};
3814} 4071}
3815 4072
3816############################################################################# 4073#############################################################################
3817 4074
3818package CFPlus::UI::Notebook; 4075package DC::UI::Notebook;
3819 4076
4077use DC::OpenGL;
4078
3820our @ISA = CFPlus::UI::VBox::; 4079our @ISA = DC::UI::VBox::;
3821 4080
3822sub new { 4081sub new {
3823 my $class = shift; 4082 my $class = shift;
3824 4083
3825 my $self = $class->SUPER::new ( 4084 my $self = $class->SUPER::new (
3826 buttonbar => (new CFPlus::UI::Buttonbar), 4085 buttonbar => (new DC::UI::Buttonbar),
3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4086 multiplexer => (new DC::UI::Multiplexer expand => 1),
4087 active_outline => [.7, .7, 0.2],
3828 # filter => # will be put between multiplexer and $self 4088 # filter => # will be put between multiplexer and $self
3829 @_, 4089 @_,
3830 ); 4090 );
3831 4091
3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4092 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3833 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4093 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3834 4094
4095 {
4096 Scalar::Util::weaken (my $wself = $self);
4097
4098 $self->{multiplexer}->connect (c_add => sub {
4099 my ($mplex, $widgets) = @_;
4100
4101 for my $child (@$widgets) {
4102 Scalar::Util::weaken $child;
4103 $child->{c_tab_} ||= do {
4104 my $tab =
4105 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4106 ? $child->{c_tab}
4107 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4108
4109 $tab->connect (activate => sub {
4110 $wself->set_current_page ($child);
4111 });
4112
4113 $tab
4114 };
4115
4116 $self->{buttonbar}->add ($child->{c_tab_});
4117 }
4118 });
4119
4120 $self->{multiplexer}->connect (c_remove => sub {
4121 my ($mplex, $widgets) = @_;
4122
4123 for my $child (@$widgets) {
4124 $wself->{buttonbar}->remove ($child->{c_tab_});
4125 }
4126 });
4127 }
4128
3835 $self 4129 $self
3836} 4130}
3837 4131
3838sub add { 4132sub add {
4133 my ($self, @widgets) = @_;
4134
4135 $self->{multiplexer}->add (@widgets)
4136}
4137
4138sub remove {
4139 my ($self, @widgets) = @_;
4140
4141 $self->{multiplexer}->remove (@widgets)
4142}
4143
4144sub pages {
4145 my ($self) = @_;
4146 $self->{multiplexer}->children
4147}
4148
4149sub page_index {
4150 my ($self, $widget) = @_;
4151
4152 my $i = 0;
4153 for ($self->pages) {
4154 if ($_ eq $widget) { return $i };
4155 $i++;
4156 }
4157
4158 undef
4159}
4160
4161sub add_tab {
3839 my ($self, $title, $widget, $tooltip) = @_; 4162 my ($self, $title, $widget, $tooltip) = @_;
3840 4163
3841 CFPlus::weaken $self; 4164 $title = [$title, $tooltip] unless ref $title;
4165 $widget->{c_tab} = $title;
3842 4166
3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3844 markup => $title,
3845 tooltip => $tooltip,
3846 on_activate => sub { $self->set_current_page ($widget) },
3847 );
3848
3849 $self->{multiplexer}->add ($widget); 4167 $self->add ($widget);
3850} 4168}
3851 4169
3852sub get_current_page { 4170sub get_current_page {
3853 my ($self) = @_; 4171 my ($self) = @_;
3854 4172
… …
3860 4178
3861 $self->{multiplexer}->set_current_page ($page); 4179 $self->{multiplexer}->set_current_page ($page);
3862 $self->emit (page_changed => $self->{multiplexer}{current}); 4180 $self->emit (page_changed => $self->{multiplexer}{current});
3863} 4181}
3864 4182
4183sub _draw {
4184 my ($self) = @_;
4185
4186 $self->SUPER::_draw ();
4187
4188 if (my $cur = $self->{multiplexer}{current}) {
4189 if ($cur = $cur->{c_tab_}) {
4190 glTranslate $self->{buttonbar}{x} + $cur->{x},
4191 $self->{buttonbar}{y} + $cur->{y};
4192 glLineWidth 3;
4193 #glEnable GL_BLEND;
4194 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4195 glColor @{$self->{active_outline}};
4196 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4197 glLineWidth 1;
4198 #glDisable GL_BLEND;
4199 }
4200 }
4201}
4202
3865############################################################################# 4203#############################################################################
3866 4204
3867package CFPlus::UI::Selector; 4205package DC::UI::Selector;
3868 4206
3869use utf8; 4207use utf8;
3870 4208
3871our @ISA = CFPlus::UI::Button::; 4209our @ISA = DC::UI::Button::;
3872 4210
3873sub new { 4211sub new {
3874 my $class = shift; 4212 my $class = shift;
3875 4213
3876 my $self = $class->SUPER::new ( 4214 my $self = $class->SUPER::new (
… …
3893 my ($value, $title, $tooltip) = @$_; 4231 my ($value, $title, $tooltip) = @$_;
3894 4232
3895 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4233 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3896 } 4234 }
3897 4235
3898 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4236 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3899} 4237}
3900 4238
3901sub _set_value { 4239sub _set_value {
3902 my ($self, $value) = @_; 4240 my ($self, $value) = @_;
3903 4241
3904 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4242 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4243 $item ||= $self->{options}[0]
3905 or return; 4244 or return;
3906 4245
3907 $self->{value} = $item->[0]; 4246 $self->{value} = $item->[0];
3908 $self->set_markup ("$item->[1] ⇓"); 4247 $self->set_markup ("$item->[1] ⇓");
3909 $self->set_tooltip ($item->[2]); 4248# $self->set_tooltip ($item->[2]);
3910} 4249}
3911 4250
3912sub set_value { 4251sub set_value {
3913 my ($self, $value) = @_; 4252 my ($self, $value) = @_;
3914 4253
… …
3916 4255
3917 $self->_set_value ($value); 4256 $self->_set_value ($value);
3918 $self->emit (changed => $value); 4257 $self->emit (changed => $value);
3919} 4258}
3920 4259
4260sub set_options {
4261 my ($self, $options) = @_;
4262
4263 $self->{options} = $options;
4264 $self->_set_value ($self->{value});
4265}
4266
3921############################################################################# 4267#############################################################################
3922 4268
3923package CFPlus::UI::Statusbox; 4269package DC::UI::Statusbox;
3924 4270
3925our @ISA = CFPlus::UI::VBox::; 4271our @ISA = DC::UI::VBox::;
3926 4272
3927sub new { 4273sub new {
3928 my $class = shift; 4274 my $class = shift;
3929 4275
3930 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
3931 fontsize => 0.8, 4277 fontsize => 0.8,
3932 @_, 4278 @_,
3933 ); 4279 );
3934 4280
3935 CFPlus::weaken (my $this = $self); 4281 DC::weaken (my $this = $self);
3936 4282
3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4283 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3938 4284
3939 $self 4285 $self
3940} 4286}
3941 4287
3942sub reorder { 4288sub reorder {
3943 my ($self) = @_; 4289 my ($self) = @_;
3944 my $NOW = Time::HiRes::time; 4290 my $NOW = EV::time;
3945 4291
3946 # freeze display when hovering over any label 4292 # freeze display when hovering over any label
3947 return if $CFPlus::UI::TOOLTIP->{owner} 4293 return if $DC::UI::TOOLTIP->{owner}
3948 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4294 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3949 values %{ $self->{item} }; 4295 values %{ $self->{item} };
3950 4296
3951 while (my ($k, $v) = each %{ $self->{item} }) { 4297 while (my ($k, $v) = each %{ $self->{item} }) {
3952 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4298 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3953 } 4299 }
4300
4301 $self->{timer}->set (1, 1);
3954 4302
3955 my @widgets; 4303 my @widgets;
3956 4304
3957 my @items = sort { 4305 my @items = sort {
3958 $a->{pri} <=> $b->{pri} 4306 $a->{pri} <=> $b->{pri}
3959 or $b->{id} <=> $a->{id} 4307 or $b->{id} <=> $a->{id}
3960 } values %{ $self->{item} }; 4308 } values %{ $self->{item} };
3961
3962 $self->{timer}->interval (1);
3963 4309
3964 my $count = 10 + 1; 4310 my $count = 10 + 1;
3965 for my $item (@items) { 4311 for my $item (@items) {
3966 last unless --$count; 4312 last unless --$count;
3967 4313
… …
3974 for ($short) { 4320 for ($short) {
3975 s/^\s+//; 4321 s/^\s+//;
3976 s/\s+/ /g; 4322 s/\s+/ /g;
3977 } 4323 }
3978 4324
3979 new CFPlus::UI::Label 4325 new DC::UI::Label
3980 markup => $short, 4326 markup => $short,
3981 tooltip => $item->{tooltip}, 4327 tooltip => $item->{tooltip},
3982 tooltip_font => $::FONT_PROP, 4328 tooltip_font => $::FONT_PROP,
3983 tooltip_width => 0.67, 4329 tooltip_width => 0.67,
3984 fontsize => $item->{fontsize} || $self->{fontsize}, 4330 fontsize => $item->{fontsize} || $self->{fontsize},
3985 max_w => $::WIDTH * 0.44, 4331 max_w => $::WIDTH * 0.44,
4332 align => 0,
3986 fg => [@{ $item->{fg} }], 4333 fg => [@{ $item->{fg} }],
3987 can_events => 1, 4334 can_events => 1,
3988 can_hover => 1 4335 can_hover => 1
3989 }; 4336 };
3990 4337
3991 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4338 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3992 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4339 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3993 $label->update; 4340 $label->update;
3994 $label->set_max_size (undef, $label->{req_h} * $diff) 4341 $label->set_max_size (undef, $label->{req_h} * $diff)
3995 if $diff < 1; 4342 if $diff < 1;
3996 $self->{timer}->interval (1/30); 4343 $self->{timer}->set (1/30, 1/30);
3997 } else { 4344 } else {
3998 $label->{fg}[3] = $item->{fg}[3] || 1; 4345 $label->{fg}[3] = $item->{fg}[3] || 1;
3999 } 4346 }
4000 4347
4001 push @widgets, $label; 4348 push @widgets, $label;
4002 } 4349 }
4350
4351 my $hash = join ",", @widgets;
4352 return if $hash eq $self->{last_widget_hash};
4353 $self->{last_widget_hash} = $hash;
4003 4354
4004 $self->clear; 4355 $self->clear;
4005 $self->SUPER::add (reverse @widgets); 4356 $self->SUPER::add (reverse @widgets);
4006} 4357}
4007 4358
… …
4063 $self->SUPER::destroy; 4414 $self->SUPER::destroy;
4064} 4415}
4065 4416
4066############################################################################# 4417#############################################################################
4067 4418
4068package CFPlus::UI::Root; 4419package DC::UI::Root;
4069 4420
4070our @ISA = CFPlus::UI::Container::; 4421our @ISA = DC::UI::Container::;
4071 4422
4072use List::Util qw(min max); 4423use List::Util qw(min max);
4073 4424
4074use CFPlus::OpenGL; 4425use DC::OpenGL;
4075 4426
4076sub new { 4427sub new {
4077 my $class = shift; 4428 my $class = shift;
4078 4429
4079 my $self = $class->SUPER::new ( 4430 my $self = $class->SUPER::new (
4080 visible => 1, 4431 visible => 1,
4081 @_, 4432 @_,
4082 ); 4433 );
4083 4434
4084 CFPlus::weaken ($self->{root} = $self); 4435 DC::weaken ($self->{root} = $self);
4085 4436
4086 $self 4437 $self
4087} 4438}
4088 4439
4089sub size_request { 4440sub size_request {
… …
4137} 4488}
4138 4489
4139sub update { 4490sub update {
4140 my ($self) = @_; 4491 my ($self) = @_;
4141 4492
4142 $::WANT_REFRESH++; 4493 $::WANT_REFRESH = 1;
4143} 4494}
4144 4495
4145sub add { 4496sub add {
4146 my ($self, @children) = @_; 4497 my ($self, @children) = @_;
4147 4498
… …
4184 while ($self->{refresh_hook}) { 4535 while ($self->{refresh_hook}) {
4185 $_->() 4536 $_->()
4186 for values %{delete $self->{refresh_hook}}; 4537 for values %{delete $self->{refresh_hook}};
4187 } 4538 }
4188 4539
4189 if ($self->{realloc}) { 4540 while ($self->{realloc}) {
4190 my %queue; 4541 my %queue;
4191 my @queue; 4542 my @queue;
4192 my $widget; 4543 my $widget;
4193 4544
4194 outer: 4545 outer:
… …
4214 4565
4215 delete $queue{$widget+0}; 4566 delete $queue{$widget+0};
4216 4567
4217 my ($w, $h) = $widget->size_request; 4568 my ($w, $h) = $widget->size_request;
4218 4569
4219 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4570 $w += $widget->{padding_x} * 2;
4220 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4571 $h += $widget->{padding_y} * 2;
4572
4573 $w = max $widget->{min_w}, $w;
4574 $h = max $widget->{min_h}, $h;
4221 4575
4222 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4576 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4223 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4577 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4224 4578
4225 $w = $widget->{force_w} if exists $widget->{force_w}; 4579 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4241 } 4595 }
4242 } 4596 }
4243 4597
4244 delete $self->{realloc}{$widget+0}; 4598 delete $self->{realloc}{$widget+0};
4245 } 4599 }
4246 }
4247 4600
4248 while (my $size_alloc = delete $self->{size_alloc}) { 4601 while (my $size_alloc = delete $self->{size_alloc}) {
4249 my @queue = sort { $b->{visible} <=> $a->{visible} } 4602 my @queue = sort { $a->{visible} <=> $b->{visible} }
4250 values %$size_alloc; 4603 values %$size_alloc;
4251 4604
4252 while () { 4605 while () {
4253 my $widget = pop @queue || last; 4606 my $widget = pop @queue || last;
4254 4607
4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4608 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4256 4609
4257 $w = 0 if $w < 0;
4258 $h = 0 if $h < 0;
4259
4260 $w = max $widget->{min_w}, $w; 4610 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h; 4611 $h = max $widget->{min_h}, $h;
4262 4612
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4613# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4614# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265 4615
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4616 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4617 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268 4618
4269 $w = int $w + 0.5; 4619 $w = int $w + 0.5;
4270 $h = int $h + 0.5; 4620 $h = int $h + 0.5;
4271 4621
4272 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4622 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4273 $widget->{old_w} = $widget->{w}; 4623 $widget->{old_w} = $widget->{w};
4274 $widget->{old_h} = $widget->{h}; 4624 $widget->{old_h} = $widget->{h};
4275 4625
4276 $widget->{w} = $w; 4626 $widget->{w} = $w;
4277 $widget->{h} = $h; 4627 $widget->{h} = $h;
4278 4628
4279 $widget->emit (size_allocate => $w, $h); 4629 $widget->emit (size_allocate => $w, $h);
4630 }
4280 } 4631 }
4281 } 4632 }
4282 } 4633 }
4283 4634
4284 while ($self->{post_alloc_hook}) { 4635 while ($self->{post_alloc_hook}) {
… …
4295 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4646 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4296 glMatrixMode GL_MODELVIEW; 4647 glMatrixMode GL_MODELVIEW;
4297 glLoadIdentity; 4648 glLoadIdentity;
4298 4649
4299 { 4650 {
4300 package CFPlus::UI::Base; 4651 package DC::UI::Base;
4301 4652
4302 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4653 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4303 (0, 0, $self->{w}, $self->{h}); 4654 (0, 0, $self->{w}, $self->{h});
4304 4655
4305 $self->_draw; 4656 $self->_draw;
4306 } 4657 }
4307} 4658}
4308 4659
4309############################################################################# 4660#############################################################################
4310 4661
4311package CFPlus::UI; 4662package DC::UI;
4312 4663
4313$ROOT = new CFPlus::UI::Root; 4664$ROOT = new DC::UI::Root;
4314$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4665$TOOLTIP = new DC::UI::Tooltip z => 900;
4315 4666
43161 46671
4317

Diff Legend

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