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.388 by root, Fri Jul 20 18:30:03 2007 UTC vs.
Revision 1.481 by root, Tue Oct 12 05:11:38 2010 UTC

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

Diff Legend

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