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.375 by root, Mon Jul 16 20:12:19 2007 UTC vs.
Revision 1.478 by root, Tue Dec 22 00:35:44 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
693 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
694 : $self->{bg}; 673 : $self->{bg};
695 674
696 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
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 {
… …
986} 965}
987 966
988sub set_offset { 967sub set_offset {
989 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
990 969
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 970 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 971 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 972
973 if ($x != $self->{view_x} or $y != $self->{view_y}) {
974 $self->{view_x} = $x;
975 $self->{view_y} = $y;
976
977 $self->emit (changed => $x, $y);
994 $self->update; 978 $self->update;
979 }
980}
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 }
995} 998}
996 999
997# 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
998sub coord2local { 1001sub coord2local {
999 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
1014 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1015 1018
1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1018 ) { 1021 ) {
1019 $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})
1020 } else { 1023 } else {
1021 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1022 } 1025 }
1023} 1026}
1024 1027
1025sub _render { 1028sub _render {
1026 my ($self) = @_; 1029 my ($self) = @_;
1027 1030
1028 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};
1029 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};
1030 1033
1031 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1032 1035
1033 $self->SUPER::_render; 1036 $self->SUPER::_render;
1034} 1037}
1035 1038
1036############################################################################# 1039#############################################################################
1037 1040
1038package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1039 1042
1040our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1041 1044
1042sub new { 1045sub new {
1043 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1044 1047
1045 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1046 1049
1047 my $self; 1050 my $self;
1048 1051
1049 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1053 c_col => 0,
1054 c_row => 1,
1050 vertical => 0, 1055 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub { 1057 on_changed => sub {
1053 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 }, 1060 },
1056 ; 1061 ;
1057 1062
1058 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1064 c_col => 1,
1065 c_row => 0,
1059 vertical => 1, 1066 vertical => 1,
1060 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1061 on_changed => sub { 1068 on_changed => sub {
1062 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1073 col_expand => [1, 0], 1080 col_expand => [1, 0],
1074 row_expand => [1, 0], 1081 row_expand => [1, 0],
1075 %arg, 1082 %arg,
1076 ); 1083 );
1077 1084
1078 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new DC::UI::ViewPort
1086 c_col => 0,
1087 c_row => 0,
1079 expand => 1, 1088 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1082 ; 1104 ;
1083 1105
1084 $self->SUPER::add (0, 0, $self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1085 1107
1086 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1087 1109
1088 $self 1110 $self
1089} 1111}
1090
1091#TODO# update range on size_allocate depending on child
1092 1112
1093sub add { 1113sub add {
1094 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1095 1115
1096 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1097} 1117}
1098 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
1099sub update_slider { 1123sub update_slider {
1100 my ($self) = @_; 1124 my ($self) = @_;
1101 1125
1102 my $child = ($self->{vp} or return)->child; 1126 my $child = ($self->{vp} or return)->child;
1103 1127
1128 if ($self->{scroll_x}) {
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1129 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1105 $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]);
1106 1131
1107 my $visible = $w1 > $w2; 1132 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1133 if ($visible != $self->{hslider_visible}) {
1134 $self->{hslider_visible} = $visible;
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1135 $visible ? $self->SUPER::add ($self->{hslider})
1110 : $self->{hslider}->hide; 1136 : $self->SUPER::remove ($self->{hslider});
1137 }
1111 } 1138 }
1112 1139
1140 if ($self->{scroll_y}) {
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1141 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1114 $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]);
1115 1143
1116 my $visible = $h1 > $h2; 1144 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1145 if ($visible != $self->{vslider_visible}) {
1146 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1147 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $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);
1120 } 1168 };
1121}
1122
1123sub update {
1124 my ($self) = @_;
1125
1126 $self->SUPER::update;
1127 $self->update_slider;
1128} 1169}
1129 1170
1130sub invoke_mouse_wheel { 1171sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1172 my ($self, $ev) = @_;
1132 1173
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $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};
1136 1176
1137 1 1177 1
1138} 1178}
1139 1179
1140sub invoke_button_down { 1180sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1142 1182
1143 if ($ev->{button} == 2) { 1183 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1184 $self->start_dragging ($ev);
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1148
1149 $self->{vp}->set_offset (
1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1154
1155 return 1; 1185 return 1;
1156 } 1186 }
1157 1187
1158 0 1188 0
1159} 1189}
… …
1186 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1187} 1217}
1188 1218
1189############################################################################# 1219#############################################################################
1190 1220
1191package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1192 1222
1193our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1194 1224
1195use CFPlus::OpenGL; 1225use DC::OpenGL;
1196 1226
1197sub new { 1227sub new {
1198 my $class = shift; 1228 my $class = shift;
1199 1229
1200 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1210 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1211 1241
1212 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1213 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1214 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1215
1216 glBegin GL_QUADS;
1217 glVertex 0 , 0;
1218 glVertex 0 , $h;
1219 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1220 glVertex $w, 0;
1221 glEnd;
1222
1223 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1224 } 1247 }
1225 1248
1226 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1227} 1250}
1228 1251
1229############################################################################# 1252#############################################################################
1230 1253
1231package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1232 1255
1233our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1234 1257
1235use CFPlus::OpenGL; 1258use DC::OpenGL;
1236 1259
1237sub new { 1260sub new {
1238 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1239 1262
1240 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1242 align => 1, 1265 align => 1,
1243 valign => 0, 1266 valign => 0.5,
1244 text => $arg{label}, 1267 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1246 } 1269 }
1247 1270
1248 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1249 # label => "", 1272 # label => "",
1250 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1251 border => 0.8, 1274 border => 0.8,
1252 style => 'single', 1275 style => 'single',
1253 %arg, 1276 %arg,
1254 ); 1277 );
1255 1278
… …
1258 1281
1259sub add { 1282sub add {
1260 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1261 1284
1262 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1264} 1287}
1265 1288
1266sub border { 1289sub border {
1267 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1268} 1291}
… …
1308 my $border = $self->border; 1331 my $border = $self->border;
1309 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1310 1333
1311 $child->draw; 1334 $child->draw;
1312 1335
1313 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1314 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1315 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1317 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;
1318 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;
… …
1326 } 1349 }
1327} 1350}
1328 1351
1329############################################################################# 1352#############################################################################
1330 1353
1331package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1332 1355
1333our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1334 1357
1335use CFPlus::OpenGL; 1358use DC::OpenGL;
1336 1359
1337my $bg = 1360my $bg =
1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1339 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1340 1363
1341my @border = 1364my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1343 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);
1367
1368my @icon =
1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1370 qw(x1_move.png x1_resize.png);
1344 1371
1345sub new { 1372sub new {
1346 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1347 1374
1348 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1349 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1350 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1351 border => 0.6, 1378 border => 0.8,
1352 can_events => 1, 1379 can_events => 1,
1353 min_w => 64, 1380 min_w => 64,
1354 min_h => 32, 1381 min_h => 32,
1355 %arg, 1382 %arg,
1356 ); 1383 );
1357 1384
1358 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1359 align => 0, 1386 align => 0.5,
1360 valign => 1, 1387 valign => 1,
1361 text => $self->{title}, 1388 text => $self->{title},
1362 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1363 if exists $self->{title}; 1390 if exists $self->{title};
1364 1391
1365 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1366 $self->{close_button} = 1393 $self->{close_button} =
1367 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1368 path => 'x1_close.png', 1395 path => 'x1_close.png',
1369 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1370 1397
1371 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1372 } 1399 }
1373 1400
1374 $self 1401 $self
1375} 1402}
1376 1403
1377sub add { 1404sub add {
1378 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1379 1406
1380 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1381 $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};
1382 $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};
1383} 1410}
1384 1411
1385sub border { 1412sub border {
1386 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
1387} 1423}
1388 1424
1389sub size_request { 1425sub size_request {
1390 my ($self) = @_; 1426 my ($self) = @_;
1391 1427
… …
1516 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1554
1519 my $border = $self->border; 1555 my $border = $self->border;
1520 1556
1557 if ($border) {
1521 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1563
1564 # move
1565 my $w2 = ($w - $border) * .5;
1566 my $h2 = ($h - $border) * .5;
1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1570
1571 # resize
1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1574 unless $self->{has_close_button};
1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1526 1578
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1529 1581
1530 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1549 if $self->{close_button}; 1601 if $self->{close_button};
1550} 1602}
1551 1603
1552############################################################################# 1604#############################################################################
1553 1605
1554package CFPlus::UI::Table; 1606package DC::UI::Table;
1555 1607
1556our @ISA = CFPlus::UI::Base::; 1608our @ISA = DC::UI::Container::;
1557 1609
1558use List::Util qw(max sum); 1610use List::Util qw(max sum);
1559 1611
1560use CFPlus::OpenGL; 1612use DC::OpenGL;
1561 1613
1562sub new { 1614sub new {
1563 my $class = shift; 1615 my $class = shift;
1564 1616
1565 $class->SUPER::new ( 1617 $class->SUPER::new (
1566 children => [],
1567 col_expand => [], 1618 col_expand => [],
1568 row_expand => [], 1619 row_expand => [],
1569 @_, 1620 @_,
1570 ) 1621 )
1571} 1622}
1572 1623
1573sub children {
1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1575}
1576
1577# TODO: store row/col info in child widget and use standard add/del
1578sub add { 1624sub add {
1625 my ($self, @widgets) = @_;
1626
1627 for my $child (@widgets) {
1628 $child->{c_rowspan} ||= 1;
1629 $child->{c_colspan} ||= 1;
1630 }
1631
1632 $self->SUPER::add (@widgets);
1633}
1634
1635sub add_at {
1579 my ($self) = shift; 1636 my $self = shift;
1637
1638 my @widgets;
1580 1639
1581 while (@_) { 1640 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1583 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child;
1585 }
1586 1642
1587 $self->{force_realloc} = 1; 1643 $child->{c_row} = $row;
1588 $self->{force_size_alloc} = 1; 1644 $child->{c_col} = $col;
1589 $self->realloc;
1590}
1591 1645
1592sub remove { 1646 push @widgets, $child;
1647 }
1648
1649 $self->add (@widgets);
1650}
1651
1652sub get_wh {
1593 my ($self, $child) = @_; 1653 my ($self) = @_;
1594 1654
1595 for (@{ $self->{children} }) { 1655 my (@w, @h);
1596 for (@{ $_ || [] }) { 1656
1597 $_ = 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];
1598 } 1667 }
1599 } 1668 }
1600}
1601 1669
1602# TODO: move to container class maybe? send children a signal on removal? 1670 # second pass, rows
1603sub clear { 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1604 my ($self) = @_;
1605
1606 my @children = $self->children;
1607 delete $self->{children};
1608
1609 for (@children) {
1610 delete $_->{parent};
1611 $_->hide;
1612 }
1613
1614 $self->realloc;
1615}
1616
1617sub get_wh {
1618 my ($self) = @_;
1619
1620 my (@w, @h);
1621
1622 for my $y (0 .. $#{$self->{children}}) {
1623 my $row = $self->{children}[$y]
1624 or next;
1625
1626 for my $x (0 .. $#$row) {
1627 my $widget = $row->[$x]
1628 or next;
1629 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1630 1673
1631 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1632 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1633 } 1678 }
1634 } 1679 }
1635 1680
1636 (\@w, \@h) 1681 (\@w, \@h)
1637} 1682}
… …
1653 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1654 1699
1655 my $req_w = (sum @$ws) || 1; 1700 my $req_w = (sum @$ws) || 1;
1656 my $req_h = (sum @$hs) || 1; 1701 my $req_h = (sum @$hs) || 1;
1657 1702
1658 # TODO: nicer code 1703 # now linearly scale the rows/columns to the allocated size
1659 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1660 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1661 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1662 1707
1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1664 1709
1665 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1666 1711
1667 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1668 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1669 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1670 1715
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672 1717
1673 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1674 1719
1675 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1676 1722
1677 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1678 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)};
1679 or next;
1680 1725
1681 my $x = 0; 1726 $widget->configure (
1682 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1683 1729 );
1684 for my $c (0 .. $#$row) {
1685 my $col_w = $ws->[$c];
1686
1687 if (my $widget = $row->[$c]) {
1688 $widget->configure ($x, $y, $col_w, $row_h);
1689 }
1690
1691 $x += $col_w;
1692 }
1693
1694 $y += $row_h;
1695 } 1730 }
1696 1731
1697 1 1732 1
1698} 1733}
1699 1734
1700sub find_widget {
1701 my ($self, $x, $y) = @_;
1702
1703 $x -= $self->{x};
1704 $y -= $self->{y};
1705
1706 my $res;
1707
1708 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1709 $res = $_->find_widget ($x, $y)
1710 and return $res;
1711 }
1712
1713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1714}
1715
1716sub _draw {
1717 my ($self) = @_;
1718
1719 for (grep $_, @{$self->{children}}) {
1720 $_->draw for grep $_, @$_;
1721 }
1722}
1723
1724############################################################################# 1735#############################################################################
1725 1736
1726package CFPlus::UI::Fixed; 1737package DC::UI::Fixed;
1727 1738
1728use List::Util qw(min max); 1739use List::Util qw(min max);
1729 1740
1730our @ISA = CFPlus::UI::Container::; 1741our @ISA = DC::UI::Container::;
1731
1732sub add {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child);
1737}
1738 1742
1739sub _scale($$$) { 1743sub _scale($$$) {
1740 my ($mode, $val, $max) = @_; 1744 my ($rel, $val, $max) = @_;
1741 1745
1742 $mode eq "abs" ? $val 1746 $rel ? $val * $max : $val
1743 : $mode eq "rel" ? $val * $max
1744 : 0
1745} 1747}
1746 1748
1747sub size_request { 1749sub size_request {
1748 my ($self) = @_; 1750 my ($self) = @_;
1749 1751
1750 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1752 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1751 1753
1752 # determine overall size by querying abs widgets 1754 # determine overall size by querying abs widgets
1753 for my $child ($self->visible_children) { 1755 for my $child ($self->visible_children) {
1754 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};
1755 1759
1756 if ($pos eq "abs") {
1757 $w = _scale $size, $w, $child->{req_w};
1758 $h = _scale $size, $h, $child->{req_h};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 } 1762 }
1763 } 1763 }
1764 1764
1765 my $W = $x2 - $x1; 1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1; 1766 my $H = $y2 - $y1;
1767 1767
1768 # now layout remaining widgets 1768 # now layout remaining widgets
1769 for my $child ($self->visible_children) { 1769 for my $child ($self->visible_children) {
1770 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;
1771 1773
1772 if ($pos ne "abs") {
1773 $x = _scale $pos, $x, $W;
1774 $y = _scale $pos, $x, $H;
1775 $w = _scale $size, $w, $child->{req_w};
1776 $h = _scale $size, $h, $child->{req_h};
1777
1778 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1779 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1780 } 1776 }
1781 } 1777 }
1782 1778
1783 my $W = $x2 - $x1; 1779 my $W = $x2 - $x1;
1784 my $H = $y2 - $y1; 1780 my $H = $y2 - $y1;
… …
1788 1784
1789sub invoke_size_allocate { 1785sub invoke_size_allocate {
1790 my ($self, $W, $H) = @_; 1786 my ($self, $W, $H) = @_;
1791 1787
1792 for my $child ($self->visible_children) { 1788 for my $child ($self->visible_children) {
1793 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;
1794 1791
1795 $x = _scale $pos, $x, $W; 1792 $x += $child->{c_halign} * $child->{req_w};
1796 $y = _scale $pos, $x, $H; 1793 $y += $child->{c_valign} * $child->{req_h};
1797 $w = _scale $size, $w, $child->{req_w};
1798 $h = _scale $size, $h, $child->{req_h};
1799 1794
1800 $child->configure ($x, $y, $w, $h); 1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1801 } 1796 }
1802 1797
1803 1 1798 1
1804} 1799}
1805 1800
1806############################################################################# 1801#############################################################################
1807 1802
1808package CFPlus::UI::Box; 1803package DC::UI::Box;
1809 1804
1810our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1811 1806
1812sub size_request { 1807sub size_request {
1813 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1814 1811
1815 $self->{vertical} 1812 $self->{vertical}
1816 ? ( 1813 ? (
1817 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1818 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1819 ) 1816 )
1820 : ( 1817 : (
1821 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1822 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1823 ) 1820 )
1824} 1821}
1825 1822
1826sub invoke_size_allocate { 1823sub invoke_size_allocate {
1827 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1848 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1849 for 0 .. $#children; 1846 for 0 .. $#children;
1850 } 1847 }
1851 } 1848 }
1852 1849
1853 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1854 1851
1855 my $pos = 0; 1852 my $pos = 0;
1856 for (0 .. $#children) { 1853 for (0 .. $#children) {
1857 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1858 $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));
… …
1863 1 1860 1
1864} 1861}
1865 1862
1866############################################################################# 1863#############################################################################
1867 1864
1868package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1869 1866
1870our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1871 1868
1872sub new { 1869sub new {
1873 my $class = shift; 1870 my $class = shift;
1874 1871
1875 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1878 ) 1875 )
1879} 1876}
1880 1877
1881############################################################################# 1878#############################################################################
1882 1879
1883package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1884 1881
1885our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1886 1883
1887sub new { 1884sub new {
1888 my $class = shift; 1885 my $class = shift;
1889 1886
1890 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1893 ) 1890 )
1894} 1891}
1895 1892
1896############################################################################# 1893#############################################################################
1897 1894
1898package CFPlus::UI::Label; 1895package DC::UI::Label;
1899 1896
1900our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1901 1898
1902use CFPlus::OpenGL; 1899use DC::OpenGL;
1903 1900
1904sub new { 1901sub new {
1905 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1906 1903
1907 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1912 #text => initial text 1909 #text => initial text
1913 #markup => initial narkup 1910 #markup => initial narkup
1914 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1915 #style => 0, # render flags 1912 #style => 0, # render flags
1916 ellipsise => 3, # end 1913 ellipsise => 3, # end
1917 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1918 fontsize => 1, 1915 fontsize => 1,
1919 align => -1, 1916 align => 0.5,
1920 valign => -1, 1917 valign => 0.5,
1921 padding_x => 2, 1918 padding_x => 4,
1922 padding_y => 2, 1919 padding_y => 2,
1923 can_events => 0, 1920 can_events => 0,
1924 %arg 1921 %arg
1925 ); 1922 );
1926 1923
1927 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1928 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1929 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1930 $self->{template} = $layout; 1927 $self->{template} = $layout;
1931 } 1928 }
1932 1929
1933 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1951 1948
1952 delete $self->{ox}; 1949 delete $self->{ox};
1953 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1954} 1951}
1955 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1956sub set_text { 1959sub set_text {
1957 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1958 1961
1959 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1960 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
… …
1983 1986
1984sub size_request { 1987sub size_request {
1985 my ($self) = @_; 1988 my ($self) = @_;
1986 1989
1987 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1988 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1989 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1990 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1991 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1992 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1993 1998
1994 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1995 2000
1996 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1997 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
1998 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
1999 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2000 2005
2001 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
2002 2007
2003 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
2059 2064
2060 [$self->{layout}->size] 2065 [$self->{layout}->size]
2061 }; 2066 };
2062 2067
2063 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
2064 $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);
2065 : $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);
2066 : ($self->{w} - $size->[0]) * 0.5);
2067 2071
2068 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2069 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2070 : ($self->{h} - $size->[1]) * 0.5);
2071 }; 2073 };
2072 2074
2073 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2075# unless ($self->{list}) {
2074 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2076# $self->{list} = DC::OpenGL::glGenList;
2075 2077# DC::OpenGL::glNewList $self->{list};
2076 $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;
2077} 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#}
2078 2094
2079############################################################################# 2095#############################################################################
2080 2096
2081package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
2082 2098
2083our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
2084 2100
2085use CFPlus::OpenGL; 2101use DC::OpenGL;
2086 2102
2087sub new { 2103sub new {
2088 my $class = shift; 2104 my $class = shift;
2089 2105
2090 $class->SUPER::new ( 2106 $class->SUPER::new (
2091 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2092 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
2093 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
2094 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
2095 can_hover => 1, 2113 can_hover => 1,
2096 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
2097 valign => 0, 2116 valign => 0.5,
2098 can_events => 1, 2117 can_events => 1,
2099 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
2100 #text => ... 2121 #text => ...
2101 #hidden => "*", 2122 #hidden => "*",
2102 @_ 2123 @_
2103 ) 2124 )
2104} 2125}
… …
2151 2172
2152 my $text = $self->get_text; 2173 my $text = $self->get_text;
2153 2174
2154 $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;
2155 2176
2156 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2157 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2158 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2159 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2160 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2161 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2162 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2163 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2164 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2165 # what a hack 2186 # what a hack
2166 $self->{cursor} = 2187 $self->{cursor} =
2167 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2168 ? length $1 2189 ? length $1
2169 : 0; 2190 : 0;
2170 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2171 # uh, again 2192 # uh, again
2172 $self->{cursor} = 2193 $self->{cursor} =
2173 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2174 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2175 : length $self->{text}; 2196 : length $self->{text};
… …
2239 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2240 } 2261 }
2241 2262
2242 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glBegin GL_QUADS;
2245 glVertex 0 , 0;
2246 glVertex 0 , $self->{h};
2247 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2248 glVertex $self->{w}, 0;
2249 glEnd;
2250 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2251 2267
2252 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2253 2269
2254 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
2256 2272
2257 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
2258 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
2259 utf8::encode $text; 2275 utf8::encode $text;
2260 2276
2261 @$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);
2262 } 2278 }
2263 2279
2280 glColor_premultiply @{$self->{active_fg}};
2264 glBegin GL_LINES; 2281 glBegin GL_LINES;
2265 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};
2266 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};
2267 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;
2268 } 2299 }
2269} 2300}
2270 2301
2271############################################################################# 2302#############################################################################
2272 2303
2273package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2274 2305
2275our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2276 2307
2277use 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
2278 2319
2279sub invoke_key_down { 2320sub invoke_key_down {
2280 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2281 2322
2282 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2288 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2289 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2290 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2291 $self->update; 2332 $self->update;
2292 2333
2293 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2294 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2295 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2296 } 2337 }
2297 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2298 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2300 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2301 } 2342 }
2302 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2303 } 2344 }
2304 2345
2305 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2306 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2307 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2308 2349
2309 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2310 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2311 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2312 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2313 } 2357 }
2314 2358
2315 } else { 2359 } else {
2316 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2317 } 2361 }
… …
2319 1 2363 1
2320} 2364}
2321 2365
2322############################################################################# 2366#############################################################################
2323 2367
2324package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2325 2369
2326our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2327 2371
2328use 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}
2329 2383
2330sub move_cursor_ver { 2384sub move_cursor_ver {
2331 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2332 2386
2333 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2334 2388
2335 $y += $dy; 2389 $line += $dy;
2336 2390
2337 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))) {
2338 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2339 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2340 $self->update; 2394 $self->update;
2341 return; 2395 return;
2342 } 2396 }
… …
2345sub invoke_key_down { 2399sub invoke_key_down {
2346 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2347 2401
2348 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2349 2403
2350 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2351 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2352 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2353 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2354 } else { 2408 } else {
2355 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2356 } 2410 }
2357 2411
2358 1 2412 1
2359} 2413}
2360 2414
2361############################################################################# 2415#############################################################################
2362 2416
2363package CFPlus::UI::Button; 2417package DC::UI::ButtonBin;
2364 2418
2365our @ISA = CFPlus::UI::Label::; 2419our @ISA = DC::UI::Bin::;
2366 2420
2367use CFPlus::OpenGL; 2421use DC::OpenGL;
2368 2422
2369my @tex = 2423my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2372 2426
2373sub new { 2427sub new {
2374 my $class = shift; 2428 my $class = shift;
2375 2429
2376 $class->SUPER::new ( 2430 $class->SUPER::new (
2377 padding_x => 4,
2378 padding_y => 4,
2379 fg => [1, 1, 1],
2380 active_fg => [0, 0, 1],
2381 can_hover => 1, 2431 can_hover => 1,
2382 align => 0, 2432 align => 0.5,
2383 valign => 0, 2433 valign => 0.5,
2384 can_events => 1, 2434 can_events => 1,
2385 @_ 2435 @_
2386 ) 2436 )
2387} 2437}
2388 2438
… …
2397} 2447}
2398 2448
2399sub _draw { 2449sub _draw {
2400 my ($self) = @_; 2450 my ($self) = @_;
2401 2451
2402 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2403
2404 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2454 glColor 0, 0, 0, 1;
2407 2455
2456 my $tex = $tex[$GRAB == $self];
2408 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2409 2458
2410 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
2411 2460
2412 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2413} 2462}
2414 2463
2415############################################################################# 2464#############################################################################
2416 2465
2417package CFPlus::UI::CheckBox; 2466package DC::UI::Button;
2418 2467
2419our @ISA = CFPlus::UI::DrawBG::; 2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
2420 2471
2421my @tex = 2472my @tex =
2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2423 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2474 qw(b1_button_inactive.png b1_button_active.png);
2424
2425use CFPlus::OpenGL;
2426 2475
2427sub new { 2476sub new {
2428 my $class = shift; 2477 my $class = shift;
2429 2478
2430 $class->SUPER::new ( 2479 $class->SUPER::new (
2480 padding_x => 8,
2481 padding_y => 4,
2482 fg => [1.0, 1.0, 1.0],
2483 active_fg => [0.8, 0.8, 0.8],
2484 can_hover => 1,
2485 align => 0.5,
2486 valign => 0.5,
2487 can_events => 1,
2488 @_
2489 )
2490}
2491
2492sub invoke_button_up {
2493 my ($self, $ev, $x, $y) = @_;
2494
2495 $self->emit ("activate")
2496 if $x >= 0 && $x < $self->{w}
2497 && $y >= 0 && $y < $self->{h};
2498
2499 1
2500}
2501
2502sub _draw {
2503 my ($self) = @_;
2504
2505 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2506
2507 glEnable GL_TEXTURE_2D;
2508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2509 glColor 0, 0, 0, 1;
2510
2511 my $tex = $tex[$GRAB == $self];
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513
2514 glDisable GL_TEXTURE_2D;
2515
2516 $self->SUPER::_draw;
2517}
2518
2519#############################################################################
2520
2521package DC::UI::CheckBox;
2522
2523our @ISA = DC::UI::DrawBG::;
2524
2525my @tex =
2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2528
2529use DC::OpenGL;
2530
2531sub new {
2532 my $class = shift;
2533
2534 $class->SUPER::new (
2535 fontsize => 1,
2431 padding_x => 2, 2536 padding_x => 2,
2432 padding_y => 2, 2537 padding_y => 2,
2433 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2434 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2435 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2441} 2546}
2442 2547
2443sub size_request { 2548sub size_request {
2444 my ($self) = @_; 2549 my ($self) = @_;
2445 2550
2446 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2447} 2552}
2448 2553
2449sub toggle { 2554sub toggle {
2450 my ($self) = @_; 2555 my ($self) = @_;
2451 2556
… …
2470sub _draw { 2575sub _draw {
2471 my ($self) = @_; 2576 my ($self) = @_;
2472 2577
2473 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2474 2579
2475 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2476 2581
2477 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2478 2583
2479 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;
2480 2585
… …
2487 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2488} 2593}
2489 2594
2490############################################################################# 2595#############################################################################
2491 2596
2492package CFPlus::UI::Image; 2597package DC::UI::Image;
2493 2598
2494our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2495 2600
2496use CFPlus::OpenGL; 2601use DC::OpenGL;
2497 2602
2498our %texture_cache; 2603our %texture_cache;
2499 2604
2500sub new { 2605sub new {
2501 my $class = shift; 2606 my $class = shift;
2502 2607
2503 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2504 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2505 @_, 2611 @_,
2506 ); 2612 );
2507 2613
2508 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2509 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2510 2616
2511 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2512 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2513 2619
2514 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2515 2621
2516 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2517 2623
2518 $self 2624 $self
2519} 2625}
2520 2626
2521sub STORABLE_freeze { 2627sub STORABLE_freeze {
2522 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2523 2629
2524 $self->{path} 2630 $self->{path}
2525 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";
2526 2632
2527 $self->{path} 2633 $self->{path}
2528} 2634}
2529 2635
2530sub STORABLE_attach { 2636sub STORABLE_attach {
2531 my ($self, $cloning, $path) = @_; 2637 my ($self, $cloning, $path) = @_;
2532 2638
2533 $self->new (path => $path) 2639 $self->new (path => $path)
2534} 2640}
2535 2641
2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2647}
2648
2536sub size_request { 2649sub size_request {
2537 my ($self) = @_; 2650 my ($self) = @_;
2538 2651
2539 ($self->{tex}{w}, $self->{tex}{h}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2540} 2653}
2541 2654
2542sub _draw { 2655sub _draw {
2543 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2544 2659
2545 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2546 2661
2547 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2548 2663
… …
2554 } 2669 }
2555 2670
2556 glEnable GL_TEXTURE_2D; 2671 glEnable GL_TEXTURE_2D;
2557 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2558 2673
2559 $tex->draw_quad (0, 0, $w, $h); 2674 $tex->draw_quad_alpha (0, 0, $w, $h);
2560 2675
2561 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2562} 2677}
2563 2678
2564############################################################################# 2679#############################################################################
2565 2680
2566package CFPlus::UI::ImageButton; 2681package DC::UI::ImageButton;
2567 2682
2568our @ISA = CFPlus::UI::Image::; 2683our @ISA = DC::UI::Image::;
2569 2684
2570use CFPlus::OpenGL; 2685use DC::OpenGL;
2571
2572my %textures;
2573 2686
2574sub new { 2687sub new {
2575 my $class = shift; 2688 my $class = shift;
2576 2689
2577 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2578 padding_x => 4, 2691 padding_x => 4,
2579 padding_y => 4, 2692 padding_y => 4,
2580 fg => [1, 1, 1], 2693 fg => [1, 1, 1],
2581 active_fg => [0, 0, 1], 2694 active_fg => [0, 0, 1],
2582 can_hover => 1, 2695 can_hover => 1,
2583 align => 0, 2696 align => 0.5,
2584 valign => 0, 2697 valign => 0.5,
2585 can_events => 1, 2698 can_events => 1,
2586 @_ 2699 @_
2587 ); 2700 );
2588} 2701}
2589 2702
2703sub invoke_button_down {
2704 my ($self, $ev, $x, $y) = @_;
2705
2706 1
2707}
2708
2590sub invoke_button_up { 2709sub invoke_button_up {
2591 my ($self, $ev, $x, $y) = @_; 2710 my ($self, $ev, $x, $y) = @_;
2592 2711
2593 $self->emit ("activate") 2712 $self->emit ("activate")
2594 if $x >= 0 && $x < $self->{w} 2713 if $x >= 0 && $x < $self->{w}
… …
2597 1 2716 1
2598} 2717}
2599 2718
2600############################################################################# 2719#############################################################################
2601 2720
2602package CFPlus::UI::VGauge; 2721package DC::UI::VGauge;
2603 2722
2604our @ISA = CFPlus::UI::Base::; 2723our @ISA = DC::UI::Base::;
2605 2724
2606use List::Util qw(min max); 2725use List::Util qw(min max);
2607 2726
2608use CFPlus::OpenGL; 2727use DC::OpenGL;
2609 2728
2610my %tex = ( 2729my %tex = (
2611 food => [ 2730 food => [
2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2613 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2614 ], 2733 ],
2615 grace => [ 2734 grace => [
2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2617 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2736 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2618 ], 2737 ],
2619 hp => [ 2738 hp => [
2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2621 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2622 ], 2741 ],
2623 mana => [ 2742 mana => [
2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2625 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2744 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2626 ], 2745 ],
2627); 2746);
2628 2747
2629# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2732 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2733} 2852}
2734 2853
2735############################################################################# 2854#############################################################################
2736 2855
2856package DC::UI::Progress;
2857
2858our @ISA = DC::UI::Label::;
2859
2860use DC::OpenGL;
2861
2862sub new {
2863 my ($class, %arg) = @_;
2864
2865 my $self = $class->SUPER::new (
2866 padding_x => 2,
2867 padding_y => 2,
2868 fg => [1, 1, 1],
2869 bg => [0, 0, 1, 0.2],
2870 bar => [0.7, 0.5, 0.1, 0.8],
2871 outline => [0.4, 0.3, 0],
2872 fontsize => 0.9,
2873 valign => 0.5,
2874 align => 0.5,
2875 can_events => 1,
2876 ellipsise => 1,
2877 label => "%d%%",
2878 %arg,
2879 );
2880
2881 $self->set_value ($arg{value} || -1);
2882
2883 $self
2884}
2885
2886sub set_label {
2887 my ($self, $label) = @_;
2888
2889 return if $self->{label} eq $label;
2890 $self->{label} = $label;
2891
2892 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2893}
2894
2895sub set_value {
2896 my ($self, $value) = @_;
2897
2898 if ($self->{value} ne $value) {
2899 $self->{value} = $value;
2900
2901 if ($value < 0) {
2902 $self->set_text ("-");
2903 } else {
2904 $self->set_text (sprintf $self->{label}, $value * 100);
2905 }
2906
2907 $self->update;
2908 }
2909}
2910
2911sub _draw {
2912 my ($self) = @_;
2913
2914 glEnable GL_BLEND;
2915 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2916
2917 my $px = $self->{padding_x};
2918 my $py = $self->{padding_y};
2919
2920 if ($self->{value} >= 0) {
2921 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2922
2923 glColor_premultiply @{$self->{bar}};
2924 glRect $px, $py, $s, $self->{h} - $py;
2925 glColor_premultiply @{$self->{bg}};
2926 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2927 }
2928
2929 glColor_premultiply @{$self->{outline}};
2930
2931 $px -= .5;
2932 $py -= .5;
2933
2934 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2935
2936 glDisable GL_BLEND;
2937
2938 {
2939 local $self->{bg}; # do not draw background
2940 $self->SUPER::_draw;
2941 }
2942}
2943
2944#############################################################################
2945
2946package DC::UI::ExperienceProgress;
2947
2948our @ISA = DC::UI::Progress::;
2949
2950sub new {
2951 my ($class, %arg) = @_;
2952
2953 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2954
2955 my $self = $class->SUPER::new (
2956 %arg,
2957 tooltip => sub {
2958 my ($self) = @_;
2959
2960 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2961 $tt,
2962 $self->{lvl},
2963 ::formsep ($self->{exp}),
2964 ::formsep ($self->{nxt}),
2965 ::formsep ($self->{nxt} - $self->{exp}),
2966 $self->_percent * 100,
2967 },
2968 );
2969
2970 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2971 if $::CONN;
2972
2973 $self
2974}
2975
2976sub DESTROY {
2977 my ($self) = @_;
2978
2979 delete $::CONN->{on_exp_update}{$self+0}
2980 if $::CONN;
2981
2982 $self->SUPER::DESTROY;
2983}
2984
2985sub _percent {
2986 my ($self) = @_;
2987
2988 my $table = $::CONN && $::CONN->{exp_table}
2989 or return -1;
2990
2991 my $l0 = $table->[$self->{lvl} - 1];
2992 my $l1 = $table->[$self->{lvl}];
2993
2994 $self->{nxt} = $l1;
2995
2996 ($self->{exp} - $l0) / ($l1 - $l0)
2997}
2998
2999sub set_value {
3000 my ($self, $lvl, $exp) = @_;
3001
3002 $self->{lvl} = $lvl;
3003 $self->{exp} = $exp;
3004
3005 $self->SUPER::set_value ($self->_percent);
3006}
3007
3008#############################################################################
3009
2737package CFPlus::UI::Gauge; 3010package DC::UI::Gauge;
2738 3011
2739our @ISA = CFPlus::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2740 3013
2741sub new { 3014sub new {
2742 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2743 3016
2744 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2746 can_hover => 1, 3019 can_hover => 1,
2747 can_events => 1, 3020 can_events => 1,
2748 %arg, 3021 %arg,
2749 ); 3022 );
2750 3023
2751 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3024 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2752 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3025 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2753 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3026 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2754 3027
2755 $self 3028 $self
2756} 3029}
2757 3030
2758sub set_fontsize { 3031sub set_fontsize {
… …
2779 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2780} 3053}
2781 3054
2782############################################################################# 3055#############################################################################
2783 3056
2784package CFPlus::UI::Slider; 3057package DC::UI::Slider;
2785 3058
2786use strict; 3059use strict;
2787 3060
2788use CFPlus::OpenGL; 3061use DC::OpenGL;
2789 3062
2790our @ISA = CFPlus::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2791 3064
2792my @tex = 3065my @tex =
2793 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2794 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2795 3068
2796sub new { 3069sub new {
2797 my $class = shift; 3070 my $class = shift;
2798 3071
… …
2835sub set_value { 3108sub set_value {
2836 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2837 3110
2838 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2839 3112
2840 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2841 3114
2842 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2843
2844 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2845 $value = $hi - $page if $value > $hi - $page;
2846 3117
2847 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2848 if $unit; 3119 if $unit;
2849 3120
2850 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2866 3137
2867 $self->SUPER::invoke_button_down ($ev, $x, $y); 3138 $self->SUPER::invoke_button_down ($ev, $x, $y);
2868 3139
2869 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3140 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2870 3141
2871 $self->invoke_mouse_motion ($ev, $x, $y) 3142 $self->invoke_mouse_motion ($ev, $x, $y);
3143
3144 1
2872} 3145}
2873 3146
2874sub invoke_mouse_motion { 3147sub invoke_mouse_motion {
2875 my ($self, $ev, $x, $y) = @_; 3148 my ($self, $ev, $x, $y) = @_;
2876 3149
… …
2892sub invoke_mouse_wheel { 3165sub invoke_mouse_wheel {
2893 my ($self, $ev) = @_; 3166 my ($self, $ev) = @_;
2894 3167
2895 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3168 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2896 3169
2897 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3170 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2898 3171
2899 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3172 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2900 3173
2901 ! ! $delta 3174 1
2902} 3175}
2903 3176
2904sub update { 3177sub update {
2905 my ($self) = @_; 3178 my ($self) = @_;
2906 3179
… …
2912 my ($self) = @_; 3185 my ($self) = @_;
2913 3186
2914 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
2915 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2916 3189
2917 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2918 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2919 3192
2920 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3193 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2921 3194
2922 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3195 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2923 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2924 3197
2925 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
… …
2955 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
2956} 3229}
2957 3230
2958############################################################################# 3231#############################################################################
2959 3232
2960package CFPlus::UI::ValSlider; 3233package DC::UI::ValSlider;
2961 3234
2962our @ISA = CFPlus::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
2963 3236
2964sub new { 3237sub new {
2965 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
2966 3239
2967 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
2968 3241
2969 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
2970 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
2971 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2972 to_value => sub { shift }, 3245 to_value => sub { shift },
2973 from_value => sub { shift }, 3246 from_value => sub { shift },
2974 %arg, 3247 %arg,
2975 ); 3248 );
2976 3249
… …
2996sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
2997sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
2998 3271
2999############################################################################# 3272#############################################################################
3000 3273
3001package CFPlus::UI::TextScroller; 3274package DC::UI::TextScroller;
3002 3275
3003our @ISA = CFPlus::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
3004 3277
3005use CFPlus::OpenGL; 3278use DC::OpenGL;
3006 3279
3007sub new { 3280sub new {
3008 my $class = shift; 3281 my $class = shift;
3009 3282
3010 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
… …
3012 can_events => 1, 3285 can_events => 1,
3013 indent => 0, 3286 indent => 0,
3014 #font => default_font 3287 #font => default_font
3015 @_, 3288 @_,
3016 3289
3017 layout => (new CFPlus::Layout), 3290 layout => (new DC::Layout),
3018 par => [], 3291 par => [],
3019 max_par => 0, 3292 max_par => 0,
3020 height => 0, 3293 height => 0,
3021 children => [ 3294 children => [
3022 (new CFPlus::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
3023 (new CFPlus::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
3024 ], 3297 ],
3025 ); 3298 );
3026 3299
3027 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
3028 3301
… …
3037} 3310}
3038 3311
3039sub size_request { 3312sub size_request {
3040 my ($self) = @_; 3313 my ($self) = @_;
3041 3314
3042 my ($empty, $slider) = @{ $self->{children} }; 3315 my ($empty, $slider) = $self->visible_children;
3043 3316
3044 local $self->{children} = [$empty, $slider]; 3317 local $self->{children} = [$empty, $slider];
3045 $self->SUPER::size_request 3318 $self->SUPER::size_request
3046} 3319}
3047 3320
… …
3084 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3085 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
3086 3359
3087 $layout->set_shapes ( 3360 $layout->set_shapes (
3088 map 3361 map
3089 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3090 @{$para->{widget}} 3363 @{$para->{widget}}
3091 ); 3364 );
3092 3365
3093 $layout 3366 $layout
3094} 3367}
… …
3211 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3212 $self->force_uptodate; 3485 $self->force_uptodate;
3213 3486
3214 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3215 3488
3216 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3217 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
3218 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
3219 3492
3220 package CFPlus::UI::Base; 3493 package DC::UI::Base;
3221 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3494 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3222 (0, 0, $self->{w}, $self->{h}); 3495 (0, 0, $self->{w}, $self->{h});
3223 3496
3224 my $top = int $self->{children}[1]{range}[0]; 3497 my $top = int $self->{children}[1]{range}[0];
3225 3498
… …
3236 3509
3237 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
3238 my $layout = $self->get_layout ($para); 3511 my $layout = $self->get_layout ($para);
3239 3512
3240 $layout->render ($para->{indent}, $y - $y0); 3513 $layout->render ($para->{indent}, $y - $y0);
3514 $layout->draw;
3241 3515
3242 if (my @w = @{ $para->{widget} }) { 3516 if (my @w = @{ $para->{widget} }) {
3243 my @s = $layout->get_shapes; 3517 my @s = $layout->get_shapes;
3244 3518
3245 for (@w) { 3519 for (@w) {
… …
3283 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
3284} 3558}
3285 3559
3286############################################################################# 3560#############################################################################
3287 3561
3288package CFPlus::UI::Animator; 3562package DC::UI::Animator;
3289 3563
3290use CFPlus::OpenGL; 3564use DC::OpenGL;
3291 3565
3292our @ISA = CFPlus::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
3293 3567
3294sub moveto { 3568sub moveto {
3295 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
3296 3570
3297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3325 glPopMatrix; 3599 glPopMatrix;
3326} 3600}
3327 3601
3328############################################################################# 3602#############################################################################
3329 3603
3330package CFPlus::UI::Flopper; 3604package DC::UI::Flopper;
3331 3605
3332our @ISA = CFPlus::UI::Button::; 3606our @ISA = DC::UI::Button::;
3333 3607
3334sub new { 3608sub new {
3335 my $class = shift; 3609 my $class = shift;
3336 3610
3337 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
… …
3349 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
3350} 3624}
3351 3625
3352############################################################################# 3626#############################################################################
3353 3627
3354package CFPlus::UI::Tooltip; 3628package DC::UI::Tooltip;
3355 3629
3356our @ISA = CFPlus::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
3357 3631
3358use CFPlus::OpenGL; 3632use DC::OpenGL;
3359 3633
3360sub new { 3634sub new {
3361 my $class = shift; 3635 my $class = shift;
3362 3636
3363 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
3367} 3641}
3368 3642
3369sub set_tooltip_from { 3643sub set_tooltip_from {
3370 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
3371 3645
3372 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3373 if $widget->{tooltip} =~ /^#(.*)$/;
3374
3375 my $tooltip = $widget->{tooltip}; 3646 my $tip = $widget->{tooltip};
3647 $tip = $tip->($widget) if "CODE" eq ref $tip;
3648
3649 $tip = DC::Pod::section_label tooltip => $1
3650 if $tip =~ /^#(.*)$/;
3376 3651
3377 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
3378 $tooltip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
3379 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3380 . "req $widget->{req_w} $widget->{req_h}\n" 3655 . "req $widget->{req_w} $widget->{req_h}\n"
3381 . "visible $widget->{visible}"; 3656 . "visible $widget->{visible}";
3382 } 3657 }
3383 3658
3384 $tooltip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
3385 $tooltip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
3386 3661
3387 $self->add (new CFPlus::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
3388 markup => $tooltip, 3664 markup => $tip,
3389 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
3390 fontsize => 0.8, 3667 fontsize => 0.8,
3391 style => 1, # FLAG_INVERSE 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3392 ellipsise => 0, 3669 ellipsise => 0,
3393 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
3394 ); 3671 );
3395} 3672}
3396 3673
… …
3431} 3708}
3432 3709
3433sub _draw { 3710sub _draw {
3434 my ($self) = @_; 3711 my ($self) = @_;
3435 3712
3436 glTranslate 0.375, 0.375;
3437
3438 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
3439 3714
3440 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
3441 glBegin GL_QUADS; 3716 glRect 0, 0, $w, $h;
3442 glVertex 0 , 0;
3443 glVertex 0 , $h;
3444 glVertex $w, $h;
3445 glVertex $w, 0;
3446 glEnd;
3447 3717
3448 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
3449 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
3450 glVertex 0 , 0;
3451 glVertex 0 , $h;
3452 glVertex $w, $h;
3453 glVertex $w, 0;
3454 glEnd;
3455 3720
3456 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
3457 3722
3458 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
3459} 3724}
3460 3725
3461############################################################################# 3726#############################################################################
3462 3727
3463package CFPlus::UI::Face; 3728package DC::UI::Face;
3464 3729
3465our @ISA = CFPlus::UI::DrawBG::; 3730our @ISA = DC::UI::DrawBG::;
3466 3731
3467use CFPlus::OpenGL; 3732use DC::OpenGL;
3468 3733
3469sub new { 3734sub new {
3470 my $class = shift; 3735 my $class = shift;
3471 3736
3472 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
… …
3475 aspect => 1, 3740 aspect => 1,
3476 can_events => 0, 3741 can_events => 0,
3477 @_, 3742 @_,
3478 ); 3743 );
3479 3744
3480 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self);
3482
3483 $self->{timer} = Event->timer (
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3485 hard => 1,
3486 interval => $self->{animspeed},
3487 cb => sub {
3488 return unless $::CONN;
3489
3490 ++$widget->{frame};
3491 $self->update_face;
3492 $self->update;
3493 },
3494 );
3495
3496 $self->update_face; 3745 $self->update_anim;
3497 }
3498 3746
3499 $self 3747 $self
3500} 3748}
3501 3749
3750sub update_timer {
3751 my ($self) = @_;
3752
3753 return unless $self->{timer};
3754
3755 if ($self->{visible}) {
3756 $self->{timer}->start;
3757 } else {
3758 $self->{timer}->stop;
3759 }
3760}
3761
3502sub update_face { 3762sub update_face {
3503 my ($self) = @_; 3763 my ($self) = @_;
3504 3764
3505 return unless $::CONN;
3506
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) {
3509 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3511 }
3512 }
3513}
3514
3515sub size_request {
3516 my ($self) = @_;
3517
3518 if ($::CONN) { 3765 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3766 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) { 3767 if ($anim && @$anim) {
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3768 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3522 } else { 3769 delete $self->{face_change_cb};
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3770
3524 $self->realloc; 3771 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3772 unless ($tex->{name} || $tex->{loading}) {
3773 $tex->upload (sub { $self->reconfigure });
3774 }
3525 }); 3775 }
3526 } 3776 }
3527 } 3777 }
3528 } 3778 }
3779}
3780
3781sub update_anim {
3782 my ($self) = @_;
3783
3784 if ($self->{anim} && $self->{animspeed}) {
3785 DC::weaken (my $widget = $self);
3786
3787 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3788 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3789 return unless $::CONN;
3790
3791 my $w = $widget
3792 or return;
3793
3794 ++$w->{frame};
3795 $w->update_face;
3796
3797 # somehow, $widget can go away
3798 $w->update;
3799 $w->update_timer;
3800 };
3801
3802 $self->update_face;
3803 $self->update_timer;
3804 } else {
3805 delete $self->{timer};
3806 }
3807}
3808
3809sub size_request {
3810 my ($self) = @_;
3811
3812 if ($::CONN) {
3813 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3814 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3815 if ($tex->{name}) {
3816 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3817 } elsif (!$tex->{loading}) {
3818 $tex->upload (sub { $self->reconfigure });
3819 }
3820 }
3821
3822 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3823 }
3824 }
3529 3825
3530 ($self->{size_w} || 8, $self->{size_h} || 8) 3826 ($self->{size_w} || 8, $self->{size_h} || 8)
3531} 3827}
3532 3828
3533sub update { 3829sub update {
… …
3536 return unless $self->{visible}; 3832 return unless $self->{visible};
3537 3833
3538 $self->SUPER::update; 3834 $self->SUPER::update;
3539} 3835}
3540 3836
3837sub set_face {
3838 my ($self, $face) = @_;
3839
3840 $self->{face} = $face;
3841 $self->reconfigure;
3842}
3843
3844sub set_anim {
3845 my ($self, $anim) = @_;
3846
3847 $self->{anim} = $anim;
3848 $self->update_anim;
3849}
3850
3851sub set_animspeed {
3852 my ($self, $animspeed) = @_;
3853
3854 $self->{animspeed} = $animspeed;
3855 $self->update_anim;
3856}
3857
3858sub invoke_visibility_change {
3859 my ($self) = @_;
3860
3861 $self->update_timer;
3862
3863 0
3864}
3865
3541sub _draw { 3866sub _draw {
3542 my ($self) = @_; 3867 my ($self) = @_;
3543 3868
3544 return unless $::CONN;
3545
3546 $self->SUPER::_draw; 3869 $self->SUPER::_draw;
3547 3870
3548 my $faceid = $::CONN->{faceid}[$self->{face}] 3871 if (my $tex = $self->{tex}) {
3549 or return;
3550
3551 my $tex = $::CONN->{texture}[$faceid];
3552
3553 if ($tex) {
3554 glEnable GL_TEXTURE_2D; 3872 glEnable GL_TEXTURE_2D;
3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3556 glColor 0, 0, 0, 1; 3874 glColor 0, 0, 0, 1;
3557 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3558 glDisable GL_TEXTURE_2D; 3876 glDisable GL_TEXTURE_2D;
… …
3560} 3878}
3561 3879
3562sub destroy { 3880sub destroy {
3563 my ($self) = @_; 3881 my ($self) = @_;
3564 3882
3565 $self->{timer}->cancel 3883 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3884 if $self->{timer};
3567 3885
3568 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3569} 3887}
3570 3888
3571############################################################################# 3889#############################################################################
3572 3890
3573package CFPlus::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3574 3892
3575our @ISA = CFPlus::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3576 3894
3577# TODO: should actually wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3578 3896
3579############################################################################# 3897#############################################################################
3580 3898
3581package CFPlus::UI::Menu; 3899package DC::UI::Menu;
3582 3900
3583our @ISA = CFPlus::UI::Toplevel::; 3901our @ISA = DC::UI::Toplevel::;
3584 3902
3585use CFPlus::OpenGL; 3903use DC::OpenGL;
3586 3904
3587sub new { 3905sub new {
3588 my $class = shift; 3906 my $class = shift;
3589 3907
3590 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3591 items => [], 3909 items => [],
3592 z => 100, 3910 z => 100,
3593 @_, 3911 @_,
3594 ); 3912 );
3595 3913
3596 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3597 3915
3598 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3599 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3600 3918
3601 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3602 if (!ref $widget) { 3920 if (!ref $widget) {
3603 if ($widget =~ /\t/) { 3921 if ($widget =~ /\t/) {
3604 my ($left, $right) = split /\t/, $widget, 2; 3922 my ($left, $right) = split /\t/, $widget, 2;
3605 3923
3606 $widget = new CFPlus::UI::HBox 3924 $widget = new DC::UI::HBox
3607 can_hover => 1, 3925 can_hover => 1,
3608 can_events => 1, 3926 can_events => 1,
3609 tooltip => $tooltip, 3927 tooltip => $tooltip,
3610 children => [ 3928 children => [
3611 (new CFPlus::UI::Label markup => $left, expand => 1), 3929 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3612 (new CFPlus::UI::Label markup => $right, align => +1), 3930 (new DC::UI::Label markup => $right, align => 1),
3613 ], 3931 ],
3614 ; 3932 ;
3615 3933
3616 } else { 3934 } else {
3617 $widget = new CFPlus::UI::Label 3935 $widget = new DC::UI::Label
3618 can_hover => 1, 3936 can_hover => 1,
3619 can_events => 1, 3937 can_events => 1,
3938 align => 0,
3620 markup => $widget, 3939 markup => $widget,
3621 tooltip => $tooltip; 3940 tooltip => $tooltip;
3622 } 3941 }
3623 } 3942 }
3624 3943
… …
3639 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3640 $GRAB = $self; 3959 $GRAB = $self;
3641 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3642 3961
3643 $self->show; 3962 $self->show;
3644 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3963
3964 my $x = $ev->{x};
3965 my $y = $ev->{y};
3966
3967 $self->{root}->on_post_alloc ($self => sub {
3968 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3969 });
3970
3971 1 # so it can be used inside event handlers
3645} 3972}
3646 3973
3647sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3648 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3649 3976
… …
3670 1 3997 1
3671} 3998}
3672 3999
3673############################################################################# 4000#############################################################################
3674 4001
3675package CFPlus::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3676 4003
3677our @ISA = CFPlus::UI::Container::; 4004our @ISA = DC::UI::Container::;
3678 4005
3679sub new { 4006sub new {
3680 my $class = shift; 4007 my $class = shift;
3681 4008
3682 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3683 @_, 4010 @_,
3684 ); 4011 );
3685 4012
3686 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3687 if @{ $self->{children} };
3688 4014
3689 $self 4015 $self
3690} 4016}
3691 4017
3692sub add { 4018sub add {
3693 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3694 4020
3695 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3696 4022
3697 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3698 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
3699} 4025}
3700 4026
3701sub get_current_page { 4027sub get_current_page {
3702 my ($self) = @_; 4028 my ($self) = @_;
3703 4029
… …
3709 4035
3710 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3711 ? $page_or_widget 4037 ? $page_or_widget
3712 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3713 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3714 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3715 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3716 4045
3717 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3718 4048
3719 $self->realloc; 4049 $self->realloc;
3720} 4050}
3721 4051
3722sub visible_children { 4052sub visible_children {
3723 $_[0]{current} 4053 $_[0]{current} || ()
3724} 4054}
3725 4055
3726sub size_request { 4056sub size_request {
3727 my ($self) = @_; 4057 my ($self) = @_;
3728 4058
4059 $self->{current}
3729 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3730} 4062}
3731 4063
3732sub invoke_size_allocate { 4064sub invoke_size_allocate {
3733 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3734 4066
3735 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3736 4069
3737 1 4070 1
3738} 4071}
3739 4072
3740sub _draw { 4073sub _draw {
3741 my ($self) = @_; 4074 my ($self) = @_;
3742 4075
3743 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3744} 4078}
3745 4079
3746############################################################################# 4080#############################################################################
3747 4081
3748package CFPlus::UI::Notebook; 4082package DC::UI::Notebook;
3749 4083
4084use DC::OpenGL;
4085
3750our @ISA = CFPlus::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3751 4087
3752sub new { 4088sub new {
3753 my $class = shift; 4089 my $class = shift;
3754 4090
3755 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3756 buttonbar => (new CFPlus::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3757 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
4094 active_outline => [.7, .7, 0.2],
3758 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3759 @_, 4096 @_,
3760 ); 4097 );
3761 4098
3762 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4099 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3763 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4100 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3764 4101
4102 {
4103 Scalar::Util::weaken (my $wself = $self);
4104
4105 $self->{multiplexer}->connect (c_add => sub {
4106 my ($mplex, $widgets) = @_;
4107
4108 for my $child (@$widgets) {
4109 Scalar::Util::weaken $child;
4110 $child->{c_tab_} ||= do {
4111 my $tab =
4112 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4113 ? $child->{c_tab}
4114 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4115
4116 $tab->connect (activate => sub {
4117 $wself->set_current_page ($child);
4118 });
4119
4120 $tab
4121 };
4122
4123 $self->{buttonbar}->add ($child->{c_tab_});
4124 }
4125 });
4126
4127 $self->{multiplexer}->connect (c_remove => sub {
4128 my ($mplex, $widgets) = @_;
4129
4130 for my $child (@$widgets) {
4131 $wself->{buttonbar}->remove ($child->{c_tab_});
4132 }
4133 });
4134 }
4135
3765 $self 4136 $self
3766} 4137}
3767 4138
3768sub add { 4139sub add {
4140 my ($self, @widgets) = @_;
4141
4142 $self->{multiplexer}->add (@widgets)
4143}
4144
4145sub remove {
4146 my ($self, @widgets) = @_;
4147
4148 $self->{multiplexer}->remove (@widgets)
4149}
4150
4151sub pages {
4152 my ($self) = @_;
4153 $self->{multiplexer}->children
4154}
4155
4156sub page_index {
4157 my ($self, $widget) = @_;
4158
4159 my $i = 0;
4160 for ($self->pages) {
4161 if ($_ eq $widget) { return $i };
4162 $i++;
4163 }
4164
4165 undef
4166}
4167
4168sub add_tab {
3769 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
3770 4170
3771 CFPlus::weaken $self; 4171 $title = [$title, $tooltip] unless ref $title;
4172 $widget->{c_tab} = $title;
3772 4173
3773 $self->{buttonbar}->add (new CFPlus::UI::Button
3774 markup => $title,
3775 tooltip => $tooltip,
3776 on_activate => sub { $self->set_current_page ($widget) },
3777 );
3778
3779 $self->{multiplexer}->add ($widget); 4174 $self->add ($widget);
3780} 4175}
3781 4176
3782sub get_current_page { 4177sub get_current_page {
3783 my ($self) = @_; 4178 my ($self) = @_;
3784 4179
… …
3790 4185
3791 $self->{multiplexer}->set_current_page ($page); 4186 $self->{multiplexer}->set_current_page ($page);
3792 $self->emit (page_changed => $self->{multiplexer}{current}); 4187 $self->emit (page_changed => $self->{multiplexer}{current});
3793} 4188}
3794 4189
4190sub _draw {
4191 my ($self) = @_;
4192
4193 $self->SUPER::_draw ();
4194
4195 if (my $cur = $self->{multiplexer}{current}) {
4196 if ($cur = $cur->{c_tab_}) {
4197 glTranslate $self->{buttonbar}{x} + $cur->{x},
4198 $self->{buttonbar}{y} + $cur->{y};
4199 glLineWidth 3;
4200 #glEnable GL_BLEND;
4201 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4202 glColor @{$self->{active_outline}};
4203 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4204 glLineWidth 1;
4205 #glDisable GL_BLEND;
4206 }
4207 }
4208}
4209
3795############################################################################# 4210#############################################################################
3796 4211
3797package CFPlus::UI::Selector; 4212package DC::UI::Selector;
3798 4213
3799use utf8; 4214use utf8;
3800 4215
3801our @ISA = CFPlus::UI::Button::; 4216our @ISA = DC::UI::Button::;
3802 4217
3803sub new { 4218sub new {
3804 my $class = shift; 4219 my $class = shift;
3805 4220
3806 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
… …
3823 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
3824 4239
3825 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3826 } 4241 }
3827 4242
3828 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3829} 4244}
3830 4245
3831sub _set_value { 4246sub _set_value {
3832 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
3833 4248
3834 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4249 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4250 $item ||= $self->{options}[0]
3835 or return; 4251 or return;
3836 4252
3837 $self->{value} = $item->[0]; 4253 $self->{value} = $item->[0];
3838 $self->set_markup ("$item->[1] ⇓"); 4254 $self->set_markup ("$item->[1] ⇓");
3839 $self->set_tooltip ($item->[2]); 4255# $self->set_tooltip ($item->[2]);
3840} 4256}
3841 4257
3842sub set_value { 4258sub set_value {
3843 my ($self, $value) = @_; 4259 my ($self, $value) = @_;
3844 4260
… …
3846 4262
3847 $self->_set_value ($value); 4263 $self->_set_value ($value);
3848 $self->emit (changed => $value); 4264 $self->emit (changed => $value);
3849} 4265}
3850 4266
4267sub set_options {
4268 my ($self, $options) = @_;
4269
4270 $self->{options} = $options;
4271 $self->_set_value ($self->{value});
4272}
4273
3851############################################################################# 4274#############################################################################
3852 4275
3853package CFPlus::UI::Statusbox; 4276package DC::UI::Statusbox;
3854 4277
3855our @ISA = CFPlus::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
3856 4279
3857sub new { 4280sub new {
3858 my $class = shift; 4281 my $class = shift;
3859 4282
3860 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
3861 fontsize => 0.8, 4284 fontsize => 0.8,
3862 @_, 4285 @_,
3863 ); 4286 );
3864 4287
3865 CFPlus::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
3866 4289
3867 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3868 4291
3869 $self 4292 $self
3870} 4293}
3871 4294
3872sub reorder { 4295sub reorder {
3873 my ($self) = @_; 4296 my ($self) = @_;
3874 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
3875 4298
3876 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
3877 return if $CFPlus::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
3878 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3879 values %{ $self->{item} }; 4302 values %{ $self->{item} };
3880 4303
3881 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
3882 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3883 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
3884 4309
3885 my @widgets; 4310 my @widgets;
3886 4311
3887 my @items = sort { 4312 my @items = sort {
3888 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
3889 or $b->{id} <=> $a->{id} 4314 or $b->{id} <=> $a->{id}
3890 } values %{ $self->{item} }; 4315 } values %{ $self->{item} };
3891
3892 $self->{timer}->interval (1);
3893 4316
3894 my $count = 10 + 1; 4317 my $count = 10 + 1;
3895 for my $item (@items) { 4318 for my $item (@items) {
3896 last unless --$count; 4319 last unless --$count;
3897 4320
… …
3904 for ($short) { 4327 for ($short) {
3905 s/^\s+//; 4328 s/^\s+//;
3906 s/\s+/ /g; 4329 s/\s+/ /g;
3907 } 4330 }
3908 4331
3909 new CFPlus::UI::Label 4332 new DC::UI::Label
3910 markup => $short, 4333 markup => $short,
3911 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
3912 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
3913 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
3914 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
3915 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
3916 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
3917 can_events => 1, 4341 can_events => 1,
3918 can_hover => 1 4342 can_hover => 1
3919 }; 4343 };
3920 4344
3921 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4345 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3922 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4346 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3923 $label->update; 4347 $label->update;
3924 $label->set_max_size (undef, $label->{req_h} * $diff) 4348 $label->set_max_size (undef, $label->{req_h} * $diff)
3925 if $diff < 1; 4349 if $diff < 1;
3926 $self->{timer}->interval (1/30); 4350 $self->{timer}->set (1/30, 1/30);
3927 } else { 4351 } else {
3928 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
3929 } 4353 }
3930 4354
3931 push @widgets, $label; 4355 push @widgets, $label;
3932 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
3933 4361
3934 $self->clear; 4362 $self->clear;
3935 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
3936} 4364}
3937 4365
… …
3993 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
3994} 4422}
3995 4423
3996############################################################################# 4424#############################################################################
3997 4425
3998package CFPlus::UI::Root; 4426package DC::UI::Root;
3999 4427
4000our @ISA = CFPlus::UI::Container::; 4428our @ISA = DC::UI::Container::;
4001 4429
4002use List::Util qw(min max); 4430use List::Util qw(min max);
4003 4431
4004use CFPlus::OpenGL; 4432use DC::OpenGL;
4005 4433
4006sub new { 4434sub new {
4007 my $class = shift; 4435 my $class = shift;
4008 4436
4009 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
4010 visible => 1, 4438 visible => 1,
4011 @_, 4439 @_,
4012 ); 4440 );
4013 4441
4014 CFPlus::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
4015 4443
4016 $self 4444 $self
4017} 4445}
4018 4446
4019sub size_request { 4447sub size_request {
… …
4067} 4495}
4068 4496
4069sub update { 4497sub update {
4070 my ($self) = @_; 4498 my ($self) = @_;
4071 4499
4072 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
4073} 4501}
4074 4502
4075sub add { 4503sub add {
4076 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
4077 4505
… …
4114 while ($self->{refresh_hook}) { 4542 while ($self->{refresh_hook}) {
4115 $_->() 4543 $_->()
4116 for values %{delete $self->{refresh_hook}}; 4544 for values %{delete $self->{refresh_hook}};
4117 } 4545 }
4118 4546
4119 if ($self->{realloc}) { 4547 while ($self->{realloc}) {
4120 my %queue; 4548 my %queue;
4121 my @queue; 4549 my @queue;
4122 my $widget; 4550 my $widget;
4123 4551
4124 outer: 4552 outer:
… …
4144 4572
4145 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
4146 4574
4147 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
4148 4576
4149 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
4150 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4578 $h += $widget->{padding_y} * 2;
4579
4580 $w = max $widget->{min_w}, $w;
4581 $h = max $widget->{min_h}, $h;
4151 4582
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154 4585
4155 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4171 } 4602 }
4172 } 4603 }
4173 4604
4174 delete $self->{realloc}{$widget+0}; 4605 delete $self->{realloc}{$widget+0};
4175 } 4606 }
4176 }
4177 4607
4178 while (my $size_alloc = delete $self->{size_alloc}) { 4608 while (my $size_alloc = delete $self->{size_alloc}) {
4179 my @queue = sort { $b->{visible} <=> $a->{visible} } 4609 my @queue = sort { $a->{visible} <=> $b->{visible} }
4180 values %$size_alloc; 4610 values %$size_alloc;
4181 4611
4182 while () { 4612 while () {
4183 my $widget = pop @queue || last; 4613 my $widget = pop @queue || last;
4184 4614
4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4615 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4186 4616
4187 $w = 0 if $w < 0;
4188 $h = 0 if $h < 0;
4189
4190 $w = max $widget->{min_w}, $w; 4617 $w = max $widget->{min_w}, $w;
4191 $h = max $widget->{min_h}, $h; 4618 $h = max $widget->{min_h}, $h;
4192 4619
4193# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4620# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4194# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4621# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4195 4622
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4623 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4624 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198 4625
4199 $w = int $w + 0.5; 4626 $w = int $w + 0.5;
4200 $h = int $h + 0.5; 4627 $h = int $h + 0.5;
4201 4628
4202 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4629 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4203 $widget->{old_w} = $widget->{w}; 4630 $widget->{old_w} = $widget->{w};
4204 $widget->{old_h} = $widget->{h}; 4631 $widget->{old_h} = $widget->{h};
4205 4632
4206 $widget->{w} = $w; 4633 $widget->{w} = $w;
4207 $widget->{h} = $h; 4634 $widget->{h} = $h;
4208 4635
4209 $widget->emit (size_allocate => $w, $h); 4636 $widget->emit (size_allocate => $w, $h);
4637 }
4210 } 4638 }
4211 } 4639 }
4212 } 4640 }
4213 4641
4214 while ($self->{post_alloc_hook}) { 4642 while ($self->{post_alloc_hook}) {
4215 $_->() 4643 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4644 for values %{delete $self->{post_alloc_hook}};
4217 } 4645 }
4218
4219 4646
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4647 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4648 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4649 glClear GL_COLOR_BUFFER_BIT;
4223 4650
… …
4226 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4227 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
4228 glLoadIdentity; 4655 glLoadIdentity;
4229 4656
4230 { 4657 {
4231 package CFPlus::UI::Base; 4658 package DC::UI::Base;
4232 4659
4233 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4234 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
4235 4662
4236 $self->_draw; 4663 $self->_draw;
4237 } 4664 }
4238} 4665}
4239 4666
4240############################################################################# 4667#############################################################################
4241 4668
4242package CFPlus::UI; 4669package DC::UI;
4243 4670
4244$ROOT = new CFPlus::UI::Root; 4671$ROOT = new DC::UI::Root;
4245$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
4246 4673
42471 46741
4248

Diff Legend

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