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.374 by root, Mon Jul 16 12:36:48 2007 UTC vs.
Revision 1.482 by root, Sat Aug 13 23:18:19 2011 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Event; 7use AnyEvent ();
8use Guard ();
8 9
9use CFPlus; 10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
119
120 $ev->{dx} = $shift ? $delta : 0;
121 $ev->{dy} = $shift ? 0 : $delta;
122
120 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
121 } else { 124 } else {
122 $GRAB->emit (button_down => $ev) 125 $GRAB->emit (button_down => $ev)
123 } 126 }
124 } 127 }
… …
138 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 142 $grab->update if $grab;
140 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
141 144
142 check_hover $widget; 145 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
144 } 147 }
145} 148}
146 149
147sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
148 my ($ev) = @_; 151 my ($ev) = @_;
… …
188# call when resolution changes etc. 191# call when resolution changes etc.
189sub rescale_widgets { 192sub rescale_widgets {
190 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
191 194
192 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
193 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196 199
197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
210 reconfigure_widgets; 213 reconfigure_widgets;
211} 214}
212 215
213############################################################################# 216#############################################################################
214 217
215package CFPlus::UI::Event; 218package DC::UI::Event;
216 219
217sub xy { 220sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 222}
220 223
221############################################################################# 224#############################################################################
222 225
223package CFPlus::UI::Base; 226package DC::UI::Base;
224 227
225use strict; 228use common::sense;
226 229
227use CFPlus::OpenGL; 230use DC::OpenGL;
228 231
229sub new { 232sub new {
230 my $class = shift; 233 my $class = shift;
231 234
232 my $self = bless { 235 my $self = bless {
… …
237 h => undef, 240 h => undef,
238 can_events => 1, 241 can_events => 1,
239 @_ 242 @_
240 }, $class; 243 }, $class;
241 244
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 246
244 for (keys %$self) { 247 for (keys %$self) {
245 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
247 } 250 }
248 } 251 }
249 252
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 258
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 261
259 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
269 $self->emit ("destroy"); 272 $self->emit ("destroy");
270 %$self = (); 273 %$self = ();
271} 274}
272 275
273sub TO_JSON { 276sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
275} 278}
276 279
277sub show { 280sub show {
278 my ($self) = @_; 281 my ($self) = @_;
279 282
280 return if $self->{parent}; 283 return if $self->{parent};
281 284
282 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
283} 286}
284 287
285sub set_visible { 288sub set_visible {
286 my ($self) = @_; 289 my ($self) = @_;
287 290
288 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
289 295
290 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
292 298
293 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
294 300
295 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
296 302
297 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
298} 304}
299 305
300sub set_invisible { 306sub set_invisible {
301 my ($self) = @_; 307 my ($self) = @_;
302 308
… …
308 delete $self->{root}; 314 delete $self->{root};
309 315
310 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
312 318
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
315 321
316 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
318} 324}
… …
337sub hide { 343sub hide {
338 my ($self) = @_; 344 my ($self) = @_;
339 345
340 $self->set_invisible; 346 $self->set_invisible;
341 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 351 $parent->remove ($self);
343 if $self->{parent}; 352 }
344} 353}
345 354
346sub move_abs { 355sub move_abs {
347 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
348 357
… …
360 $self->{force_h} = $h; 369 $self->{force_h} = $h;
361 370
362 $self->realloc; 371 $self->realloc;
363} 372}
364 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
365sub size_request { 392sub size_request {
366 require Carp; 393 require Carp;
367 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
368} 395}
369 396
… …
375 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
376 403
377 if ($self->{aspect}) { 404 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
379 406
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 409
383 # use alignment to adjust x, y 410 # use alignment to adjust x, y
384 411
385 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
427 454
428 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
429 456
430 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
431 458
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 462 }
436} 463}
437 464
438# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
439sub coord2local { 466sub coord2local {
440 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
441 468
442 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
443 470
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 472}
446 473
447# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
448sub coord2global { 475sub coord2global {
449 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
450 477
451 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
452 479
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 481}
455 482
456sub invoke_focus_in { 483sub invoke_focus_in {
… …
505sub connect { 532sub connect {
506 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
507 534
508 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
509 536
510 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
513 } 540 }
514} 541}
515 542
… …
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 common::sense;
649
675use CFPlus::OpenGL; 650use DC::OpenGL;
676 651
677sub new { 652sub new {
678 my $class = shift; 653 my $class = shift;
679
680 # range [value, low, high, page]
681 654
682 $class->SUPER::new ( 655 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 656 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
685 @_ 658 @_
686 ) 659 )
687} 660}
688 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
689sub _draw { 669sub _draw {
690 my ($self) = @_; 670 my ($self) = @_;
691 671
692 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
693 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
694 : $self->{bg}; 674 : $self->{bg};
695 675
696 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
697 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
698 678
699 glEnable GL_BLEND; 679 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 681 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 682 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 683 glDisable GL_BLEND;
711 } 684 }
712} 685}
713 686
714############################################################################# 687#############################################################################
715 688
716package CFPlus::UI::Empty; 689package DC::UI::Empty;
717 690
718our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
719 692
720sub new { 693sub new {
721 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
723} 696}
… …
730 703
731sub draw { } 704sub draw { }
732 705
733############################################################################# 706#############################################################################
734 707
735package CFPlus::UI::Container; 708package DC::UI::Container;
736 709
737our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
738 711
739sub new { 712sub new {
740 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
741 714
742 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
… …
746 can_events => 0, 719 can_events => 0,
747 %arg, 720 %arg,
748 ); 721 );
749 722
750 $self->add (@$children) 723 $self->add (@$children)
751 if $children; 724 if $children && @$children;
752 725
753 $self 726 $self
754} 727}
755 728
756sub realloc { 729sub realloc {
… …
765 my ($self, @widgets) = @_; 738 my ($self, @widgets) = @_;
766 739
767 $_->set_parent ($self) 740 $_->set_parent ($self)
768 for @widgets; 741 for @widgets;
769 742
743 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 744 use sort 'stable';
771 745
772 $self->{children} = [ 746 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 747 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 748 @{$self->{children}}, @widgets
775 ]; 749 ];
776 750
777 $self->realloc; 751 $self->realloc;
752
753 $self->emit (c_add => \@widgets);
754
755 map $_+0, @widgets
778} 756}
779 757
780sub children { 758sub children {
781 @{ $_[0]{children} } 759 @{ $_[0]{children} }
782} 760}
783 761
784sub remove { 762sub remove {
785 my ($self, $child) = @_; 763 my ($self, @widgets) = @_;
786 764
765 $self->emit (c_remove => \@widgets);
766
767 for my $child (@widgets) {
787 delete $child->{parent}; 768 delete $child->{parent};
788 $child->hide; 769 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
771 }
791 772
792 $self->realloc; 773 $self->realloc;
793} 774}
794 775
795sub clear { 776sub clear {
796 my ($self) = @_; 777 my ($self) = @_;
797 778
798 my $children = delete $self->{children}; 779 my $children = $self->{children};
799 $self->{children} = []; 780 $self->{children} = [];
800 781
801 for (@$children) { 782 for (@$children) {
802 delete $_->{parent}; 783 delete $_->{parent};
803 $_->hide; 784 $_->hide;
… …
823} 804}
824 805
825sub _draw { 806sub _draw {
826 my ($self) = @_; 807 my ($self) = @_;
827 808
828 $_->draw for @{$self->{children}}; 809 $_->draw for $self->visible_children;
829} 810}
830 811
831############################################################################# 812#############################################################################
832 813
833package CFPlus::UI::Bin; 814package DC::UI::Bin;
834 815
835our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
836 817
837sub new { 818sub new {
838 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
839 820
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 822
842 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
843} 824}
844 825
845sub add { 826sub add {
846 my ($self, $child) = @_; 827 my ($self, $child) = @_;
847 828
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 829 $self->clear;
849 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
850} 831}
851 832
852sub remove { 833sub remove {
853 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
854 835
855 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
856 837
857 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 839 unless @{$self->{children}};
859} 840}
860 841
861sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
862 843
… …
871 852
872 1 853 1
873} 854}
874 855
875############################################################################# 856#############################################################################
876
877# back-buffered drawing area 857# back-buffered drawing area
878 858
879package CFPlus::UI::Window; 859package DC::UI::Window;
880 860
881our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
882 862
883use CFPlus::OpenGL; 863use DC::OpenGL;
884 864
885sub new { 865sub new {
886 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
887 867
888 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
910} 890}
911 891
912sub render_child { 892sub render_child {
913 my ($self) = @_; 893 my ($self) = @_;
914 894
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
918 898
919 { 899 {
920 package CFPlus::UI::Base; 900 package DC::UI::Base;
921 901
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
924 904
925 $self->_render; 905 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
943} 923}
944 924
945############################################################################# 925#############################################################################
946 926
947package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
948 928
929use List::Util qw(min max);
930
949our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
950 932
951sub new { 933sub new {
952 my $class = shift; 934 my $class = shift;
953 935
954 $class->SUPER::new ( 936 $class->SUPER::new (
… …
961sub size_request { 943sub size_request {
962 my ($self) = @_; 944 my ($self) = @_;
963 945
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 946 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 947
966 $w = 10 if $self->{scroll_x}; 948 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 949 $h = 1 if $self->{scroll_y};
968 950
969 ($w, $h) 951 ($w, $h)
970} 952}
971 953
972sub invoke_size_allocate { 954sub invoke_size_allocate {
… …
984} 966}
985 967
986sub set_offset { 968sub set_offset {
987 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
988 970
971 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
972 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
973
974 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 975 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 976 $self->{view_y} = $y;
991 977
978 $self->emit (changed => $x, $y);
992 $self->update; 979 $self->update;
980 }
981}
982
983sub set_center {
984 my ($self, $x, $y) = @_;
985
986 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
987}
988
989sub make_visible {
990 my ($self, $x, $y, $border) = @_;
991
992 if ( $x < $self->{view_x} + $self->{w} * $border
993 || $x > $self->{view_x} + $self->{w} * (1 - $border)
994 || $y < $self->{view_y} + $self->{h} * $border
995 || $y > $self->{view_y} + $self->{h} * (1 - $border)
996 ) {
997 $self->set_center ($x, $y);
998 }
993} 999}
994 1000
995# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 1002sub coord2local {
997 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 1018 my ($self, $x, $y) = @_;
1013 1019
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1022 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 1024 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
1020 } 1026 }
1021} 1027}
1022 1028
1023sub _render { 1029sub _render {
1024 my ($self) = @_; 1030 my ($self) = @_;
1025 1031
1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1028 1034
1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1030 1036
1031 $self->SUPER::_render; 1037 $self->SUPER::_render;
1032} 1038}
1033 1039
1034############################################################################# 1040#############################################################################
1035 1041
1036package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
1037 1043
1038our @ISA = CFPlus::UI::Table::; 1044our @ISA = DC::UI::Table::;
1039 1045
1040sub new { 1046sub new {
1041 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1042 1048
1043 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1044 1050
1045 my $self; 1051 my $self;
1046 1052
1047 my $hslider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1054 c_col => 0,
1055 c_row => 1,
1048 vertical => 0, 1056 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1058 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1059 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1061 },
1054 ; 1062 ;
1055 1063
1056 my $vslider = new CFPlus::UI::Slider 1064 my $vslider = new DC::UI::Slider
1065 c_col => 1,
1066 c_row => 0,
1057 vertical => 1, 1067 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1069 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1070 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1071 col_expand => [1, 0], 1081 col_expand => [1, 0],
1072 row_expand => [1, 0], 1082 row_expand => [1, 0],
1073 %arg, 1083 %arg,
1074 ); 1084 );
1075 1085
1076 $self->{vp} = new CFPlus::UI::ViewPort 1086 $self->{vp} = new DC::UI::ViewPort
1087 c_col => 0,
1088 c_row => 0,
1077 expand => 1, 1089 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1090 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 1091 scroll_y => $self->{scroll_y},
1092 on_changed => sub {
1093 my ($vp, $x, $y) = @_;
1094
1095 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y);
1097
1098 0
1099 },
1100 on_size_allocate => sub {
1101 my ($vp, $w, $h) = @_;
1102 $vp->{parent}->update_slider;
1103 0
1104 },
1080 ; 1105 ;
1081 1106
1082 $self->SUPER::add (0, 0, $self->{vp}); 1107 $self->SUPER::add ($self->{vp});
1083 1108
1084 $self->add ($child) if $child; 1109 $self->add ($child) if $child;
1085 1110
1086 $self 1111 $self
1087} 1112}
1088
1089#TODO# update range on size_allocate depending on child
1090 1113
1091sub add { 1114sub add {
1092 my ($self, $widget) = @_; 1115 my ($self, $widget) = @_;
1093 1116
1094 $self->{vp}->add ($self->{child} = $widget); 1117 $self->{vp}->add ($self->{child} = $widget);
1095} 1118}
1096 1119
1120sub set_offset { shift->{vp}->set_offset (@_) }
1121sub set_center { shift->{vp}->set_center (@_) }
1122sub make_visible { shift->{vp}->make_visible (@_) }
1123
1124sub update_slider {
1125 my ($self) = @_;
1126
1127 my $child = ($self->{vp} or return)->child;
1128
1129 if ($self->{scroll_x}) {
1130 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1131 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1132
1133 my $visible = $w1 > $w2;
1134 if ($visible != $self->{hslider_visible}) {
1135 $self->{hslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{hslider})
1137 : $self->SUPER::remove ($self->{hslider});
1138 }
1139 }
1140
1141 if ($self->{scroll_y}) {
1142 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1143 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1144
1145 my $visible = $h1 > $h2;
1146 if ($visible != $self->{vslider_visible}) {
1147 $self->{vslider_visible} = $visible;
1148 $visible ? $self->SUPER::add ($self->{vslider})
1149 : $self->SUPER::remove ($self->{vslider});
1150 }
1151 }
1152}
1153
1154sub start_dragging {
1155 my ($self, $ev) = @_;
1156
1157 $self->grab_focus;
1158
1159 my $ox = $self->{vp}{view_x};
1160 my $oy = $self->{vp}{view_y};
1161
1162 $self->{motion} = sub {
1163 my ($ev, $x, $y) = @_;
1164
1165 $ox -= $ev->{xrel};
1166 $oy -= $ev->{yrel};
1167
1168 $self->{vp}->set_offset ($ox, $oy);
1169 };
1170}
1171
1097sub invoke_mouse_wheel { 1172sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_; 1173 my ($self, $ev) = @_;
1099 1174
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev); 1175 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1176 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1103 1177
1104 1 1178 1
1105} 1179}
1106 1180
1107sub update_slider { 1181sub invoke_button_down {
1108 my ($self) = @_; 1182 my ($self, $ev, $x, $y) = @_;
1109 1183
1110 my $child = ($self->{vp} or return)->child; 1184 if ($ev->{button} == 2) {
1185 $self->start_dragging ($ev);
1186 return 1;
1187 }
1111 1188
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 } 1189 0
1190}
1120 1191
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1192sub invoke_button_up {
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1193 my ($self, $ev, $x, $y) = @_;
1123 1194
1124 my $visible = $h1 > $h2; 1195 if (delete $self->{motion}) {
1125 if ($visible != $self->{vslider}{visible}) { 1196 return 1;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1197 }
1127 : $self->{vslider}->hide; 1198
1128 } 1199 0
1129} 1200}
1130 1201
1131sub update { 1202sub invoke_mouse_motion {
1132 my ($self) = @_; 1203 my ($self, $ev, $x, $y) = @_;
1133 1204
1134 $self->SUPER::update; 1205 if ($self->{motion}) {
1135 $self->update_slider; 1206 $self->{motion}->($ev, $x, $y);
1207 return 1;
1208 }
1209
1210 0
1136} 1211}
1137 1212
1138sub invoke_size_allocate { 1213sub invoke_size_allocate {
1139 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1140 1215
… …
1142 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1143} 1218}
1144 1219
1145############################################################################# 1220#############################################################################
1146 1221
1147package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1148 1223
1149our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1150 1225
1151use CFPlus::OpenGL; 1226use DC::OpenGL;
1152 1227
1153sub new { 1228sub new {
1154 my $class = shift; 1229 my $class = shift;
1155 1230
1156 $class->SUPER::new ( 1231 $class->SUPER::new (
… …
1166 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1167 1242
1168 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1169 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1170 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1171
1172 glBegin GL_QUADS;
1173 glVertex 0 , 0;
1174 glVertex 0 , $h;
1175 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1176 glVertex $w, 0;
1177 glEnd;
1178
1179 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1180 } 1248 }
1181 1249
1182 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1183} 1251}
1184 1252
1185############################################################################# 1253#############################################################################
1186 1254
1187package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1188 1256
1189our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1190 1258
1191use CFPlus::OpenGL; 1259use DC::OpenGL;
1192 1260
1193sub new { 1261sub new {
1194 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1195 1263
1196 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1198 align => 1, 1266 align => 1,
1199 valign => 0, 1267 valign => 0.5,
1200 text => $arg{label}, 1268 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1202 } 1270 }
1203 1271
1204 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1205 # label => "", 1273 # label => "",
1206 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1207 border => 0.8, 1275 border => 0.8,
1208 style => 'single', 1276 style => 'single',
1209 %arg, 1277 %arg,
1210 ); 1278 );
1211 1279
… …
1214 1282
1215sub add { 1283sub add {
1216 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1217 1285
1218 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1220} 1288}
1221 1289
1222sub border { 1290sub border {
1223 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1224} 1292}
… …
1264 my $border = $self->border; 1332 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1266 1334
1267 $child->draw; 1335 $child->draw;
1268 1336
1269 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1270 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1282 } 1350 }
1283} 1351}
1284 1352
1285############################################################################# 1353#############################################################################
1286 1354
1287package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1288 1356
1289our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1290 1358
1291use CFPlus::OpenGL; 1359use DC::OpenGL;
1292 1360
1293my $bg = 1361my $bg =
1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1295 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1296 1364
1297my @border = 1365my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 map { new_from_resource DC::Texture $_, mipmap => 1 }
1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1368
1369my @icon =
1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1371 qw(x1_move.png x1_resize.png);
1300 1372
1301sub new { 1373sub new {
1302 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1303 1375
1304 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1305 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1306 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1307 border => 0.6, 1379 border => 0.8,
1308 can_events => 1, 1380 can_events => 1,
1309 min_w => 64, 1381 min_w => 64,
1310 min_h => 32, 1382 min_h => 32,
1311 %arg, 1383 %arg,
1312 ); 1384 );
1313 1385
1314 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1315 align => 0, 1387 align => 0.5,
1316 valign => 1, 1388 valign => 1,
1317 text => $self->{title}, 1389 text => $self->{title},
1318 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1319 if exists $self->{title}; 1391 if exists $self->{title};
1320 1392
1321 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1322 $self->{close_button} = 1394 $self->{close_button} =
1323 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1324 path => 'x1_close.png', 1396 path => 'x1_close.png',
1325 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1326 1398
1327 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1328 } 1400 }
1329 1401
1330 $self 1402 $self
1331} 1403}
1332 1404
1333sub add { 1405sub add {
1334 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1335 1407
1336 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1337 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1339} 1411}
1340 1412
1341sub border { 1413sub border {
1342 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1415}
1416
1417sub get_max_wh {
1418 my ($self) = @_;
1419
1420 return ($self->{w}, $self->{h})
1421 if $self->{visible} && $self->{w};
1422
1423 $self->SUPER::get_max_wh
1343} 1424}
1344 1425
1345sub size_request { 1426sub size_request {
1346 my ($self) = @_; 1427 my ($self) = @_;
1347 1428
… …
1472 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1473 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1474 1555
1475 my $border = $self->border; 1556 my $border = $self->border;
1476 1557
1558 if ($border) {
1477 glColor @{ $self->{border_bg} }; 1559 glColor @{ $self->{border_bg} };
1478 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1560 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1479 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1561 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1480 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1562 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1481 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1563 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1564
1565 # move
1566 my $w2 = ($w - $border) * .5;
1567 my $h2 = ($h - $border) * .5;
1568 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1569 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1570 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1571
1572 # resize
1573 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1574 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1575 unless $self->{has_close_button};
1576 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1577 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1578 }
1482 1579
1483 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1580 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1484 glColor @{ $self->{bg} }; 1581 glColor @{ $self->{bg} };
1485 1582
1486 # TODO: repeat texture not scale 1583 # TODO: repeat texture not scale
… …
1505 if $self->{close_button}; 1602 if $self->{close_button};
1506} 1603}
1507 1604
1508############################################################################# 1605#############################################################################
1509 1606
1510package CFPlus::UI::Table; 1607package DC::UI::Table;
1511 1608
1512our @ISA = CFPlus::UI::Base::; 1609our @ISA = DC::UI::Container::;
1513 1610
1514use List::Util qw(max sum); 1611use List::Util qw(max sum);
1515 1612
1516use CFPlus::OpenGL; 1613use DC::OpenGL;
1517 1614
1518sub new { 1615sub new {
1519 my $class = shift; 1616 my $class = shift;
1520 1617
1521 $class->SUPER::new ( 1618 $class->SUPER::new (
1522 children => [],
1523 col_expand => [], 1619 col_expand => [],
1524 row_expand => [], 1620 row_expand => [],
1525 @_, 1621 @_,
1526 ) 1622 )
1527} 1623}
1528 1624
1529sub children {
1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1531}
1532
1533# TODO: store row/col info in child widget and use standard add/del
1534sub add { 1625sub add {
1626 my ($self, @widgets) = @_;
1627
1628 for my $child (@widgets) {
1629 $child->{c_rowspan} ||= 1;
1630 $child->{c_colspan} ||= 1;
1631 }
1632
1633 $self->SUPER::add (@widgets);
1634}
1635
1636sub add_at {
1535 my ($self) = shift; 1637 my $self = shift;
1638
1639 my @widgets;
1536 1640
1537 while (@_) { 1641 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, (); 1642 my ($col, $row, $child) = splice @_, 0, 3, ();
1539 $child->set_parent ($self);
1540 $self->{children}[$y][$x] = $child;
1541 }
1542 1643
1543 $self->{force_realloc} = 1; 1644 $child->{c_row} = $row;
1544 $self->{force_size_alloc} = 1; 1645 $child->{c_col} = $col;
1545 $self->realloc;
1546}
1547 1646
1548sub remove { 1647 push @widgets, $child;
1648 }
1649
1650 $self->add (@widgets);
1651}
1652
1653sub get_wh {
1549 my ($self, $child) = @_; 1654 my ($self) = @_;
1550 1655
1551 for (@{ $self->{children} }) { 1656 my (@w, @h);
1552 for (@{ $_ || [] }) { 1657
1553 $_ = undef if $_ == $child; 1658 my @children = $self->children;
1659
1660 # first pass, columns
1661 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1662 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1663
1664 my $sw = sum @w[$c .. $c + $cs - 1];
1665
1666 if ($w > $sw) {
1667 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1554 } 1668 }
1555 } 1669 }
1556}
1557 1670
1558# TODO: move to container class maybe? send children a signal on removal? 1671 # second pass, rows
1559sub clear { 1672 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1560 my ($self) = @_;
1561
1562 my @children = $self->children;
1563 delete $self->{children};
1564
1565 for (@children) {
1566 delete $_->{parent};
1567 $_->hide;
1568 }
1569
1570 $self->realloc;
1571}
1572
1573sub get_wh {
1574 my ($self) = @_;
1575
1576 my (@w, @h);
1577
1578 for my $y (0 .. $#{$self->{children}}) {
1579 my $row = $self->{children}[$y]
1580 or next;
1581
1582 for my $x (0 .. $#$row) {
1583 my $widget = $row->[$x]
1584 or next;
1585 my ($w, $h) = @$widget{qw(req_w req_h)}; 1673 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1586 1674
1587 $w[$x] = max $w[$x], $w; 1675 my $sh = sum @h[$r .. $r + $rs - 1];
1588 $h[$y] = max $h[$y], $h; 1676
1677 if ($h > $sh) {
1678 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1589 } 1679 }
1590 } 1680 }
1591 1681
1592 (\@w, \@h) 1682 (\@w, \@h)
1593} 1683}
… …
1609 my ($ws, $hs) = $self->get_wh; 1699 my ($ws, $hs) = $self->get_wh;
1610 1700
1611 my $req_w = (sum @$ws) || 1; 1701 my $req_w = (sum @$ws) || 1;
1612 my $req_h = (sum @$hs) || 1; 1702 my $req_h = (sum @$hs) || 1;
1613 1703
1614 # TODO: nicer code 1704 # now linearly scale the rows/columns to the allocated size
1615 my @col_expand = @{$self->{col_expand}}; 1705 my @col_expand = @{$self->{col_expand}};
1616 @col_expand = (1) x @$ws unless @col_expand; 1706 @col_expand = (1) x @$ws unless @col_expand;
1617 my $col_expand = (sum @col_expand) || 1; 1707 my $col_expand = (sum @col_expand) || 1;
1618 1708
1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1709 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1620 1710
1621 CFPlus::UI::harmonize $ws; 1711 DC::UI::harmonize $ws;
1622 1712
1623 my @row_expand = @{$self->{row_expand}}; 1713 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand; 1714 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1; 1715 my $row_expand = (sum @row_expand) || 1;
1626 1716
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1717 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628 1718
1629 CFPlus::UI::harmonize $hs; 1719 DC::UI::harmonize $hs;
1630 1720
1631 my $y; 1721 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1722 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1632 1723
1633 for my $r (0 .. $#{$self->{children}}) { 1724 for my $widget ($self->children) {
1634 my $row = $self->{children}[$r] 1725 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1635 or next;
1636 1726
1637 my $x = 0; 1727 $widget->configure (
1638 my $row_h = $hs->[$r]; 1728 $x[$c], $y[$r],
1729 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1639 1730 );
1640 for my $c (0 .. $#$row) {
1641 my $col_w = $ws->[$c];
1642
1643 if (my $widget = $row->[$c]) {
1644 $widget->configure ($x, $y, $col_w, $row_h);
1645 }
1646
1647 $x += $col_w;
1648 }
1649
1650 $y += $row_h;
1651 } 1731 }
1652 1732
1653 1 1733 1
1654} 1734}
1655 1735
1656sub find_widget {
1657 my ($self, $x, $y) = @_;
1658
1659 $x -= $self->{x};
1660 $y -= $self->{y};
1661
1662 my $res;
1663
1664 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1665 $res = $_->find_widget ($x, $y)
1666 and return $res;
1667 }
1668
1669 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1670}
1671
1672sub _draw {
1673 my ($self) = @_;
1674
1675 for (grep $_, @{$self->{children}}) {
1676 $_->draw for grep $_, @$_;
1677 }
1678}
1679
1680############################################################################# 1736#############################################################################
1681 1737
1682package CFPlus::UI::Fixed; 1738package DC::UI::Fixed;
1683 1739
1684use List::Util qw(min max); 1740use List::Util qw(min max);
1685 1741
1686our @ISA = CFPlus::UI::Container::; 1742our @ISA = DC::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694 1743
1695sub _scale($$$) { 1744sub _scale($$$) {
1696 my ($mode, $val, $max) = @_; 1745 my ($rel, $val, $max) = @_;
1697 1746
1698 $mode eq "abs" ? $val 1747 $rel ? $val * $max : $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701} 1748}
1702 1749
1703sub size_request { 1750sub size_request {
1704 my ($self) = @_; 1751 my ($self) = @_;
1705 1752
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707 1754
1708 # determine overall size by querying abs widgets 1755 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) { 1756 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1757 unless ($child->{c_rel}) {
1758 my $x = $child->{c_x};
1759 my $y = $child->{c_y};
1711 1760
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1761 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1762 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1718 } 1763 }
1719 } 1764 }
1720 1765
1721 my $W = $x2 - $x1; 1766 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1; 1767 my $H = $y2 - $y1;
1723 1768
1724 # now layout remaining widgets 1769 # now layout remaining widgets
1725 for my $child ($self->visible_children) { 1770 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1771 if ($child->{c_rel}) {
1772 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1773 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1727 1774
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 } 1777 }
1737 } 1778 }
1738 1779
1739 my $W = $x2 - $x1; 1780 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1; 1781 my $H = $y2 - $y1;
… …
1744 1785
1745sub invoke_size_allocate { 1786sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_; 1787 my ($self, $W, $H) = @_;
1747 1788
1748 for my $child ($self->visible_children) { 1789 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1790 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1791 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1750 1792
1751 $x = _scale $pos, $x, $W; 1793 $x += $child->{c_halign} * $child->{req_w};
1752 $y = _scale $pos, $x, $H; 1794 $y += $child->{c_valign} * $child->{req_h};
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755 1795
1756 $child->configure ($x, $y, $w, $h); 1796 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1757 } 1797 }
1758 1798
1759 1 1799 1
1760} 1800}
1761 1801
1762############################################################################# 1802#############################################################################
1763 1803
1764package CFPlus::UI::Box; 1804package DC::UI::Box;
1765 1805
1766our @ISA = CFPlus::UI::Container::; 1806our @ISA = DC::UI::Container::;
1767 1807
1768sub size_request { 1808sub size_request {
1769 my ($self) = @_; 1809 my ($self) = @_;
1810
1811 my @children = $self->visible_children;
1770 1812
1771 $self->{vertical} 1813 $self->{vertical}
1772 ? ( 1814 ? (
1773 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1815 (List::Util::max map $_->{req_w}, @children),
1774 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1816 (List::Util::sum map $_->{req_h}, @children),
1775 ) 1817 )
1776 : ( 1818 : (
1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1819 (List::Util::sum map $_->{req_w}, @children),
1778 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1820 (List::Util::max map $_->{req_h}, @children),
1779 ) 1821 )
1780} 1822}
1781 1823
1782sub invoke_size_allocate { 1824sub invoke_size_allocate {
1783 my ($self, $w, $h) = @_; 1825 my ($self, $w, $h) = @_;
… …
1804 $req[$_] += $space * $children[$_]{expand} 1846 $req[$_] += $space * $children[$_]{expand}
1805 for 0 .. $#children; 1847 for 0 .. $#children;
1806 } 1848 }
1807 } 1849 }
1808 1850
1809 CFPlus::UI::harmonize \@req; 1851 DC::UI::harmonize \@req;
1810 1852
1811 my $pos = 0; 1853 my $pos = 0;
1812 for (0 .. $#children) { 1854 for (0 .. $#children) {
1813 my $alloc = $req[$_]; 1855 my $alloc = $req[$_];
1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1856 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1819 1 1861 1
1820} 1862}
1821 1863
1822############################################################################# 1864#############################################################################
1823 1865
1824package CFPlus::UI::HBox; 1866package DC::UI::HBox;
1825 1867
1826our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1827 1869
1828sub new { 1870sub new {
1829 my $class = shift; 1871 my $class = shift;
1830 1872
1831 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1834 ) 1876 )
1835} 1877}
1836 1878
1837############################################################################# 1879#############################################################################
1838 1880
1839package CFPlus::UI::VBox; 1881package DC::UI::VBox;
1840 1882
1841our @ISA = CFPlus::UI::Box::; 1883our @ISA = DC::UI::Box::;
1842 1884
1843sub new { 1885sub new {
1844 my $class = shift; 1886 my $class = shift;
1845 1887
1846 $class->SUPER::new ( 1888 $class->SUPER::new (
… …
1849 ) 1891 )
1850} 1892}
1851 1893
1852############################################################################# 1894#############################################################################
1853 1895
1854package CFPlus::UI::Label; 1896package DC::UI::Label;
1855 1897
1856our @ISA = CFPlus::UI::DrawBG::; 1898our @ISA = DC::UI::DrawBG::;
1857 1899
1858use CFPlus::OpenGL; 1900use DC::OpenGL;
1859 1901
1860sub new { 1902sub new {
1861 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1862 1904
1863 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
… …
1868 #text => initial text 1910 #text => initial text
1869 #markup => initial narkup 1911 #markup => initial narkup
1870 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1871 #style => 0, # render flags 1913 #style => 0, # render flags
1872 ellipsise => 3, # end 1914 ellipsise => 3, # end
1873 layout => (new CFPlus::Layout), 1915 layout => (new DC::Layout),
1874 fontsize => 1, 1916 fontsize => 1,
1875 align => -1, 1917 align => 0.5,
1876 valign => -1, 1918 valign => 0.5,
1877 padding_x => 2, 1919 padding_x => 4,
1878 padding_y => 2, 1920 padding_y => 2,
1879 can_events => 0, 1921 can_events => 0,
1880 %arg 1922 %arg
1881 ); 1923 );
1882 1924
1883 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1884 my $layout = new CFPlus::Layout; 1926 my $layout = new DC::Layout;
1885 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1886 $self->{template} = $layout; 1928 $self->{template} = $layout;
1887 } 1929 }
1888 1930
1889 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
… …
1907 1949
1908 delete $self->{ox}; 1950 delete $self->{ox};
1909 $self->SUPER::realloc; 1951 $self->SUPER::realloc;
1910} 1952}
1911 1953
1954sub clear {
1955 my ($self) = @_;
1956
1957 $self->set_text ("");
1958}
1959
1912sub set_text { 1960sub set_text {
1913 my ($self, $text) = @_; 1961 my ($self, $text) = @_;
1914 1962
1915 return if $self->{text} eq "T$text"; 1963 return if $self->{text} eq "T$text";
1916 $self->{text} = "T$text"; 1964 $self->{text} = "T$text";
… …
1939 1987
1940sub size_request { 1988sub size_request {
1941 my ($self) = @_; 1989 my ($self) = @_;
1942 1990
1943 $self->{size_req} ||= do { 1991 $self->{size_req} ||= do {
1992 my ($max_w, $max_h) = $self->get_max_wh;
1993
1944 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1994 $self->{layout}->set_font ($self->{font}) if $self->{font};
1945 $self->{layout}->set_width ($self->{max_w} || -1); 1995 $self->{layout}->set_width ($max_w);
1946 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1996 $self->{layout}->set_ellipsise ($self->{ellipsise});
1947 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1997 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1948 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1998 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1949 1999
1950 my ($w, $h) = $self->{layout}->size; 2000 my ($w, $h) = $self->{layout}->size;
1951 2001
1952 if (exists $self->{template}) { 2002 if (exists $self->{template}) {
1953 $self->{template}->set_font ($self->{font}) if $self->{font}; 2003 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1); 2004 $self->{template}->set_width ($max_w);
1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2005 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1956 2006
1957 my ($w2, $h2) = $self->{template}->size; 2007 my ($w2, $h2) = $self->{template}->size;
1958 2008
1959 $w = List::Util::max $w, $w2; 2009 $w = List::Util::max $w, $w2;
… …
2015 2065
2016 [$self->{layout}->size] 2066 [$self->{layout}->size]
2017 }; 2067 };
2018 2068
2019 unless (exists $self->{ox}) { 2069 unless (exists $self->{ox}) {
2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2070 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2071 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2022 : ($self->{w} - $size->[0]) * 0.5);
2023 2072
2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2073 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2026 : ($self->{h} - $size->[1]) * 0.5);
2027 }; 2074 };
2028 2075
2029 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2076# unless ($self->{list}) {
2030 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2077# $self->{list} = DC::OpenGL::glGenList;
2031 2078# DC::OpenGL::glNewList $self->{list};
2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2079# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2080# DC::OpenGL::glEndList;
2081# }
2082#
2083# DC::OpenGL::glCallList $self->{list};
2084
2085 $self->{layout}->draw;
2033} 2086}
2087
2088#sub destroy {
2089# my ($self) = @_;
2090#
2091# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2092#
2093# $self->SUPER::destroy;
2094#}
2034 2095
2035############################################################################# 2096#############################################################################
2036 2097
2037package CFPlus::UI::EntryBase; 2098package DC::UI::EntryBase;
2038 2099
2039our @ISA = CFPlus::UI::Label::; 2100our @ISA = DC::UI::Label::;
2040 2101
2041use CFPlus::OpenGL; 2102use DC::OpenGL;
2042 2103
2043sub new { 2104sub new {
2044 my $class = shift; 2105 my $class = shift;
2045 2106
2046 $class->SUPER::new ( 2107 $class->SUPER::new (
2047 fg => [1, 1, 1], 2108 fg => [1, 1, 1],
2048 bg => [0, 0, 0, 0.2], 2109 bg => [0, 0, 0, 0.2],
2110 outline => undef,
2049 active_bg => [1, 1, 1, 0.5], 2111 active_bg => [0, 0, 1, .2],
2050 active_fg => [0, 0, 0], 2112 active_fg => [1, 1, 1],
2113 active_outline => [1, 1, 0],
2051 can_hover => 1, 2114 can_hover => 1,
2052 can_focus => 1, 2115 can_focus => 1,
2116 align => 0,
2053 valign => 0, 2117 valign => 0.5,
2054 can_events => 1, 2118 can_events => 1,
2055 ellipsise => 0, 2119 ellipsise => 0,
2120 padding_x => 4,
2121 padding_y => 2,
2056 #text => ... 2122 #text => ...
2057 #hidden => "*", 2123 #hidden => "*",
2058 @_ 2124 @_
2059 ) 2125 )
2060} 2126}
… …
2107 2173
2108 my $text = $self->get_text; 2174 my $text = $self->get_text;
2109 2175
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2176 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2111 2177
2112 if ($uni == 8) { 2178 if ($sym == DC::SDLK_BACKSPACE) {
2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2179 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2114 } elsif ($uni == 127) { 2180 } elsif ($sym == DC::SDLK_DELETE) {
2115 substr $text, $self->{cursor}, 1, ""; 2181 substr $text, $self->{cursor}, 1, "";
2116 } elsif ($sym == CFPlus::SDLK_LEFT) { 2182 } elsif ($sym == DC::SDLK_LEFT) {
2117 --$self->{cursor} if $self->{cursor}; 2183 --$self->{cursor} if $self->{cursor};
2118 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2184 } elsif ($sym == DC::SDLK_RIGHT) {
2119 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2185 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2120 } elsif ($sym == CFPlus::SDLK_HOME) { 2186 } elsif ($sym == DC::SDLK_HOME) {
2121 # what a hack 2187 # what a hack
2122 $self->{cursor} = 2188 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2189 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1 2190 ? length $1
2125 : 0; 2191 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) { 2192 } elsif ($sym == DC::SDLK_END) {
2127 # uh, again 2193 # uh, again
2128 $self->{cursor} = 2194 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2195 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1 2196 ? $self->{cursor} + length $1
2131 : length $self->{text}; 2197 : length $self->{text};
… …
2195 glColor_premultiply @{$self->{bg}}; 2261 glColor_premultiply @{$self->{bg}};
2196 } 2262 }
2197 2263
2198 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2199 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2265 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2200 glBegin GL_QUADS;
2201 glVertex 0 , 0;
2202 glVertex 0 , $self->{h};
2203 glVertex $self->{w}, $self->{h}; 2266 glRect 0, 0, $self->{w}, $self->{h};
2204 glVertex $self->{w}, 0;
2205 glEnd;
2206 glDisable GL_BLEND; 2267 glDisable GL_BLEND;
2207 2268
2208 $self->SUPER::_draw; 2269 $self->SUPER::_draw;
2209 2270
2210 #TODO: force update every cursor change :( 2271 #TODO: force update every cursor change :(
… …
2212 2273
2213 unless (exists $self->{cur_h}) { 2274 unless (exists $self->{cur_h}) {
2214 my $text = substr $self->{text}, 0, $self->{cursor}; 2275 my $text = substr $self->{text}, 0, $self->{cursor};
2215 utf8::encode $text; 2276 utf8::encode $text;
2216 2277
2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2278 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2218 } 2279 }
2219 2280
2281 glColor_premultiply @{$self->{active_fg}};
2220 glBegin GL_LINES; 2282 glBegin GL_LINES;
2221 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2284 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2223 glEnd; 2285 glEnd;
2286
2287 glLineWidth 3;
2288 glColor @{$self->{active_outline}};
2289 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2290 glLineWidth 1;
2291
2292 } else {
2293 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2294 glBegin GL_LINE_STRIP;
2295 glVertex .5, $self->{h} * .5;
2296 glVertex .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} - 2.5;
2298 glVertex $self->{w} - .5, $self->{h} * .5;
2299 glEnd;
2224 } 2300 }
2225} 2301}
2226 2302
2227############################################################################# 2303#############################################################################
2228 2304
2229package CFPlus::UI::Entry; 2305package DC::UI::Entry;
2230 2306
2231our @ISA = CFPlus::UI::EntryBase::; 2307our @ISA = DC::UI::EntryBase::;
2232 2308
2233use CFPlus::OpenGL; 2309use DC::OpenGL;
2310
2311sub new {
2312 my $class = shift;
2313
2314 $class->SUPER::new (
2315 history_pointer => -1,
2316 @_
2317 )
2318}
2319
2234 2320
2235sub invoke_key_down { 2321sub invoke_key_down {
2236 my ($self, $ev) = @_; 2322 my ($self, $ev) = @_;
2237 2323
2238 my $sym = $ev->{sym}; 2324 my $sym = $ev->{sym};
… …
2244 $self->{history_pointer} = -1; 2330 $self->{history_pointer} = -1;
2245 $self->{history_saveback} = ''; 2331 $self->{history_saveback} = '';
2246 $self->emit (activate => $txt); 2332 $self->emit (activate => $txt);
2247 $self->update; 2333 $self->update;
2248 2334
2249 } elsif ($sym == CFPlus::SDLK_UP) { 2335 } elsif ($sym == DC::SDLK_UP) {
2250 if ($self->{history_pointer} < 0) { 2336 if ($self->{history_pointer} < 0) {
2251 $self->{history_saveback} = $self->get_text; 2337 $self->{history_saveback} = $self->get_text;
2252 } 2338 }
2253 if (@{$self->{history} || []} > 0) { 2339 if (@{$self->{history} || []} > 0) {
2254 $self->{history_pointer}++; 2340 $self->{history_pointer}++;
… …
2256 $self->{history_pointer} = @{$self->{history} || []} - 1; 2342 $self->{history_pointer} = @{$self->{history} || []} - 1;
2257 } 2343 }
2258 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2259 } 2345 }
2260 2346
2261 } elsif ($sym == CFPlus::SDLK_DOWN) { 2347 } elsif ($sym == DC::SDLK_DOWN) {
2262 $self->{history_pointer}--; 2348 $self->{history_pointer}--;
2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2349 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2264 2350
2265 if ($self->{history_pointer} >= 0) { 2351 if ($self->{history_pointer} >= 0) {
2266 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2352 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2267 } else { 2353 } else {
2354 if (defined $self->{history_saveback}) {
2268 $self->set_text ($self->{history_saveback}); 2355 $self->set_text ($self->{history_saveback});
2356 $self->{history_saveback} = undef;
2357 }
2269 } 2358 }
2270 2359
2271 } else { 2360 } else {
2272 return $self->SUPER::invoke_key_down ($ev) 2361 return $self->SUPER::invoke_key_down ($ev)
2273 } 2362 }
… …
2275 1 2364 1
2276} 2365}
2277 2366
2278############################################################################# 2367#############################################################################
2279 2368
2280package CFPlus::UI::TextEdit; 2369package DC::UI::TextEdit;
2281 2370
2282our @ISA = CFPlus::UI::EntryBase::; 2371our @ISA = DC::UI::EntryBase::;
2283 2372
2284use CFPlus::OpenGL; 2373use DC::OpenGL;
2374
2375sub new {
2376 my $class = shift;
2377
2378 $class->SUPER::new (
2379 padding_y => 4,
2380
2381 @_
2382 )
2383}
2285 2384
2286sub move_cursor_ver { 2385sub move_cursor_ver {
2287 my ($self, $dy) = @_; 2386 my ($self, $dy) = @_;
2288 2387
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2388 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290 2389
2291 $y += $dy; 2390 $line += $dy;
2292 2391
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2392 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2294 $self->{cursor} = $index; 2393 $self->{cursor} = $index;
2295 delete $self->{cur_h}; 2394 delete $self->{cur_h};
2296 $self->update; 2395 $self->update;
2297 return; 2396 return;
2298 } 2397 }
… …
2301sub invoke_key_down { 2400sub invoke_key_down {
2302 my ($self, $ev) = @_; 2401 my ($self, $ev) = @_;
2303 2402
2304 my $sym = $ev->{sym}; 2403 my $sym = $ev->{sym};
2305 2404
2306 if ($sym == CFPlus::SDLK_UP) { 2405 if ($sym == DC::SDLK_UP) {
2307 $self->move_cursor_ver (-1); 2406 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) { 2407 } elsif ($sym == DC::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1); 2408 $self->move_cursor_ver (+1);
2310 } else { 2409 } else {
2311 return $self->SUPER::invoke_key_down ($ev) 2410 return $self->SUPER::invoke_key_down ($ev)
2312 } 2411 }
2313 2412
2314 1 2413 1
2315} 2414}
2316 2415
2317############################################################################# 2416#############################################################################
2318 2417
2319package CFPlus::UI::Button; 2418package DC::UI::ButtonBin;
2320 2419
2321our @ISA = CFPlus::UI::Label::; 2420our @ISA = DC::UI::Bin::;
2322 2421
2323use CFPlus::OpenGL; 2422use DC::OpenGL;
2324 2423
2325my @tex = 2424my @tex =
2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2425 map { new_from_resource DC::Texture $_, mipmap => 1 }
2327 qw(b1_button_active.png); 2426 qw(b1_button_inactive.png b1_button_active.png);
2328 2427
2329sub new { 2428sub new {
2330 my $class = shift; 2429 my $class = shift;
2331 2430
2332 $class->SUPER::new ( 2431 $class->SUPER::new (
2333 padding_x => 4,
2334 padding_y => 4,
2335 fg => [1, 1, 1],
2336 active_fg => [0, 0, 1],
2337 can_hover => 1, 2432 can_hover => 1,
2338 align => 0, 2433 align => 0.5,
2339 valign => 0, 2434 valign => 0.5,
2340 can_events => 1, 2435 can_events => 1,
2341 @_ 2436 @_
2342 ) 2437 )
2343} 2438}
2344 2439
… …
2353} 2448}
2354 2449
2355sub _draw { 2450sub _draw {
2356 my ($self) = @_; 2451 my ($self) = @_;
2357 2452
2358 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2359
2360 glEnable GL_TEXTURE_2D; 2453 glEnable GL_TEXTURE_2D;
2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2454 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362 glColor 0, 0, 0, 1; 2455 glColor 0, 0, 0, 1;
2363 2456
2457 my $tex = $tex[$GRAB == $self];
2364 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2458 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 2459
2366 glDisable GL_TEXTURE_2D; 2460 glDisable GL_TEXTURE_2D;
2367 2461
2368 $self->SUPER::_draw; 2462 $self->SUPER::_draw;
2369} 2463}
2370 2464
2371############################################################################# 2465#############################################################################
2372 2466
2373package CFPlus::UI::CheckBox; 2467package DC::UI::Button;
2374 2468
2375our @ISA = CFPlus::UI::DrawBG::; 2469our @ISA = DC::UI::Label::;
2470
2471use DC::OpenGL;
2376 2472
2377my @tex = 2473my @tex =
2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2474 map { new_from_resource DC::Texture $_, mipmap => 1 }
2379 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2475 qw(b1_button_inactive.png b1_button_active.png);
2380
2381use CFPlus::OpenGL;
2382 2476
2383sub new { 2477sub new {
2384 my $class = shift; 2478 my $class = shift;
2385 2479
2386 $class->SUPER::new ( 2480 $class->SUPER::new (
2481 padding_x => 8,
2482 padding_y => 4,
2483 fg => [1.0, 1.0, 1.0],
2484 active_fg => [0.8, 0.8, 0.8],
2485 can_hover => 1,
2486 align => 0.5,
2487 valign => 0.5,
2488 can_events => 1,
2489 @_
2490 )
2491}
2492
2493sub invoke_button_up {
2494 my ($self, $ev, $x, $y) = @_;
2495
2496 $self->emit ("activate")
2497 if $x >= 0 && $x < $self->{w}
2498 && $y >= 0 && $y < $self->{h};
2499
2500 1
2501}
2502
2503sub _draw {
2504 my ($self) = @_;
2505
2506 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2507
2508 glEnable GL_TEXTURE_2D;
2509 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2510 glColor 0, 0, 0, 1;
2511
2512 my $tex = $tex[$GRAB == $self];
2513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2514
2515 glDisable GL_TEXTURE_2D;
2516
2517 $self->SUPER::_draw;
2518}
2519
2520#############################################################################
2521
2522package DC::UI::CheckBox;
2523
2524our @ISA = DC::UI::DrawBG::;
2525
2526my @tex =
2527 map { new_from_resource DC::Texture $_, mipmap => 1 }
2528 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2529
2530use DC::OpenGL;
2531
2532sub new {
2533 my $class = shift;
2534
2535 $class->SUPER::new (
2536 fontsize => 1,
2387 padding_x => 2, 2537 padding_x => 2,
2388 padding_y => 2, 2538 padding_y => 2,
2389 fg => [1, 1, 1], 2539 fg => [1, 1, 1],
2390 active_fg => [1, 1, 0], 2540 active_fg => [1, 1, 0],
2391 bg => [0, 0, 0, 0.2], 2541 bg => [0, 0, 0, 0.2],
… …
2397} 2547}
2398 2548
2399sub size_request { 2549sub size_request {
2400 my ($self) = @_; 2550 my ($self) = @_;
2401 2551
2402 (6) x 2 2552 ($self->{fontsize} * $::FONTSIZE) x 2
2403} 2553}
2404 2554
2405sub toggle { 2555sub toggle {
2406 my ($self) = @_; 2556 my ($self) = @_;
2407 2557
… …
2426sub _draw { 2576sub _draw {
2427 my ($self) = @_; 2577 my ($self) = @_;
2428 2578
2429 $self->SUPER::_draw; 2579 $self->SUPER::_draw;
2430 2580
2431 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2581 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2432 2582
2433 my ($w, $h) = @$self{qw(w h)}; 2583 my ($w, $h) = @$self{qw(w h)};
2434 2584
2435 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2585 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2436 2586
… …
2443 glDisable GL_TEXTURE_2D; 2593 glDisable GL_TEXTURE_2D;
2444} 2594}
2445 2595
2446############################################################################# 2596#############################################################################
2447 2597
2448package CFPlus::UI::Image; 2598package DC::UI::Image;
2449 2599
2450our @ISA = CFPlus::UI::Base::; 2600our @ISA = DC::UI::DrawBG::;
2451 2601
2452use CFPlus::OpenGL; 2602use DC::OpenGL;
2453 2603
2454our %texture_cache; 2604our %texture_cache;
2455 2605
2456sub new { 2606sub new {
2457 my $class = shift; 2607 my $class = shift;
2458 2608
2459 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2460 can_events => 0, 2610 can_events => 0,
2611 scale => 1,
2461 @_, 2612 @_,
2462 ); 2613 );
2463 2614
2464 $self->{path} || $self->{tex} 2615 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required"; 2616 or Carp::croak "'path' or 'tex' attributes required";
2466 2617
2467 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2618 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2619 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2469 2620
2470 CFPlus::weaken $texture_cache{$self->{path}}; 2621 DC::weaken $texture_cache{$self->{path}};
2471 2622
2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2623 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2473 2624
2474 $self 2625 $self
2475} 2626}
2476 2627
2477sub STORABLE_freeze { 2628sub STORABLE_freeze {
2478 my ($self, $cloning) = @_; 2629 my ($self, $cloning) = @_;
2479 2630
2480 $self->{path} 2631 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2632 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2482 2633
2483 $self->{path} 2634 $self->{path}
2484} 2635}
2485 2636
2486sub STORABLE_attach { 2637sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_; 2638 my ($self, $cloning, $path) = @_;
2488 2639
2489 $self->new (path => $path) 2640 $self->new (path => $path)
2490} 2641}
2491 2642
2643sub set_texture {
2644 my ($self, $tex) = @_;
2645
2646 $self->{tex} = $tex;
2647 $self->update;
2648}
2649
2492sub size_request { 2650sub size_request {
2493 my ($self) = @_; 2651 my ($self) = @_;
2494 2652
2495 ($self->{tex}{w}, $self->{tex}{h}) 2653 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2496} 2654}
2497 2655
2498sub _draw { 2656sub _draw {
2499 my ($self) = @_; 2657 my ($self) = @_;
2658
2659 $self->SUPER::_draw;
2500 2660
2501 my $tex = $self->{tex}; 2661 my $tex = $self->{tex};
2502 2662
2503 my ($w, $h) = ($self->{w}, $self->{h}); 2663 my ($w, $h) = ($self->{w}, $self->{h});
2504 2664
… …
2510 } 2670 }
2511 2671
2512 glEnable GL_TEXTURE_2D; 2672 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 2674
2515 $tex->draw_quad (0, 0, $w, $h); 2675 $tex->draw_quad_alpha (0, 0, $w, $h);
2516 2676
2517 glDisable GL_TEXTURE_2D; 2677 glDisable GL_TEXTURE_2D;
2518} 2678}
2519 2679
2520############################################################################# 2680#############################################################################
2521 2681
2522package CFPlus::UI::ImageButton; 2682package DC::UI::ImageButton;
2523 2683
2524our @ISA = CFPlus::UI::Image::; 2684our @ISA = DC::UI::Image::;
2525 2685
2526use CFPlus::OpenGL; 2686use DC::OpenGL;
2527
2528my %textures;
2529 2687
2530sub new { 2688sub new {
2531 my $class = shift; 2689 my $class = shift;
2532 2690
2533 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2534 padding_x => 4, 2692 padding_x => 4,
2535 padding_y => 4, 2693 padding_y => 4,
2536 fg => [1, 1, 1], 2694 fg => [1, 1, 1],
2537 active_fg => [0, 0, 1], 2695 active_fg => [0, 0, 1],
2538 can_hover => 1, 2696 can_hover => 1,
2539 align => 0, 2697 align => 0.5,
2540 valign => 0, 2698 valign => 0.5,
2541 can_events => 1, 2699 can_events => 1,
2542 @_ 2700 @_
2543 ); 2701 );
2544} 2702}
2545 2703
2704sub invoke_button_down {
2705 my ($self, $ev, $x, $y) = @_;
2706
2707 1
2708}
2709
2546sub invoke_button_up { 2710sub invoke_button_up {
2547 my ($self, $ev, $x, $y) = @_; 2711 my ($self, $ev, $x, $y) = @_;
2548 2712
2549 $self->emit ("activate") 2713 $self->emit ("activate")
2550 if $x >= 0 && $x < $self->{w} 2714 if $x >= 0 && $x < $self->{w}
… …
2553 1 2717 1
2554} 2718}
2555 2719
2556############################################################################# 2720#############################################################################
2557 2721
2558package CFPlus::UI::VGauge; 2722package DC::UI::VGauge;
2559 2723
2560our @ISA = CFPlus::UI::Base::; 2724our @ISA = DC::UI::Base::;
2561 2725
2562use List::Util qw(min max); 2726use List::Util qw(min max);
2563 2727
2564use CFPlus::OpenGL; 2728use DC::OpenGL;
2565 2729
2566my %tex = ( 2730my %tex = (
2567 food => [ 2731 food => [
2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2733 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2570 ], 2734 ],
2571 grace => [ 2735 grace => [
2572 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2737 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2574 ], 2738 ],
2575 hp => [ 2739 hp => [
2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2740 map { new_from_resource DC::Texture $_, mipmap => 1 }
2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2741 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2578 ], 2742 ],
2579 mana => [ 2743 mana => [
2580 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2744 map { new_from_resource DC::Texture $_, mipmap => 1 }
2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2745 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2582 ], 2746 ],
2583); 2747);
2584 2748
2585# eg. VGauge->new (gauge => 'food'), default gauge: food 2749# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2688 glDisable GL_TEXTURE_2D; 2852 glDisable GL_TEXTURE_2D;
2689} 2853}
2690 2854
2691############################################################################# 2855#############################################################################
2692 2856
2857package DC::UI::Progress;
2858
2859our @ISA = DC::UI::Label::;
2860
2861use DC::OpenGL;
2862
2863sub new {
2864 my ($class, %arg) = @_;
2865
2866 my $self = $class->SUPER::new (
2867 padding_x => 2,
2868 padding_y => 2,
2869 fg => [1, 1, 1],
2870 bg => [0, 0, 1, 0.2],
2871 bar => [0.7, 0.5, 0.1, 0.8],
2872 outline => [0.4, 0.3, 0],
2873 fontsize => 0.9,
2874 valign => 0.5,
2875 align => 0.5,
2876 can_events => 1,
2877 ellipsise => 1,
2878 label => "%d%%",
2879 %arg,
2880 );
2881
2882 $self->set_value ($arg{value} || -1);
2883
2884 $self
2885}
2886
2887sub set_label {
2888 my ($self, $label) = @_;
2889
2890 return if $self->{label} eq $label;
2891 $self->{label} = $label;
2892
2893 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2894}
2895
2896sub set_value {
2897 my ($self, $value) = @_;
2898
2899 if ($self->{value} ne $value) {
2900 $self->{value} = $value;
2901
2902 if ($value < 0) {
2903 $self->set_text ("-");
2904 } else {
2905 $self->set_text (sprintf $self->{label}, $value * 100);
2906 }
2907
2908 $self->update;
2909 }
2910}
2911
2912sub _draw {
2913 my ($self) = @_;
2914
2915 glEnable GL_BLEND;
2916 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2917
2918 my $px = $self->{padding_x};
2919 my $py = $self->{padding_y};
2920
2921 if ($self->{value} >= 0) {
2922 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2923
2924 glColor_premultiply @{$self->{bar}};
2925 glRect $px, $py, $s, $self->{h} - $py;
2926 glColor_premultiply @{$self->{bg}};
2927 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2928 }
2929
2930 glColor_premultiply @{$self->{outline}};
2931
2932 $px -= .5;
2933 $py -= .5;
2934
2935 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2936
2937 glDisable GL_BLEND;
2938
2939 {
2940 local $self->{bg}; # do not draw background
2941 $self->SUPER::_draw;
2942 }
2943}
2944
2945#############################################################################
2946
2947package DC::UI::ExperienceProgress;
2948
2949our @ISA = DC::UI::Progress::;
2950
2951sub new {
2952 my ($class, %arg) = @_;
2953
2954 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2955
2956 my $self = $class->SUPER::new (
2957 %arg,
2958 tooltip => sub {
2959 my ($self) = @_;
2960
2961 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2962 $tt,
2963 $self->{lvl},
2964 ::formsep ($self->{exp}),
2965 ::formsep ($self->{nxt}),
2966 ::formsep ($self->{nxt} - $self->{exp}),
2967 $self->_percent * 100,
2968 },
2969 );
2970
2971 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2972 if $::CONN;
2973
2974 $self
2975}
2976
2977sub DESTROY {
2978 my ($self) = @_;
2979
2980 delete $::CONN->{on_exp_update}{$self+0}
2981 if $::CONN;
2982
2983 $self->SUPER::DESTROY;
2984}
2985
2986sub _percent {
2987 my ($self) = @_;
2988
2989 my $table = $::CONN && $::CONN->{exp_table}
2990 or return -1;
2991
2992 my $l0 = $table->[$self->{lvl} - 1];
2993 my $l1 = $table->[$self->{lvl}];
2994
2995 $self->{nxt} = $l1;
2996
2997 ($self->{exp} - $l0) / ($l1 - $l0)
2998}
2999
3000sub set_value {
3001 my ($self, $lvl, $exp) = @_;
3002
3003 $self->{lvl} = $lvl;
3004 $self->{exp} = $exp;
3005
3006 $self->SUPER::set_value ($self->_percent);
3007}
3008
3009#############################################################################
3010
2693package CFPlus::UI::Gauge; 3011package DC::UI::Gauge;
2694 3012
2695our @ISA = CFPlus::UI::VBox::; 3013our @ISA = DC::UI::VBox::;
2696 3014
2697sub new { 3015sub new {
2698 my ($class, %arg) = @_; 3016 my ($class, %arg) = @_;
2699 3017
2700 my $self = $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
… …
2702 can_hover => 1, 3020 can_hover => 1,
2703 can_events => 1, 3021 can_events => 1,
2704 %arg, 3022 %arg,
2705 ); 3023 );
2706 3024
2707 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3025 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2708 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3026 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3027 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2710 3028
2711 $self 3029 $self
2712} 3030}
2713 3031
2714sub set_fontsize { 3032sub set_fontsize {
… …
2735 $self->{value}->set_text ($val); 3053 $self->{value}->set_text ($val);
2736} 3054}
2737 3055
2738############################################################################# 3056#############################################################################
2739 3057
2740package CFPlus::UI::Slider; 3058package DC::UI::Slider;
2741 3059
2742use strict; 3060use common::sense;
2743 3061
2744use CFPlus::OpenGL; 3062use DC::OpenGL;
2745 3063
2746our @ISA = CFPlus::UI::DrawBG::; 3064our @ISA = DC::UI::DrawBG::;
2747 3065
2748my @tex = 3066my @tex =
2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3067 map { new_from_resource DC::Texture $_ }
2750 qw(s1_slider.png s1_slider_bg.png); 3068 qw(s1_slider.png s1_slider_bg.png);
2751 3069
2752sub new { 3070sub new {
2753 my $class = shift; 3071 my $class = shift;
2754 3072
… …
2791sub set_value { 3109sub set_value {
2792 my ($self, $value) = @_; 3110 my ($self, $value) = @_;
2793 3111
2794 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3112 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2795 3113
2796 $hi = $lo + 1 if $hi <= $lo; 3114 $hi = $lo if $hi < $lo;
2797 3115
2798 $page = $hi - $lo if $page > $hi - $lo; 3116 $value = $hi - $page if $value > $hi - $page;
2799
2800 $value = $lo if $value < $lo; 3117 $value = $lo if $value < $lo;
2801 $value = $hi - $page if $value > $hi - $page;
2802 3118
2803 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2804 if $unit; 3120 if $unit;
2805 3121
2806 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2822 3138
2823 $self->SUPER::invoke_button_down ($ev, $x, $y); 3139 $self->SUPER::invoke_button_down ($ev, $x, $y);
2824 3140
2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3141 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2826 3142
2827 $self->invoke_mouse_motion ($ev, $x, $y) 3143 $self->invoke_mouse_motion ($ev, $x, $y);
3144
3145 1
2828} 3146}
2829 3147
2830sub invoke_mouse_motion { 3148sub invoke_mouse_motion {
2831 my ($self, $ev, $x, $y) = @_; 3149 my ($self, $ev, $x, $y) = @_;
2832 3150
2833 if ($GRAB == $self) { 3151 if ($GRAB == $self) {
2834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3152 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2835 3153
2836 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3154 my (undef, $lo, $hi, $page) = @{$self->{range}};
2837 3155
2838 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3156 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2839 3157
2840 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3158 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2841 } else { 3159 } else {
2842 return 0; 3160 return 0;
2843 } 3161 }
… …
2848sub invoke_mouse_wheel { 3166sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_; 3167 my ($self, $ev) = @_;
2850 3168
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3169 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852 3170
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3171 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2854 3172
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3173 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856 3174
2857 ! ! $delta 3175 1
2858} 3176}
2859 3177
2860sub update { 3178sub update {
2861 my ($self) = @_; 3179 my ($self) = @_;
2862 3180
… …
2868 my ($self) = @_; 3186 my ($self) = @_;
2869 3187
2870 unless ($self->{knob_w}) { 3188 unless ($self->{knob_w}) {
2871 $self->set_value ($self->{range}[0]); 3189 $self->set_value ($self->{range}[0]);
2872 3190
2873 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3191 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2874 my $range = ($hi - $page - $lo) || 1e-100; 3192 my $range = ($hi - $page - $lo) || 1e-10;
2875 3193
2876 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3194 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2877 3195
2878 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2879 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2880 3198
2881 $value = ($value - $lo) / $range; 3199 $value = ($value - $lo) / $range;
… …
2911 glDisable GL_TEXTURE_2D; 3229 glDisable GL_TEXTURE_2D;
2912} 3230}
2913 3231
2914############################################################################# 3232#############################################################################
2915 3233
2916package CFPlus::UI::ValSlider; 3234package DC::UI::ValSlider;
2917 3235
2918our @ISA = CFPlus::UI::HBox::; 3236our @ISA = DC::UI::HBox::;
2919 3237
2920sub new { 3238sub new {
2921 my ($class, %arg) = @_; 3239 my ($class, %arg) = @_;
2922 3240
2923 my $range = delete $arg{range}; 3241 my $range = delete $arg{range};
2924 3242
2925 my $self = $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3244 slider => (new DC::UI::Slider expand => 1, range => $range),
2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3245 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2928 to_value => sub { shift }, 3246 to_value => sub { shift },
2929 from_value => sub { shift }, 3247 from_value => sub { shift },
2930 %arg, 3248 %arg,
2931 ); 3249 );
2932 3250
… …
2952sub set_range { shift->{slider}->set_range (@_) } 3270sub set_range { shift->{slider}->set_range (@_) }
2953sub set_value { shift->{slider}->set_value (@_) } 3271sub set_value { shift->{slider}->set_value (@_) }
2954 3272
2955############################################################################# 3273#############################################################################
2956 3274
2957package CFPlus::UI::TextScroller; 3275package DC::UI::TextScroller;
2958 3276
2959our @ISA = CFPlus::UI::HBox::; 3277our @ISA = DC::UI::HBox::;
2960 3278
2961use CFPlus::OpenGL; 3279use DC::OpenGL;
2962 3280
2963sub new { 3281sub new {
2964 my $class = shift; 3282 my $class = shift;
2965 3283
2966 my $self = $class->SUPER::new ( 3284 my $self = $class->SUPER::new (
… …
2968 can_events => 1, 3286 can_events => 1,
2969 indent => 0, 3287 indent => 0,
2970 #font => default_font 3288 #font => default_font
2971 @_, 3289 @_,
2972 3290
2973 layout => (new CFPlus::Layout), 3291 layout => (new DC::Layout),
2974 par => [], 3292 par => [],
2975 max_par => 0, 3293 max_par => 0,
2976 height => 0, 3294 height => 0,
2977 children => [ 3295 children => [
2978 (new CFPlus::UI::Empty expand => 1), 3296 (new DC::UI::Empty expand => 1),
2979 (new CFPlus::UI::Slider vertical => 1), 3297 (new DC::UI::Slider vertical => 1),
2980 ], 3298 ],
2981 ); 3299 );
2982 3300
2983 $self->{children}[1]->connect (changed => sub { $self->update }); 3301 $self->{children}[1]->connect (changed => sub { $self->update });
2984 3302
… …
2993} 3311}
2994 3312
2995sub size_request { 3313sub size_request {
2996 my ($self) = @_; 3314 my ($self) = @_;
2997 3315
2998 my ($empty, $slider) = @{ $self->{children} }; 3316 my ($empty, $slider) = $self->visible_children;
2999 3317
3000 local $self->{children} = [$empty, $slider]; 3318 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request 3319 $self->SUPER::size_request
3002} 3320}
3003 3321
… …
3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3358 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3041 $layout->set_markup ($para->{markup}); 3359 $layout->set_markup ($para->{markup});
3042 3360
3043 $layout->set_shapes ( 3361 $layout->set_shapes (
3044 map 3362 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3363 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}} 3364 @{$para->{widget}}
3047 ); 3365 );
3048 3366
3049 $layout 3367 $layout
3050} 3368}
… …
3167 $ROOT->on_post_alloc ($self => sub { 3485 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate; 3486 $self->force_uptodate;
3169 3487
3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3488 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3171 3489
3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3490 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3173 glClearColor 0, 0, 0, 0; 3491 glClearColor 0, 0, 0, 0;
3174 glClear GL_COLOR_BUFFER_BIT; 3492 glClear GL_COLOR_BUFFER_BIT;
3175 3493
3176 package CFPlus::UI::Base; 3494 package DC::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3495 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h}); 3496 (0, 0, $self->{w}, $self->{h});
3179 3497
3180 my $top = int $self->{children}[1]{range}[0]; 3498 my $top = int $self->{children}[1]{range}[0];
3181 3499
… …
3192 3510
3193 if ($y0 < $y + $h && $y < $y1) { 3511 if ($y0 < $y + $h && $y < $y1) {
3194 my $layout = $self->get_layout ($para); 3512 my $layout = $self->get_layout ($para);
3195 3513
3196 $layout->render ($para->{indent}, $y - $y0); 3514 $layout->render ($para->{indent}, $y - $y0);
3515 $layout->draw;
3197 3516
3198 if (my @w = @{ $para->{widget} }) { 3517 if (my @w = @{ $para->{widget} }) {
3199 my @s = $layout->get_shapes; 3518 my @s = $layout->get_shapes;
3200 3519
3201 for (@w) { 3520 for (@w) {
… …
3239 $self->{children}[1]->draw; 3558 $self->{children}[1]->draw;
3240} 3559}
3241 3560
3242############################################################################# 3561#############################################################################
3243 3562
3244package CFPlus::UI::Animator; 3563package DC::UI::Animator;
3245 3564
3246use CFPlus::OpenGL; 3565use DC::OpenGL;
3247 3566
3248our @ISA = CFPlus::UI::Bin::; 3567our @ISA = DC::UI::Bin::;
3249 3568
3250sub moveto { 3569sub moveto {
3251 my ($self, $x, $y) = @_; 3570 my ($self, $x, $y) = @_;
3252 3571
3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3572 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3281 glPopMatrix; 3600 glPopMatrix;
3282} 3601}
3283 3602
3284############################################################################# 3603#############################################################################
3285 3604
3286package CFPlus::UI::Flopper; 3605package DC::UI::Flopper;
3287 3606
3288our @ISA = CFPlus::UI::Button::; 3607our @ISA = DC::UI::Button::;
3289 3608
3290sub new { 3609sub new {
3291 my $class = shift; 3610 my $class = shift;
3292 3611
3293 my $self = $class->SUPER::new ( 3612 my $self = $class->SUPER::new (
… …
3305 $self->{other}->toggle_visibility; 3624 $self->{other}->toggle_visibility;
3306} 3625}
3307 3626
3308############################################################################# 3627#############################################################################
3309 3628
3310package CFPlus::UI::Tooltip; 3629package DC::UI::Tooltip;
3311 3630
3312our @ISA = CFPlus::UI::Bin::; 3631our @ISA = DC::UI::Bin::;
3313 3632
3314use CFPlus::OpenGL; 3633use DC::OpenGL;
3315 3634
3316sub new { 3635sub new {
3317 my $class = shift; 3636 my $class = shift;
3318 3637
3319 $class->SUPER::new ( 3638 $class->SUPER::new (
… …
3323} 3642}
3324 3643
3325sub set_tooltip_from { 3644sub set_tooltip_from {
3326 my ($self, $widget) = @_; 3645 my ($self, $widget) = @_;
3327 3646
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
3330
3331 my $tooltip = $widget->{tooltip}; 3647 my $tip = $widget->{tooltip};
3648 $tip = $tip->($widget) if "CODE" eq ref $tip;
3649
3650 $tip = DC::Pod::section_label tooltip => $1
3651 if $tip =~ /^#(.*)$/;
3332 3652
3333 if ($ENV{CFPLUS_DEBUG} & 2) { 3653 if ($ENV{CFPLUS_DEBUG} & 2) {
3334 $tooltip .= "\n\n" . (ref $widget) . "\n" 3654 $tip .= "\n\n" . (ref $widget) . "\n"
3335 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3655 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3336 . "req $widget->{req_w} $widget->{req_h}\n" 3656 . "req $widget->{req_w} $widget->{req_h}\n"
3337 . "visible $widget->{visible}"; 3657 . "visible $widget->{visible}";
3338 } 3658 }
3339 3659
3340 $tooltip =~ s/^\n+//; 3660 $tip =~ s/^\n+//;
3341 $tooltip =~ s/\n+$//; 3661 $tip =~ s/\n+$//;
3342 3662
3343 $self->add (new CFPlus::UI::Label 3663 $self->add (new DC::UI::Label
3664 fg => $DC::THEME{tooltip_fg},
3344 markup => $tooltip, 3665 markup => $tip,
3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3666 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3667 align => 0,
3346 fontsize => 0.8, 3668 fontsize => 0.8,
3347 style => 1, # FLAG_INVERSE 3669 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3348 ellipsise => 0, 3670 ellipsise => 0,
3349 font => ($widget->{tooltip_font} || $::FONT_PROP), 3671 font => ($widget->{tooltip_font} || $::FONT_PROP),
3350 ); 3672 );
3351} 3673}
3352 3674
… …
3387} 3709}
3388 3710
3389sub _draw { 3711sub _draw {
3390 my ($self) = @_; 3712 my ($self) = @_;
3391 3713
3392 glTranslate 0.375, 0.375;
3393
3394 my ($w, $h) = @$self{qw(w h)}; 3714 my ($w, $h) = @$self{qw(w h)};
3395 3715
3396 glColor 1, 0.8, 0.4; 3716 glColor @{ $DC::THEME{tooltip_bg} };
3397 glBegin GL_QUADS; 3717 glRect 0, 0, $w, $h;
3398 glVertex 0 , 0;
3399 glVertex 0 , $h;
3400 glVertex $w, $h;
3401 glVertex $w, 0;
3402 glEnd;
3403 3718
3404 glColor 0, 0, 0; 3719 glColor @{ $DC::THEME{tooltip_border} };
3405 glBegin GL_LINE_LOOP; 3720 glRect_lineloop .5, .5, $w + .5, $h + .5;
3406 glVertex 0 , 0;
3407 glVertex 0 , $h;
3408 glVertex $w, $h;
3409 glVertex $w, 0;
3410 glEnd;
3411 3721
3412 glTranslate 2 - 0.375, 2 - 0.375; 3722 glTranslate 2, 2;
3413 3723
3414 $self->SUPER::_draw; 3724 $self->SUPER::_draw;
3415} 3725}
3416 3726
3417############################################################################# 3727#############################################################################
3418 3728
3419package CFPlus::UI::Face; 3729package DC::UI::Face;
3420 3730
3421our @ISA = CFPlus::UI::DrawBG::; 3731our @ISA = DC::UI::DrawBG::;
3422 3732
3423use CFPlus::OpenGL; 3733use DC::OpenGL;
3424 3734
3425sub new { 3735sub new {
3426 my $class = shift; 3736 my $class = shift;
3427 3737
3428 my $self = $class->SUPER::new ( 3738 my $self = $class->SUPER::new (
… …
3431 aspect => 1, 3741 aspect => 1,
3432 can_events => 0, 3742 can_events => 0,
3433 @_, 3743 @_,
3434 ); 3744 );
3435 3745
3436 if ($self->{anim} && $self->{animspeed}) {
3437 CFPlus::weaken (my $widget = $self);
3438
3439 $self->{timer} = Event->timer (
3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3441 hard => 1,
3442 interval => $self->{animspeed},
3443 cb => sub {
3444 return unless $::CONN;
3445
3446 ++$widget->{frame};
3447 $self->update_face;
3448 $self->update;
3449 },
3450 );
3451
3452 $self->update_face; 3746 $self->update_anim;
3453 }
3454 3747
3455 $self 3748 $self
3456} 3749}
3457 3750
3751sub update_timer {
3752 my ($self) = @_;
3753
3754 return unless $self->{timer};
3755
3756 if ($self->{visible}) {
3757 $self->{timer}->start;
3758 } else {
3759 $self->{timer}->stop;
3760 }
3761}
3762
3458sub update_face { 3763sub update_face {
3459 my ($self) = @_; 3764 my ($self) = @_;
3460 3765
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
3471sub size_request {
3472 my ($self) = @_;
3473
3474 if ($::CONN) { 3766 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3767 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) { 3768 if ($anim && @$anim) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3769 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3478 } else { 3770 delete $self->{face_change_cb};
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3771
3480 $self->realloc; 3772 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3773 unless ($tex->{name} || $tex->{loading}) {
3774 $tex->upload (sub { $self->reconfigure });
3775 }
3481 }); 3776 }
3482 } 3777 }
3483 } 3778 }
3484 } 3779 }
3780}
3781
3782sub update_anim {
3783 my ($self) = @_;
3784
3785 if ($self->{anim} && $self->{animspeed}) {
3786 DC::weaken (my $widget = $self);
3787
3788 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3789 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3790 return unless $::CONN;
3791
3792 my $w = $widget
3793 or return;
3794
3795 ++$w->{frame};
3796 $w->update_face;
3797
3798 # somehow, $widget can go away
3799 $w->update;
3800 $w->update_timer;
3801 };
3802
3803 $self->update_face;
3804 $self->update_timer;
3805 } else {
3806 delete $self->{timer};
3807 }
3808}
3809
3810sub size_request {
3811 my ($self) = @_;
3812
3813 if ($::CONN) {
3814 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3815 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3816 if ($tex->{name}) {
3817 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3818 } elsif (!$tex->{loading}) {
3819 $tex->upload (sub { $self->reconfigure });
3820 }
3821 }
3822
3823 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3824 }
3825 }
3485 3826
3486 ($self->{size_w} || 8, $self->{size_h} || 8) 3827 ($self->{size_w} || 8, $self->{size_h} || 8)
3487} 3828}
3488 3829
3489sub update { 3830sub update {
… …
3492 return unless $self->{visible}; 3833 return unless $self->{visible};
3493 3834
3494 $self->SUPER::update; 3835 $self->SUPER::update;
3495} 3836}
3496 3837
3838sub set_face {
3839 my ($self, $face) = @_;
3840
3841 $self->{face} = $face;
3842 $self->reconfigure;
3843}
3844
3845sub set_anim {
3846 my ($self, $anim) = @_;
3847
3848 $self->{anim} = $anim;
3849 $self->update_anim;
3850}
3851
3852sub set_animspeed {
3853 my ($self, $animspeed) = @_;
3854
3855 $self->{animspeed} = $animspeed;
3856 $self->update_anim;
3857}
3858
3859sub invoke_visibility_change {
3860 my ($self) = @_;
3861
3862 $self->update_timer;
3863
3864 0
3865}
3866
3497sub _draw { 3867sub _draw {
3498 my ($self) = @_; 3868 my ($self) = @_;
3499 3869
3500 return unless $::CONN;
3501
3502 $self->SUPER::_draw; 3870 $self->SUPER::_draw;
3503 3871
3504 my $faceid = $::CONN->{faceid}[$self->{face}] 3872 if (my $tex = $self->{tex}) {
3505 or return;
3506
3507 my $tex = $::CONN->{texture}[$faceid];
3508
3509 if ($tex) {
3510 glEnable GL_TEXTURE_2D; 3873 glEnable GL_TEXTURE_2D;
3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3874 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3512 glColor 0, 0, 0, 1; 3875 glColor 0, 0, 0, 1;
3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3876 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3514 glDisable GL_TEXTURE_2D; 3877 glDisable GL_TEXTURE_2D;
… …
3516} 3879}
3517 3880
3518sub destroy { 3881sub destroy {
3519 my ($self) = @_; 3882 my ($self) = @_;
3520 3883
3521 $self->{timer}->cancel 3884 (delete $self->{timer})->cancel
3522 if $self->{timer}; 3885 if $self->{timer};
3523 3886
3524 $self->SUPER::destroy; 3887 $self->SUPER::destroy;
3525} 3888}
3526 3889
3527############################################################################# 3890#############################################################################
3528 3891
3529package CFPlus::UI::Buttonbar; 3892package DC::UI::Buttonbar;
3530 3893
3531our @ISA = CFPlus::UI::HBox::; 3894our @ISA = DC::UI::HBox::;
3532 3895
3533# TODO: should actually wrap buttons and other goodies. 3896# TODO: should actually wrap buttons and other goodies.
3534 3897
3535############################################################################# 3898#############################################################################
3536 3899
3537package CFPlus::UI::Menu; 3900package DC::UI::Menu;
3538 3901
3539our @ISA = CFPlus::UI::Toplevel::; 3902our @ISA = DC::UI::Toplevel::;
3540 3903
3541use CFPlus::OpenGL; 3904use DC::OpenGL;
3542 3905
3543sub new { 3906sub new {
3544 my $class = shift; 3907 my $class = shift;
3545 3908
3546 my $self = $class->SUPER::new ( 3909 my $self = $class->SUPER::new (
3547 items => [], 3910 items => [],
3548 z => 100, 3911 z => 100,
3549 @_, 3912 @_,
3550 ); 3913 );
3551 3914
3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3915 $self->add ($self->{vbox} = new DC::UI::VBox);
3553 3916
3554 for my $item (@{ $self->{items} }) { 3917 for my $item (@{ $self->{items} }) {
3555 my ($widget, $cb, $tooltip) = @$item; 3918 my ($widget, $cb, $tooltip) = @$item;
3556 3919
3557 # handle various types of items, only text for now 3920 # handle various types of items, only text for now
3558 if (!ref $widget) { 3921 if (!ref $widget) {
3559 if ($widget =~ /\t/) { 3922 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2; 3923 my ($left, $right) = split /\t/, $widget, 2;
3561 3924
3562 $widget = new CFPlus::UI::HBox 3925 $widget = new DC::UI::HBox
3563 can_hover => 1, 3926 can_hover => 1,
3564 can_events => 1, 3927 can_events => 1,
3565 tooltip => $tooltip, 3928 tooltip => $tooltip,
3566 children => [ 3929 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1), 3930 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1), 3931 (new DC::UI::Label markup => $right, align => 1),
3569 ], 3932 ],
3570 ; 3933 ;
3571 3934
3572 } else { 3935 } else {
3573 $widget = new CFPlus::UI::Label 3936 $widget = new DC::UI::Label
3574 can_hover => 1, 3937 can_hover => 1,
3575 can_events => 1, 3938 can_events => 1,
3939 align => 0,
3576 markup => $widget, 3940 markup => $widget,
3577 tooltip => $tooltip; 3941 tooltip => $tooltip;
3578 } 3942 }
3579 } 3943 }
3580 3944
… …
3595 # maybe save $GRAB? must be careful about events... 3959 # maybe save $GRAB? must be careful about events...
3596 $GRAB = $self; 3960 $GRAB = $self;
3597 $self->{button} = $ev->{button}; 3961 $self->{button} = $ev->{button};
3598 3962
3599 $self->show; 3963 $self->show;
3600 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3964
3965 my $x = $ev->{x};
3966 my $y = $ev->{y};
3967
3968 $self->{root}->on_post_alloc ($self => sub {
3969 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3970 });
3971
3972 1 # so it can be used inside event handlers
3601} 3973}
3602 3974
3603sub invoke_mouse_motion { 3975sub invoke_mouse_motion {
3604 my ($self, $ev, $x, $y) = @_; 3976 my ($self, $ev, $x, $y) = @_;
3605 3977
… …
3626 1 3998 1
3627} 3999}
3628 4000
3629############################################################################# 4001#############################################################################
3630 4002
3631package CFPlus::UI::Multiplexer; 4003package DC::UI::Multiplexer;
3632 4004
3633our @ISA = CFPlus::UI::Container::; 4005our @ISA = DC::UI::Container::;
3634 4006
3635sub new { 4007sub new {
3636 my $class = shift; 4008 my $class = shift;
3637 4009
3638 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3639 @_, 4011 @_,
3640 ); 4012 );
3641 4013
3642 $self->{current} = $self->{children}[0] 4014 $self->set_current_page (0);
3643 if @{ $self->{children} };
3644 4015
3645 $self 4016 $self
3646} 4017}
3647 4018
3648sub add { 4019sub add {
3649 my ($self, @widgets) = @_; 4020 my ($self, @widgets) = @_;
3650 4021
3651 $self->SUPER::add (@widgets); 4022 $self->SUPER::add (@widgets);
3652 4023
3653 $self->{current} = $self->{children}[0] 4024 $self->set_current_page (0)
3654 if @{ $self->{children} }; 4025 if @widgets == @{ $self->{children} };
3655} 4026}
3656 4027
3657sub get_current_page { 4028sub get_current_page {
3658 my ($self) = @_; 4029 my ($self) = @_;
3659 4030
… …
3665 4036
3666 my $widget = ref $page_or_widget 4037 my $widget = ref $page_or_widget
3667 ? $page_or_widget 4038 ? $page_or_widget
3668 : $self->{children}[$page_or_widget]; 4039 : $self->{children}[$page_or_widget];
3669 4040
4041 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4042
3670 $self->{current} = $widget; 4043 if (($self->{current} = $widget)) {
4044 $self->{current}->set_visible if $self->{current} && $self->{visible};
3671 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4045 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3672 4046
3673 $self->emit (page_changed => $self->{current}); 4047 $self->emit (page_changed => $self->{current});
4048 }
3674 4049
3675 $self->realloc; 4050 $self->realloc;
3676} 4051}
3677 4052
3678sub visible_children { 4053sub visible_children {
3679 $_[0]{current} 4054 $_[0]{current} || ()
3680} 4055}
3681 4056
3682sub size_request { 4057sub size_request {
3683 my ($self) = @_; 4058 my ($self) = @_;
3684 4059
4060 $self->{current}
3685 $self->{current}->size_request 4061 ? $self->{current}->size_request
4062 : (0, 0)
3686} 4063}
3687 4064
3688sub invoke_size_allocate { 4065sub invoke_size_allocate {
3689 my ($self, $w, $h) = @_; 4066 my ($self, $w, $h) = @_;
3690 4067
3691 $self->{current}->configure (0, 0, $w, $h); 4068 $self->{current}->configure (0, 0, $w, $h)
4069 if $self->{current};
3692 4070
3693 1 4071 1
3694} 4072}
3695 4073
3696sub _draw { 4074sub _draw {
3697 my ($self) = @_; 4075 my ($self) = @_;
3698 4076
3699 $self->{current}->draw; 4077 $self->{current}->draw
4078 if $self->{current};
3700} 4079}
3701 4080
3702############################################################################# 4081#############################################################################
3703 4082
3704package CFPlus::UI::Notebook; 4083package DC::UI::Notebook;
3705 4084
4085use DC::OpenGL;
4086
3706our @ISA = CFPlus::UI::VBox::; 4087our @ISA = DC::UI::VBox::;
3707 4088
3708sub new { 4089sub new {
3709 my $class = shift; 4090 my $class = shift;
3710 4091
3711 my $self = $class->SUPER::new ( 4092 my $self = $class->SUPER::new (
3712 buttonbar => (new CFPlus::UI::Buttonbar), 4093 buttonbar => (new DC::UI::Buttonbar),
3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4094 multiplexer => (new DC::UI::Multiplexer expand => 1),
4095 active_outline => [.7, .7, 0.2],
3714 # filter => # will be put between multiplexer and $self 4096 # filter => # will be put between multiplexer and $self
3715 @_, 4097 @_,
3716 ); 4098 );
3717 4099
3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4100 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3719 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4101 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3720 4102
4103 {
4104 Scalar::Util::weaken (my $wself = $self);
4105
4106 $self->{multiplexer}->connect (c_add => sub {
4107 my ($mplex, $widgets) = @_;
4108
4109 for my $child (@$widgets) {
4110 Scalar::Util::weaken $child;
4111 $child->{c_tab_} ||= do {
4112 my $tab =
4113 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4114 ? $child->{c_tab}
4115 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4116
4117 $tab->connect (activate => sub {
4118 $wself->set_current_page ($child);
4119 });
4120
4121 $tab
4122 };
4123
4124 $self->{buttonbar}->add ($child->{c_tab_});
4125 }
4126 });
4127
4128 $self->{multiplexer}->connect (c_remove => sub {
4129 my ($mplex, $widgets) = @_;
4130
4131 for my $child (@$widgets) {
4132 $wself->{buttonbar}->remove ($child->{c_tab_});
4133 }
4134 });
4135 }
4136
3721 $self 4137 $self
3722} 4138}
3723 4139
3724sub add { 4140sub add {
4141 my ($self, @widgets) = @_;
4142
4143 $self->{multiplexer}->add (@widgets)
4144}
4145
4146sub remove {
4147 my ($self, @widgets) = @_;
4148
4149 $self->{multiplexer}->remove (@widgets)
4150}
4151
4152sub pages {
4153 my ($self) = @_;
4154 $self->{multiplexer}->children
4155}
4156
4157sub page_index {
4158 my ($self, $widget) = @_;
4159
4160 my $i = 0;
4161 for ($self->pages) {
4162 if ($_ eq $widget) { return $i };
4163 $i++;
4164 }
4165
4166 undef
4167}
4168
4169sub add_tab {
3725 my ($self, $title, $widget, $tooltip) = @_; 4170 my ($self, $title, $widget, $tooltip) = @_;
3726 4171
3727 CFPlus::weaken $self; 4172 $title = [$title, $tooltip] unless ref $title;
4173 $widget->{c_tab} = $title;
3728 4174
3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3730 markup => $title,
3731 tooltip => $tooltip,
3732 on_activate => sub { $self->set_current_page ($widget) },
3733 );
3734
3735 $self->{multiplexer}->add ($widget); 4175 $self->add ($widget);
3736} 4176}
3737 4177
3738sub get_current_page { 4178sub get_current_page {
3739 my ($self) = @_; 4179 my ($self) = @_;
3740 4180
… …
3746 4186
3747 $self->{multiplexer}->set_current_page ($page); 4187 $self->{multiplexer}->set_current_page ($page);
3748 $self->emit (page_changed => $self->{multiplexer}{current}); 4188 $self->emit (page_changed => $self->{multiplexer}{current});
3749} 4189}
3750 4190
4191sub _draw {
4192 my ($self) = @_;
4193
4194 $self->SUPER::_draw ();
4195
4196 if (my $cur = $self->{multiplexer}{current}) {
4197 if ($cur = $cur->{c_tab_}) {
4198 glTranslate $self->{buttonbar}{x} + $cur->{x},
4199 $self->{buttonbar}{y} + $cur->{y};
4200 glLineWidth 3;
4201 #glEnable GL_BLEND;
4202 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4203 glColor @{$self->{active_outline}};
4204 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4205 glLineWidth 1;
4206 #glDisable GL_BLEND;
4207 }
4208 }
4209}
4210
3751############################################################################# 4211#############################################################################
3752 4212
3753package CFPlus::UI::Selector; 4213package DC::UI::Selector;
3754 4214
3755use utf8; 4215use utf8;
3756 4216
3757our @ISA = CFPlus::UI::Button::; 4217our @ISA = DC::UI::Button::;
3758 4218
3759sub new { 4219sub new {
3760 my $class = shift; 4220 my $class = shift;
3761 4221
3762 my $self = $class->SUPER::new ( 4222 my $self = $class->SUPER::new (
… …
3779 my ($value, $title, $tooltip) = @$_; 4239 my ($value, $title, $tooltip) = @$_;
3780 4240
3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4241 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3782 } 4242 }
3783 4243
3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4244 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3785} 4245}
3786 4246
3787sub _set_value { 4247sub _set_value {
3788 my ($self, $value) = @_; 4248 my ($self, $value) = @_;
3789 4249
3790 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4250 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4251 $item ||= $self->{options}[0]
3791 or return; 4252 or return;
3792 4253
3793 $self->{value} = $item->[0]; 4254 $self->{value} = $item->[0];
3794 $self->set_markup ("$item->[1] ⇓"); 4255 $self->set_markup ("$item->[1] ⇓");
3795 $self->set_tooltip ($item->[2]); 4256# $self->set_tooltip ($item->[2]);
3796} 4257}
3797 4258
3798sub set_value { 4259sub set_value {
3799 my ($self, $value) = @_; 4260 my ($self, $value) = @_;
3800 4261
… …
3802 4263
3803 $self->_set_value ($value); 4264 $self->_set_value ($value);
3804 $self->emit (changed => $value); 4265 $self->emit (changed => $value);
3805} 4266}
3806 4267
4268sub set_options {
4269 my ($self, $options) = @_;
4270
4271 $self->{options} = $options;
4272 $self->_set_value ($self->{value});
4273}
4274
3807############################################################################# 4275#############################################################################
3808 4276
3809package CFPlus::UI::Statusbox; 4277package DC::UI::Statusbox;
3810 4278
3811our @ISA = CFPlus::UI::VBox::; 4279our @ISA = DC::UI::VBox::;
3812 4280
3813sub new { 4281sub new {
3814 my $class = shift; 4282 my $class = shift;
3815 4283
3816 my $self = $class->SUPER::new ( 4284 my $self = $class->SUPER::new (
3817 fontsize => 0.8, 4285 fontsize => 0.8,
3818 @_, 4286 @_,
3819 ); 4287 );
3820 4288
3821 CFPlus::weaken (my $this = $self); 4289 DC::weaken (my $this = $self);
3822 4290
3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4291 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3824 4292
3825 $self 4293 $self
3826} 4294}
3827 4295
3828sub reorder { 4296sub reorder {
3829 my ($self) = @_; 4297 my ($self) = @_;
3830 my $NOW = Time::HiRes::time; 4298 my $NOW = AE::time;
3831 4299
3832 # freeze display when hovering over any label 4300 # freeze display when hovering over any label
3833 return if $CFPlus::UI::TOOLTIP->{owner} 4301 return if $DC::UI::TOOLTIP->{owner}
3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4302 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3835 values %{ $self->{item} }; 4303 values %{ $self->{item} };
3836 4304
3837 while (my ($k, $v) = each %{ $self->{item} }) { 4305 while (my ($k, $v) = each %{ $self->{item} }) {
3838 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4306 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3839 } 4307 }
4308
4309 $self->{timer}->set (1, 1);
3840 4310
3841 my @widgets; 4311 my @widgets;
3842 4312
3843 my @items = sort { 4313 my @items = sort {
3844 $a->{pri} <=> $b->{pri} 4314 $a->{pri} <=> $b->{pri}
3845 or $b->{id} <=> $a->{id} 4315 or $b->{id} <=> $a->{id}
3846 } values %{ $self->{item} }; 4316 } values %{ $self->{item} };
3847
3848 $self->{timer}->interval (1);
3849 4317
3850 my $count = 10 + 1; 4318 my $count = 10 + 1;
3851 for my $item (@items) { 4319 for my $item (@items) {
3852 last unless --$count; 4320 last unless --$count;
3853 4321
… …
3860 for ($short) { 4328 for ($short) {
3861 s/^\s+//; 4329 s/^\s+//;
3862 s/\s+/ /g; 4330 s/\s+/ /g;
3863 } 4331 }
3864 4332
3865 new CFPlus::UI::Label 4333 new DC::UI::Label
3866 markup => $short, 4334 markup => $short,
3867 tooltip => $item->{tooltip}, 4335 tooltip => $item->{tooltip},
3868 tooltip_font => $::FONT_PROP, 4336 tooltip_font => $::FONT_PROP,
3869 tooltip_width => 0.67, 4337 tooltip_width => 0.67,
3870 fontsize => $item->{fontsize} || $self->{fontsize}, 4338 fontsize => $item->{fontsize} || $self->{fontsize},
3871 max_w => $::WIDTH * 0.44, 4339 max_w => $::WIDTH * 0.44,
4340 align => 0,
3872 fg => [@{ $item->{fg} }], 4341 fg => [@{ $item->{fg} }],
3873 can_events => 1, 4342 can_events => 1,
3874 can_hover => 1 4343 can_hover => 1
3875 }; 4344 };
3876 4345
3877 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4346 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3878 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4347 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3879 $label->update; 4348 $label->update;
3880 $label->set_max_size (undef, $label->{req_h} * $diff) 4349 $label->set_max_size (undef, $label->{req_h} * $diff)
3881 if $diff < 1; 4350 if $diff < 1;
3882 $self->{timer}->interval (1/30); 4351 $self->{timer}->set (1/30, 1/30);
3883 } else { 4352 } else {
3884 $label->{fg}[3] = $item->{fg}[3] || 1; 4353 $label->{fg}[3] = $item->{fg}[3] || 1;
3885 } 4354 }
3886 4355
3887 push @widgets, $label; 4356 push @widgets, $label;
3888 } 4357 }
4358
4359 my $hash = join ",", @widgets;
4360 return if $hash eq $self->{last_widget_hash};
4361 $self->{last_widget_hash} = $hash;
3889 4362
3890 $self->clear; 4363 $self->clear;
3891 $self->SUPER::add (reverse @widgets); 4364 $self->SUPER::add (reverse @widgets);
3892} 4365}
3893 4366
… …
3949 $self->SUPER::destroy; 4422 $self->SUPER::destroy;
3950} 4423}
3951 4424
3952############################################################################# 4425#############################################################################
3953 4426
3954package CFPlus::UI::Root; 4427package DC::UI::Root;
3955 4428
3956our @ISA = CFPlus::UI::Container::; 4429our @ISA = DC::UI::Container::;
3957 4430
3958use List::Util qw(min max); 4431use List::Util qw(min max);
3959 4432
3960use CFPlus::OpenGL; 4433use DC::OpenGL;
3961 4434
3962sub new { 4435sub new {
3963 my $class = shift; 4436 my $class = shift;
3964 4437
3965 my $self = $class->SUPER::new ( 4438 my $self = $class->SUPER::new (
3966 visible => 1, 4439 visible => 1,
3967 @_, 4440 @_,
3968 ); 4441 );
3969 4442
3970 CFPlus::weaken ($self->{root} = $self); 4443 DC::weaken ($self->{root} = $self);
3971 4444
3972 $self 4445 $self
3973} 4446}
3974 4447
3975sub size_request { 4448sub size_request {
… …
4023} 4496}
4024 4497
4025sub update { 4498sub update {
4026 my ($self) = @_; 4499 my ($self) = @_;
4027 4500
4028 $::WANT_REFRESH++; 4501 $::WANT_REFRESH = 1;
4029} 4502}
4030 4503
4031sub add { 4504sub add {
4032 my ($self, @children) = @_; 4505 my ($self, @children) = @_;
4033 4506
… …
4070 while ($self->{refresh_hook}) { 4543 while ($self->{refresh_hook}) {
4071 $_->() 4544 $_->()
4072 for values %{delete $self->{refresh_hook}}; 4545 for values %{delete $self->{refresh_hook}};
4073 } 4546 }
4074 4547
4075 if ($self->{realloc}) { 4548 while ($self->{realloc}) {
4076 my %queue; 4549 my %queue;
4077 my @queue; 4550 my @queue;
4078 my $widget; 4551 my $widget;
4079 4552
4080 outer: 4553 outer:
… …
4100 4573
4101 delete $queue{$widget+0}; 4574 delete $queue{$widget+0};
4102 4575
4103 my ($w, $h) = $widget->size_request; 4576 my ($w, $h) = $widget->size_request;
4104 4577
4105 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4578 $w += $widget->{padding_x} * 2;
4106 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4579 $h += $widget->{padding_y} * 2;
4580
4581 $w = max $widget->{min_w}, $w;
4582 $h = max $widget->{min_h}, $h;
4107 4583
4108 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4584 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4109 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4585 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4110 4586
4111 $w = $widget->{force_w} if exists $widget->{force_w}; 4587 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4127 } 4603 }
4128 } 4604 }
4129 4605
4130 delete $self->{realloc}{$widget+0}; 4606 delete $self->{realloc}{$widget+0};
4131 } 4607 }
4132 }
4133 4608
4134 while (my $size_alloc = delete $self->{size_alloc}) { 4609 while (my $size_alloc = delete $self->{size_alloc}) {
4135 my @queue = sort { $b->{visible} <=> $a->{visible} } 4610 my @queue = sort { $a->{visible} <=> $b->{visible} }
4136 values %$size_alloc; 4611 values %$size_alloc;
4137 4612
4138 while () { 4613 while () {
4139 my $widget = pop @queue || last; 4614 my $widget = pop @queue || last;
4140 4615
4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4616 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4142 4617
4143 $w = 0 if $w < 0;
4144 $h = 0 if $h < 0;
4145
4146 $w = max $widget->{min_w}, $w; 4618 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h; 4619 $h = max $widget->{min_h}, $h;
4148 4620
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4621# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4622# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151 4623
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4624 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4625 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154 4626
4155 $w = int $w + 0.5; 4627 $w = int $w + 0.5;
4156 $h = int $h + 0.5; 4628 $h = int $h + 0.5;
4157 4629
4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4630 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4159 $widget->{old_w} = $widget->{w}; 4631 $widget->{old_w} = $widget->{w};
4160 $widget->{old_h} = $widget->{h}; 4632 $widget->{old_h} = $widget->{h};
4161 4633
4162 $widget->{w} = $w; 4634 $widget->{w} = $w;
4163 $widget->{h} = $h; 4635 $widget->{h} = $h;
4164 4636
4165 $widget->emit (size_allocate => $w, $h); 4637 $widget->emit (size_allocate => $w, $h);
4638 }
4166 } 4639 }
4167 } 4640 }
4168 } 4641 }
4169 4642
4170 while ($self->{post_alloc_hook}) { 4643 while ($self->{post_alloc_hook}) {
4171 $_->() 4644 $_->()
4172 for values %{delete $self->{post_alloc_hook}}; 4645 for values %{delete $self->{post_alloc_hook}};
4173 } 4646 }
4174
4175 4647
4176 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4648 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4177 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4649 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4178 glClear GL_COLOR_BUFFER_BIT; 4650 glClear GL_COLOR_BUFFER_BIT;
4179 4651
… …
4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4654 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4183 glMatrixMode GL_MODELVIEW; 4655 glMatrixMode GL_MODELVIEW;
4184 glLoadIdentity; 4656 glLoadIdentity;
4185 4657
4186 { 4658 {
4187 package CFPlus::UI::Base; 4659 package DC::UI::Base;
4188 4660
4189 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4661 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4190 (0, 0, $self->{w}, $self->{h}); 4662 (0, 0, $self->{w}, $self->{h});
4191 4663
4192 $self->_draw; 4664 $self->_draw;
4193 } 4665 }
4194} 4666}
4195 4667
4196############################################################################# 4668#############################################################################
4197 4669
4198package CFPlus::UI; 4670package DC::UI;
4199 4671
4200$ROOT = new CFPlus::UI::Root; 4672$ROOT = new DC::UI::Root;
4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4673$TOOLTIP = new DC::UI::Tooltip z => 900;
4202 4674
42031 46751
4204

Diff Legend

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