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.401 by root, Sat Jul 21 20:05:37 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
651sub DESTROY { 629sub DESTROY {
652 my ($self) = @_; 630 my ($self) = @_;
653 631
654 return if CFPlus::in_destruct; 632 return if DC::in_destruct;
655 633
634 local $@;
656 eval { $self->destroy }; 635 eval { $self->destroy };
657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658 637
659 delete $WIDGET{$self+0}; 638 delete $WIDGET{$self+0};
660} 639}
661 640
662############################################################################# 641#############################################################################
663 642
664package CFPlus::UI::DrawBG; 643package DC::UI::DrawBG;
665 644
666our @ISA = CFPlus::UI::Base::; 645our @ISA = DC::UI::Base::;
667 646
668use strict; 647use common::sense;
648
669use CFPlus::OpenGL; 649use DC::OpenGL;
670 650
671sub new { 651sub new {
672 my $class = shift; 652 my $class = shift;
673
674 # range [value, low, high, page]
675 653
676 $class->SUPER::new ( 654 $class->SUPER::new (
677 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
678 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
679 @_ 657 @_
680 ) 658 )
681} 659}
682 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
683sub _draw { 668sub _draw {
684 my ($self) = @_; 669 my ($self) = @_;
685 670
686 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self
687 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
688 : $self->{bg}; 673 : $self->{bg};
689 674
690 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
691 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
692 677
693 glEnable GL_BLEND; 678 glEnable GL_BLEND;
694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695 glColor_premultiply @$color; 680 glColor_premultiply @$color;
696
697 glBegin GL_QUADS;
698 glVertex 0 , 0;
699 glVertex 0 , $h;
700 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
701 glVertex $w, 0;
702 glEnd;
703
704 glDisable GL_BLEND; 682 glDisable GL_BLEND;
705 } 683 }
706} 684}
707 685
708############################################################################# 686#############################################################################
709 687
710package CFPlus::UI::Empty; 688package DC::UI::Empty;
711 689
712our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
713 691
714sub new { 692sub new {
715 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
716 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
717} 695}
… …
724 702
725sub draw { } 703sub draw { }
726 704
727############################################################################# 705#############################################################################
728 706
729package CFPlus::UI::Container; 707package DC::UI::Container;
730 708
731our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
732 710
733sub new { 711sub new {
734 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
735 713
736 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
769 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
770 ]; 748 ];
771 749
772 $self->realloc; 750 $self->realloc;
773 751
752 $self->emit (c_add => \@widgets);
753
774 map $_+0, @widgets 754 map $_+0, @widgets
775} 755}
776 756
777sub children { 757sub children {
778 @{ $_[0]{children} } 758 @{ $_[0]{children} }
779} 759}
780 760
781sub remove { 761sub remove {
782 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
783 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
784 delete $child->{parent}; 767 delete $child->{parent};
785 $child->hide; 768 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
788 771
789 $self->realloc; 772 $self->realloc;
790} 773}
791 774
792sub clear { 775sub clear {
… …
820} 803}
821 804
822sub _draw { 805sub _draw {
823 my ($self) = @_; 806 my ($self) = @_;
824 807
825 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
826} 809}
827 810
828############################################################################# 811#############################################################################
829 812
830package CFPlus::UI::Bin; 813package DC::UI::Bin;
831 814
832our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
833 816
834sub new { 817sub new {
835 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
836 819
837 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
838 821
839 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
840} 823}
841 824
842sub add { 825sub add {
843 my ($self, $child) = @_; 826 my ($self, $child) = @_;
844 827
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
846 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
847} 830}
848 831
849sub remove { 832sub remove {
850 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
851 834
852 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
853 836
854 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
855 unless @{$self->{children}}; 838 unless @{$self->{children}};
856} 839}
857 840
858sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
859 842
… …
868 851
869 1 852 1
870} 853}
871 854
872############################################################################# 855#############################################################################
873
874# back-buffered drawing area 856# back-buffered drawing area
875 857
876package CFPlus::UI::Window; 858package DC::UI::Window;
877 859
878our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
879 861
880use CFPlus::OpenGL; 862use DC::OpenGL;
881 863
882sub new { 864sub new {
883 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
884 866
885 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
907} 889}
908 890
909sub render_child { 891sub render_child {
910 my ($self) = @_; 892 my ($self) = @_;
911 893
912 $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 {
913 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
914 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
915 897
916 { 898 {
917 package CFPlus::UI::Base; 899 package DC::UI::Base;
918 900
919 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
920 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
921 903
922 $self->_render; 904 $self->_render;
… …
939 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
940} 922}
941 923
942############################################################################# 924#############################################################################
943 925
944package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
945 927
946use List::Util qw(min max); 928use List::Util qw(min max);
947 929
948our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
949 931
950sub new { 932sub new {
951 my $class = shift; 933 my $class = shift;
952 934
953 $class->SUPER::new ( 935 $class->SUPER::new (
… …
995 $self->emit (changed => $x, $y); 977 $self->emit (changed => $x, $y);
996 $self->update; 978 $self->update;
997 } 979 }
998} 980}
999 981
982sub set_center {
983 my ($self, $x, $y) = @_;
984
985 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
986}
987
988sub make_visible {
989 my ($self, $x, $y, $border) = @_;
990
991 if ( $x < $self->{view_x} + $self->{w} * $border
992 || $x > $self->{view_x} + $self->{w} * (1 - $border)
993 || $y < $self->{view_y} + $self->{h} * $border
994 || $y > $self->{view_y} + $self->{h} * (1 - $border)
995 ) {
996 $self->set_center ($x, $y);
997 }
998}
999
1000# 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
1001sub coord2local { 1001sub coord2local {
1002 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
1003 1003
1004 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1004 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1021 ) { 1021 ) {
1022 $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})
1023 } else { 1023 } else {
1024 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1025 } 1025 }
1026} 1026}
1027 1027
1028sub _render { 1028sub _render {
1029 my ($self) = @_; 1029 my ($self) = @_;
1030 1030
1031 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};
1032 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};
1033 1033
1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1035 1035
1036 $self->SUPER::_render; 1036 $self->SUPER::_render;
1037} 1037}
1038 1038
1039############################################################################# 1039#############################################################################
1040 1040
1041package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1042 1042
1043our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1044 1044
1045sub new { 1045sub new {
1046 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1047 1047
1048 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1049 1049
1050 my $self; 1050 my $self;
1051 1051
1052 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1053 col => 0, 1053 c_col => 0,
1054 row => 1, 1054 c_row => 1,
1055 vertical => 0, 1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub { 1057 on_changed => sub {
1058 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 }, 1060 },
1061 ; 1061 ;
1062 1062
1063 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1064 col => 1, 1064 c_col => 1,
1065 row => 0, 1065 c_row => 0,
1066 vertical => 1, 1066 vertical => 1,
1067 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1068 on_changed => sub { 1068 on_changed => sub {
1069 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 col_expand => [1, 0], 1080 col_expand => [1, 0],
1081 row_expand => [1, 0], 1081 row_expand => [1, 0],
1082 %arg, 1082 %arg,
1083 ); 1083 );
1084 1084
1085 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new DC::UI::ViewPort
1086 col => 0, 1086 c_col => 0,
1087 row => 0, 1087 c_row => 0,
1088 expand => 1, 1088 expand => 1,
1089 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub { 1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_; 1092 my ($vp, $x, $y) = @_;
… …
1114 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1115 1115
1116 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1117} 1117}
1118 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
1119sub update_slider { 1123sub update_slider {
1120 my ($self) = @_; 1124 my ($self) = @_;
1121 1125
1122 my $child = ($self->{vp} or return)->child; 1126 my $child = ($self->{vp} or return)->child;
1123 1127
… …
1212 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1213} 1217}
1214 1218
1215############################################################################# 1219#############################################################################
1216 1220
1217package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1218 1222
1219our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1220 1224
1221use CFPlus::OpenGL; 1225use DC::OpenGL;
1222 1226
1223sub new { 1227sub new {
1224 my $class = shift; 1228 my $class = shift;
1225 1229
1226 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1236 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1237 1241
1238 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1240 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1241
1242 glBegin GL_QUADS;
1243 glVertex 0 , 0;
1244 glVertex 0 , $h;
1245 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1246 glVertex $w, 0;
1247 glEnd;
1248
1249 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1250 } 1247 }
1251 1248
1252 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1253} 1250}
1254 1251
1255############################################################################# 1252#############################################################################
1256 1253
1257package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1258 1255
1259our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1260 1257
1261use CFPlus::OpenGL; 1258use DC::OpenGL;
1262 1259
1263sub new { 1260sub new {
1264 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1265 1262
1266 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1267 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1268 align => 1, 1265 align => 1,
1269 valign => 0, 1266 valign => 0.5,
1270 text => $arg{label}, 1267 text => $arg{label},
1271 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1272 } 1269 }
1273 1270
1274 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1275 # label => "", 1272 # label => "",
1276 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1277 border => 0.8, 1274 border => 0.8,
1278 style => 'single', 1275 style => 'single',
1279 %arg, 1276 %arg,
1280 ); 1277 );
1281 1278
… …
1284 1281
1285sub add { 1282sub add {
1286 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1287 1284
1288 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1289 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1290} 1287}
1291 1288
1292sub border { 1289sub border {
1293 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1294} 1291}
… …
1334 my $border = $self->border; 1331 my $border = $self->border;
1335 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1336 1333
1337 $child->draw; 1334 $child->draw;
1338 1335
1339 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1340 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1341 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1342 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1343 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;
1344 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;
… …
1352 } 1349 }
1353} 1350}
1354 1351
1355############################################################################# 1352#############################################################################
1356 1353
1357package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1358 1355
1359our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1360 1357
1361use CFPlus::OpenGL; 1358use DC::OpenGL;
1362 1359
1363my $bg = 1360my $bg =
1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1365 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1366 1363
1367my @border = 1364my @border =
1368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1369 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);
1370 1367
1371my @icon = 1368my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png); 1370 qw(x1_move.png x1_resize.png);
1374 1371
1375sub new { 1372sub new {
1376 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1377 1374
1378 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1379 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1380 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1381 border => 0.6, 1378 border => 0.8,
1382 can_events => 1, 1379 can_events => 1,
1383 min_w => 64, 1380 min_w => 64,
1384 min_h => 32, 1381 min_h => 32,
1385 %arg, 1382 %arg,
1386 ); 1383 );
1387 1384
1388 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1389 align => 0, 1386 align => 0.5,
1390 valign => 1, 1387 valign => 1,
1391 text => $self->{title}, 1388 text => $self->{title},
1392 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1393 if exists $self->{title}; 1390 if exists $self->{title};
1394 1391
1395 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1396 $self->{close_button} = 1393 $self->{close_button} =
1397 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1398 path => 'x1_close.png', 1395 path => 'x1_close.png',
1399 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1400 1397
1401 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1402 } 1399 }
1403 1400
1404 $self 1401 $self
1405} 1402}
1406 1403
1407sub add { 1404sub add {
1408 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1409 1406
1410 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1411 $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};
1412 $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};
1413} 1410}
1414 1411
1415sub border { 1412sub border {
1416 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
1417} 1423}
1418 1424
1419sub size_request { 1425sub size_request {
1420 my ($self) = @_; 1426 my ($self) = @_;
1421 1427
… …
1546 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1548 1554
1549 my $border = $self->border; 1555 my $border = $self->border;
1550 1556
1557 if ($border) {
1551 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556 1563
1557 # move 1564 # move
1558 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563 1570
1564 # resize 1571 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1570 1578
1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1572 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1573 1581
1574 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1593 if $self->{close_button}; 1601 if $self->{close_button};
1594} 1602}
1595 1603
1596############################################################################# 1604#############################################################################
1597 1605
1598package CFPlus::UI::Table; 1606package DC::UI::Table;
1599 1607
1600our @ISA = CFPlus::UI::Container::; 1608our @ISA = DC::UI::Container::;
1601 1609
1602use List::Util qw(max sum); 1610use List::Util qw(max sum);
1603 1611
1604use CFPlus::OpenGL; 1612use DC::OpenGL;
1605 1613
1606sub new { 1614sub new {
1607 my $class = shift; 1615 my $class = shift;
1608 1616
1609 $class->SUPER::new ( 1617 $class->SUPER::new (
… …
1615 1623
1616sub add { 1624sub add {
1617 my ($self, @widgets) = @_; 1625 my ($self, @widgets) = @_;
1618 1626
1619 for my $child (@widgets) { 1627 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1; 1628 $child->{c_rowspan} ||= 1;
1621 $child->{colspan} ||= 1; 1629 $child->{c_colspan} ||= 1;
1622 } 1630 }
1623 1631
1624 $self->SUPER::add (@widgets); 1632 $self->SUPER::add (@widgets);
1625} 1633}
1626 1634
… …
1630 my @widgets; 1638 my @widgets;
1631 1639
1632 while (@_) { 1640 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1634 1642
1635 $child->{row} = $row; 1643 $child->{c_row} = $row;
1636 $child->{col} = $col; 1644 $child->{c_col} = $col;
1637 1645
1638 push @widgets, $child; 1646 push @widgets, $child;
1639 } 1647 }
1640 1648
1641 $self->add (@widgets); 1649 $self->add (@widgets);
… …
1647 my (@w, @h); 1655 my (@w, @h);
1648 1656
1649 my @children = $self->children; 1657 my @children = $self->children;
1650 1658
1651 # first pass, columns 1659 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1660 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1661 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1654 1662
1655 my $sw = sum @w[$c .. $c + $cs - 1]; 1663 my $sw = sum @w[$c .. $c + $cs - 1];
1656 1664
1657 if ($w > $sw) { 1665 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1666 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 } 1667 }
1660 } 1668 }
1661 1669
1662 # second pass, rows 1670 # second pass, rows
1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1665 1673
1666 my $sh = sum @h[$r .. $r + $rs - 1]; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1667 1675
1668 if ($h > $sh) { 1676 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1670 } 1678 }
1671 } 1679 }
1672 1680
1673 (\@w, \@h) 1681 (\@w, \@h)
1674} 1682}
… …
1697 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1698 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1699 1707
1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1701 1709
1702 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1703 1711
1704 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1707 1715
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709 1717
1710 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1711 1719
1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1722
1715 for my $widget ($self->children) { 1723 for my $widget ($self->children) {
1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1724 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1717 1725
1718 $widget->configure ( 1726 $widget->configure (
1719 $x[$c], $y[$r], 1727 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 ); 1729 );
… …
1724 1 1732 1
1725} 1733}
1726 1734
1727############################################################################# 1735#############################################################################
1728 1736
1729package CFPlus::UI::Fixed; 1737package DC::UI::Fixed;
1730 1738
1731use List::Util qw(min max); 1739use List::Util qw(min max);
1732 1740
1733our @ISA = CFPlus::UI::Container::; 1741our @ISA = DC::UI::Container::;
1734
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741 1742
1742sub _scale($$$) { 1743sub _scale($$$) {
1743 my ($mode, $val, $max) = @_; 1744 my ($rel, $val, $max) = @_;
1744 1745
1745 $mode eq "abs" ? $val 1746 $rel ? $val * $max : $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748} 1747}
1749 1748
1750sub size_request { 1749sub size_request {
1751 my ($self) = @_; 1750 my ($self) = @_;
1752 1751
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1752 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754 1753
1755 # determine overall size by querying abs widgets 1754 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) { 1755 for my $child ($self->visible_children) {
1757 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};
1758 1759
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 } 1762 }
1766 } 1763 }
1767 1764
1768 my $W = $x2 - $x1; 1765 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1; 1766 my $H = $y2 - $y1;
1770 1767
1771 # now layout remaining widgets 1768 # now layout remaining widgets
1772 for my $child ($self->visible_children) { 1769 for my $child ($self->visible_children) {
1773 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;
1774 1773
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783 } 1776 }
1784 } 1777 }
1785 1778
1786 my $W = $x2 - $x1; 1779 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1; 1780 my $H = $y2 - $y1;
… …
1791 1784
1792sub invoke_size_allocate { 1785sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_; 1786 my ($self, $W, $H) = @_;
1794 1787
1795 for my $child ($self->visible_children) { 1788 for my $child ($self->visible_children) {
1796 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;
1797 1791
1798 $x = _scale $pos, $x, $W; 1792 $x += $child->{c_halign} * $child->{req_w};
1799 $y = _scale $pos, $x, $H; 1793 $y += $child->{c_valign} * $child->{req_h};
1800 $w = _scale $size, $w, $child->{req_w};
1801 $h = _scale $size, $h, $child->{req_h};
1802 1794
1803 $child->configure ($x, $y, $w, $h); 1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804 } 1796 }
1805 1797
1806 1 1798 1
1807} 1799}
1808 1800
1809############################################################################# 1801#############################################################################
1810 1802
1811package CFPlus::UI::Box; 1803package DC::UI::Box;
1812 1804
1813our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1814 1806
1815sub size_request { 1807sub size_request {
1816 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1817 1811
1818 $self->{vertical} 1812 $self->{vertical}
1819 ? ( 1813 ? (
1820 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1821 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1822 ) 1816 )
1823 : ( 1817 : (
1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1825 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1826 ) 1820 )
1827} 1821}
1828 1822
1829sub invoke_size_allocate { 1823sub invoke_size_allocate {
1830 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1851 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1852 for 0 .. $#children; 1846 for 0 .. $#children;
1853 } 1847 }
1854 } 1848 }
1855 1849
1856 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1857 1851
1858 my $pos = 0; 1852 my $pos = 0;
1859 for (0 .. $#children) { 1853 for (0 .. $#children) {
1860 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1861 $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));
… …
1866 1 1860 1
1867} 1861}
1868 1862
1869############################################################################# 1863#############################################################################
1870 1864
1871package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1872 1866
1873our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1874 1868
1875sub new { 1869sub new {
1876 my $class = shift; 1870 my $class = shift;
1877 1871
1878 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1881 ) 1875 )
1882} 1876}
1883 1877
1884############################################################################# 1878#############################################################################
1885 1879
1886package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1887 1881
1888our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1889 1883
1890sub new { 1884sub new {
1891 my $class = shift; 1885 my $class = shift;
1892 1886
1893 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1896 ) 1890 )
1897} 1891}
1898 1892
1899############################################################################# 1893#############################################################################
1900 1894
1901package CFPlus::UI::Label; 1895package DC::UI::Label;
1902 1896
1903our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1904 1898
1905use CFPlus::OpenGL; 1899use DC::OpenGL;
1906 1900
1907sub new { 1901sub new {
1908 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1909 1903
1910 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1915 #text => initial text 1909 #text => initial text
1916 #markup => initial narkup 1910 #markup => initial narkup
1917 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1918 #style => 0, # render flags 1912 #style => 0, # render flags
1919 ellipsise => 3, # end 1913 ellipsise => 3, # end
1920 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1921 fontsize => 1, 1915 fontsize => 1,
1922 align => -1, 1916 align => 0.5,
1923 valign => -1, 1917 valign => 0.5,
1924 padding_x => 2, 1918 padding_x => 4,
1925 padding_y => 2, 1919 padding_y => 2,
1926 can_events => 0, 1920 can_events => 0,
1927 %arg 1921 %arg
1928 ); 1922 );
1929 1923
1930 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1931 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1932 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1933 $self->{template} = $layout; 1927 $self->{template} = $layout;
1934 } 1928 }
1935 1929
1936 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1954 1948
1955 delete $self->{ox}; 1949 delete $self->{ox};
1956 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1957} 1951}
1958 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1959sub set_text { 1959sub set_text {
1960 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1961 1961
1962 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1963 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
… …
1986 1986
1987sub size_request { 1987sub size_request {
1988 my ($self) = @_; 1988 my ($self) = @_;
1989 1989
1990 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1991 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1992 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1993 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1994 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1995 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1996 1998
1997 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1998 2000
1999 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
2000 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
2001 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
2002 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2003 2005
2004 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
2005 2007
2006 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
2062 2064
2063 [$self->{layout}->size] 2065 [$self->{layout}->size]
2064 }; 2066 };
2065 2067
2066 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
2067 $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);
2068 : $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);
2069 : ($self->{w} - $size->[0]) * 0.5);
2070 2071
2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2073 : ($self->{h} - $size->[1]) * 0.5);
2074 }; 2073 };
2075 2074
2076 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2075# unless ($self->{list}) {
2077 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2076# $self->{list} = DC::OpenGL::glGenList;
2078 2077# DC::OpenGL::glNewList $self->{list};
2079 $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;
2080} 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#}
2081 2094
2082############################################################################# 2095#############################################################################
2083 2096
2084package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
2085 2098
2086our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
2087 2100
2088use CFPlus::OpenGL; 2101use DC::OpenGL;
2089 2102
2090sub new { 2103sub new {
2091 my $class = shift; 2104 my $class = shift;
2092 2105
2093 $class->SUPER::new ( 2106 $class->SUPER::new (
2094 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2095 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
2096 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
2097 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
2098 can_hover => 1, 2113 can_hover => 1,
2099 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
2100 valign => 0, 2116 valign => 0.5,
2101 can_events => 1, 2117 can_events => 1,
2102 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
2103 #text => ... 2121 #text => ...
2104 #hidden => "*", 2122 #hidden => "*",
2105 @_ 2123 @_
2106 ) 2124 )
2107} 2125}
… …
2154 2172
2155 my $text = $self->get_text; 2173 my $text = $self->get_text;
2156 2174
2157 $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;
2158 2176
2159 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2161 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2162 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2163 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2164 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2165 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2166 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2167 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2168 # what a hack 2186 # what a hack
2169 $self->{cursor} = 2187 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1 2189 ? length $1
2172 : 0; 2190 : 0;
2173 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2174 # uh, again 2192 # uh, again
2175 $self->{cursor} = 2193 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2178 : length $self->{text}; 2196 : length $self->{text};
… …
2242 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2243 } 2261 }
2244 2262
2245 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glBegin GL_QUADS;
2248 glVertex 0 , 0;
2249 glVertex 0 , $self->{h};
2250 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2251 glVertex $self->{w}, 0;
2252 glEnd;
2253 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2254 2267
2255 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2256 2269
2257 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
2259 2272
2260 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
2261 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
2262 utf8::encode $text; 2275 utf8::encode $text;
2263 2276
2264 @$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);
2265 } 2278 }
2266 2279
2280 glColor_premultiply @{$self->{active_fg}};
2267 glBegin GL_LINES; 2281 glBegin GL_LINES;
2268 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};
2269 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};
2270 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;
2271 } 2299 }
2272} 2300}
2273 2301
2274############################################################################# 2302#############################################################################
2275 2303
2276package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2277 2305
2278our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2279 2307
2280use 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
2281 2319
2282sub invoke_key_down { 2320sub invoke_key_down {
2283 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2284 2322
2285 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2291 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2292 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2293 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2294 $self->update; 2332 $self->update;
2295 2333
2296 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2297 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2298 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2299 } 2337 }
2300 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2301 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2303 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2304 } 2342 }
2305 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2306 } 2344 }
2307 2345
2308 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2309 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2311 2349
2312 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2313 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2314 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2315 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2316 } 2357 }
2317 2358
2318 } else { 2359 } else {
2319 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2320 } 2361 }
… …
2322 1 2363 1
2323} 2364}
2324 2365
2325############################################################################# 2366#############################################################################
2326 2367
2327package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2328 2369
2329our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2330 2371
2331use 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}
2332 2383
2333sub move_cursor_ver { 2384sub move_cursor_ver {
2334 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2335 2386
2336 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2337 2388
2338 $y += $dy; 2389 $line += $dy;
2339 2390
2340 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))) {
2341 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2342 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2343 $self->update; 2394 $self->update;
2344 return; 2395 return;
2345 } 2396 }
… …
2348sub invoke_key_down { 2399sub invoke_key_down {
2349 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2350 2401
2351 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2352 2403
2353 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2354 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2355 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2356 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2357 } else { 2408 } else {
2358 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2359 } 2410 }
2360 2411
2361 1 2412 1
2362} 2413}
2363 2414
2364############################################################################# 2415#############################################################################
2365 2416
2366package CFPlus::UI::Button; 2417package DC::UI::ButtonBin;
2367 2418
2368our @ISA = CFPlus::UI::Label::; 2419our @ISA = DC::UI::Bin::;
2369 2420
2370use CFPlus::OpenGL; 2421use DC::OpenGL;
2371 2422
2372my @tex = 2423my @tex =
2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2374 qw(b1_button_inactive.png b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2375 2426
2376sub new { 2427sub new {
2377 my $class = shift; 2428 my $class = shift;
2378 2429
2379 $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 (
2380 padding_x => 4, 2480 padding_x => 8,
2381 padding_y => 4, 2481 padding_y => 4,
2382 fg => [1.0, 1.0, 1.0], 2482 fg => [1.0, 1.0, 1.0],
2383 active_fg => [0.8, 0.8, 0.8], 2483 active_fg => [0.8, 0.8, 0.8],
2384 can_hover => 1, 2484 can_hover => 1,
2385 align => 0, 2485 align => 0.5,
2386 valign => 0, 2486 valign => 0.5,
2387 can_events => 1, 2487 can_events => 1,
2388 @_ 2488 @_
2389 ) 2489 )
2390} 2490}
2391 2491
… …
2416 $self->SUPER::_draw; 2516 $self->SUPER::_draw;
2417} 2517}
2418 2518
2419############################################################################# 2519#############################################################################
2420 2520
2421package CFPlus::UI::CheckBox; 2521package DC::UI::CheckBox;
2422 2522
2423our @ISA = CFPlus::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2424 2524
2425my @tex = 2525my @tex =
2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2427 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2428 2528
2429use CFPlus::OpenGL; 2529use DC::OpenGL;
2430 2530
2431sub new { 2531sub new {
2432 my $class = shift; 2532 my $class = shift;
2433 2533
2434 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2435 padding_x => 2, 2536 padding_x => 2,
2436 padding_y => 2, 2537 padding_y => 2,
2437 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2438 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2439 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2445} 2546}
2446 2547
2447sub size_request { 2548sub size_request {
2448 my ($self) = @_; 2549 my ($self) = @_;
2449 2550
2450 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2451} 2552}
2452 2553
2453sub toggle { 2554sub toggle {
2454 my ($self) = @_; 2555 my ($self) = @_;
2455 2556
… …
2474sub _draw { 2575sub _draw {
2475 my ($self) = @_; 2576 my ($self) = @_;
2476 2577
2477 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2478 2579
2479 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2480 2581
2481 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2482 2583
2483 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;
2484 2585
… …
2491 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2492} 2593}
2493 2594
2494############################################################################# 2595#############################################################################
2495 2596
2496package CFPlus::UI::Image; 2597package DC::UI::Image;
2497 2598
2498our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2499 2600
2500use CFPlus::OpenGL; 2601use DC::OpenGL;
2501 2602
2502our %texture_cache; 2603our %texture_cache;
2503 2604
2504sub new { 2605sub new {
2505 my $class = shift; 2606 my $class = shift;
2506 2607
2507 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2508 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2509 @_, 2611 @_,
2510 ); 2612 );
2511 2613
2512 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2514 2616
2515 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2517 2619
2518 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2519 2621
2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2521 2623
2522 $self 2624 $self
2523} 2625}
2524 2626
2525sub STORABLE_freeze { 2627sub STORABLE_freeze {
2526 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2527 2629
2528 $self->{path} 2630 $self->{path}
2529 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";
2530 2632
2531 $self->{path} 2633 $self->{path}
2532} 2634}
2533 2635
2534sub STORABLE_attach { 2636sub STORABLE_attach {
2535 my ($self, $cloning, $path) = @_; 2637 my ($self, $cloning, $path) = @_;
2536 2638
2537 $self->new (path => $path) 2639 $self->new (path => $path)
2538} 2640}
2539 2641
2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2647}
2648
2540sub size_request { 2649sub size_request {
2541 my ($self) = @_; 2650 my ($self) = @_;
2542 2651
2543 ($self->{tex}{w}, $self->{tex}{h}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2544} 2653}
2545 2654
2546sub _draw { 2655sub _draw {
2547 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2548 2659
2549 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2550 2661
2551 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2552 2663
… …
2558 } 2669 }
2559 2670
2560 glEnable GL_TEXTURE_2D; 2671 glEnable GL_TEXTURE_2D;
2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562 2673
2563 $tex->draw_quad (0, 0, $w, $h); 2674 $tex->draw_quad_alpha (0, 0, $w, $h);
2564 2675
2565 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2566} 2677}
2567 2678
2568############################################################################# 2679#############################################################################
2569 2680
2570package CFPlus::UI::ImageButton; 2681package DC::UI::ImageButton;
2571 2682
2572our @ISA = CFPlus::UI::Image::; 2683our @ISA = DC::UI::Image::;
2573 2684
2574use CFPlus::OpenGL; 2685use DC::OpenGL;
2575
2576my %textures;
2577 2686
2578sub new { 2687sub new {
2579 my $class = shift; 2688 my $class = shift;
2580 2689
2581 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2582 padding_x => 4, 2691 padding_x => 4,
2583 padding_y => 4, 2692 padding_y => 4,
2584 fg => [1, 1, 1], 2693 fg => [1, 1, 1],
2585 active_fg => [0, 0, 1], 2694 active_fg => [0, 0, 1],
2586 can_hover => 1, 2695 can_hover => 1,
2587 align => 0, 2696 align => 0.5,
2588 valign => 0, 2697 valign => 0.5,
2589 can_events => 1, 2698 can_events => 1,
2590 @_ 2699 @_
2591 ); 2700 );
2592} 2701}
2593 2702
2703sub invoke_button_down {
2704 my ($self, $ev, $x, $y) = @_;
2705
2706 1
2707}
2708
2594sub invoke_button_up { 2709sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_; 2710 my ($self, $ev, $x, $y) = @_;
2596 2711
2597 $self->emit ("activate") 2712 $self->emit ("activate")
2598 if $x >= 0 && $x < $self->{w} 2713 if $x >= 0 && $x < $self->{w}
… …
2601 1 2716 1
2602} 2717}
2603 2718
2604############################################################################# 2719#############################################################################
2605 2720
2606package CFPlus::UI::VGauge; 2721package DC::UI::VGauge;
2607 2722
2608our @ISA = CFPlus::UI::Base::; 2723our @ISA = DC::UI::Base::;
2609 2724
2610use List::Util qw(min max); 2725use List::Util qw(min max);
2611 2726
2612use CFPlus::OpenGL; 2727use DC::OpenGL;
2613 2728
2614my %tex = ( 2729my %tex = (
2615 food => [ 2730 food => [
2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2618 ], 2733 ],
2619 grace => [ 2734 grace => [
2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2621 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/
2622 ], 2737 ],
2623 hp => [ 2738 hp => [
2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2626 ], 2741 ],
2627 mana => [ 2742 mana => [
2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2629 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/
2630 ], 2745 ],
2631); 2746);
2632 2747
2633# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2736 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2737} 2852}
2738 2853
2739############################################################################# 2854#############################################################################
2740 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
2741package CFPlus::UI::Gauge; 3010package DC::UI::Gauge;
2742 3011
2743our @ISA = CFPlus::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2744 3013
2745sub new { 3014sub new {
2746 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2747 3016
2748 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2750 can_hover => 1, 3019 can_hover => 1,
2751 can_events => 1, 3020 can_events => 1,
2752 %arg, 3021 %arg,
2753 ); 3022 );
2754 3023
2755 $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");
2756 $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);
2757 $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");
2758 3027
2759 $self 3028 $self
2760} 3029}
2761 3030
2762sub set_fontsize { 3031sub set_fontsize {
… …
2783 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2784} 3053}
2785 3054
2786############################################################################# 3055#############################################################################
2787 3056
2788package CFPlus::UI::Slider; 3057package DC::UI::Slider;
2789 3058
2790use strict; 3059use common::sense;
2791 3060
2792use CFPlus::OpenGL; 3061use DC::OpenGL;
2793 3062
2794our @ISA = CFPlus::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2795 3064
2796my @tex = 3065my @tex =
2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2798 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2799 3068
2800sub new { 3069sub new {
2801 my $class = shift; 3070 my $class = shift;
2802 3071
… …
2839sub set_value { 3108sub set_value {
2840 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2841 3110
2842 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2843 3112
2844 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2845 3114
2846 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2847
2848 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2849 $value = $hi - $page if $value > $hi - $page;
2850 3117
2851 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2852 if $unit; 3119 if $unit;
2853 3120
2854 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2870 3137
2871 $self->SUPER::invoke_button_down ($ev, $x, $y); 3138 $self->SUPER::invoke_button_down ($ev, $x, $y);
2872 3139
2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3140 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874 3141
2875 $self->invoke_mouse_motion ($ev, $x, $y) 3142 $self->invoke_mouse_motion ($ev, $x, $y);
3143
3144 1
2876} 3145}
2877 3146
2878sub invoke_mouse_motion { 3147sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3148 my ($self, $ev, $x, $y) = @_;
2880 3149
2881 if ($GRAB == $self) { 3150 if ($GRAB == $self) {
2882 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3151 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2883 3152
2884 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3153 my (undef, $lo, $hi, $page) = @{$self->{range}};
2885 3154
2886 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3155 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2887 3156
2888 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3157 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2889 } else { 3158 } else {
2890 return 0; 3159 return 0;
2891 } 3160 }
… …
2896sub invoke_mouse_wheel { 3165sub invoke_mouse_wheel {
2897 my ($self, $ev) = @_; 3166 my ($self, $ev) = @_;
2898 3167
2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3168 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2900 3169
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3170 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2902 3171
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3172 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904 3173
2905 ! ! $delta 3174 1
2906} 3175}
2907 3176
2908sub update { 3177sub update {
2909 my ($self) = @_; 3178 my ($self) = @_;
2910 3179
… …
2916 my ($self) = @_; 3185 my ($self) = @_;
2917 3186
2918 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
2919 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2920 3189
2921 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2922 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2923 3192
2924 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};
2925 3194
2926 $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;
2927 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2928 3197
2929 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
… …
2959 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
2960} 3229}
2961 3230
2962############################################################################# 3231#############################################################################
2963 3232
2964package CFPlus::UI::ValSlider; 3233package DC::UI::ValSlider;
2965 3234
2966our @ISA = CFPlus::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
2967 3236
2968sub new { 3237sub new {
2969 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
2970 3239
2971 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
2972 3241
2973 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
2974 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
2975 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2976 to_value => sub { shift }, 3245 to_value => sub { shift },
2977 from_value => sub { shift }, 3246 from_value => sub { shift },
2978 %arg, 3247 %arg,
2979 ); 3248 );
2980 3249
… …
3000sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
3001sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
3002 3271
3003############################################################################# 3272#############################################################################
3004 3273
3005package CFPlus::UI::TextScroller; 3274package DC::UI::TextScroller;
3006 3275
3007our @ISA = CFPlus::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
3008 3277
3009use CFPlus::OpenGL; 3278use DC::OpenGL;
3010 3279
3011sub new { 3280sub new {
3012 my $class = shift; 3281 my $class = shift;
3013 3282
3014 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
… …
3016 can_events => 1, 3285 can_events => 1,
3017 indent => 0, 3286 indent => 0,
3018 #font => default_font 3287 #font => default_font
3019 @_, 3288 @_,
3020 3289
3021 layout => (new CFPlus::Layout), 3290 layout => (new DC::Layout),
3022 par => [], 3291 par => [],
3023 max_par => 0, 3292 max_par => 0,
3024 height => 0, 3293 height => 0,
3025 children => [ 3294 children => [
3026 (new CFPlus::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
3027 (new CFPlus::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
3028 ], 3297 ],
3029 ); 3298 );
3030 3299
3031 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
3032 3301
… …
3041} 3310}
3042 3311
3043sub size_request { 3312sub size_request {
3044 my ($self) = @_; 3313 my ($self) = @_;
3045 3314
3046 my ($empty, $slider) = @{ $self->{children} }; 3315 my ($empty, $slider) = $self->visible_children;
3047 3316
3048 local $self->{children} = [$empty, $slider]; 3317 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request 3318 $self->SUPER::size_request
3050} 3319}
3051 3320
… …
3088 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3089 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
3090 3359
3091 $layout->set_shapes ( 3360 $layout->set_shapes (
3092 map 3361 map
3093 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3094 @{$para->{widget}} 3363 @{$para->{widget}}
3095 ); 3364 );
3096 3365
3097 $layout 3366 $layout
3098} 3367}
… …
3215 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate; 3485 $self->force_uptodate;
3217 3486
3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3219 3488
3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3221 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
3222 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
3223 3492
3224 package CFPlus::UI::Base; 3493 package DC::UI::Base;
3225 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3494 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226 (0, 0, $self->{w}, $self->{h}); 3495 (0, 0, $self->{w}, $self->{h});
3227 3496
3228 my $top = int $self->{children}[1]{range}[0]; 3497 my $top = int $self->{children}[1]{range}[0];
3229 3498
… …
3240 3509
3241 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
3242 my $layout = $self->get_layout ($para); 3511 my $layout = $self->get_layout ($para);
3243 3512
3244 $layout->render ($para->{indent}, $y - $y0); 3513 $layout->render ($para->{indent}, $y - $y0);
3514 $layout->draw;
3245 3515
3246 if (my @w = @{ $para->{widget} }) { 3516 if (my @w = @{ $para->{widget} }) {
3247 my @s = $layout->get_shapes; 3517 my @s = $layout->get_shapes;
3248 3518
3249 for (@w) { 3519 for (@w) {
… …
3287 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
3288} 3558}
3289 3559
3290############################################################################# 3560#############################################################################
3291 3561
3292package CFPlus::UI::Animator; 3562package DC::UI::Animator;
3293 3563
3294use CFPlus::OpenGL; 3564use DC::OpenGL;
3295 3565
3296our @ISA = CFPlus::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
3297 3567
3298sub moveto { 3568sub moveto {
3299 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
3300 3570
3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3329 glPopMatrix; 3599 glPopMatrix;
3330} 3600}
3331 3601
3332############################################################################# 3602#############################################################################
3333 3603
3334package CFPlus::UI::Flopper; 3604package DC::UI::Flopper;
3335 3605
3336our @ISA = CFPlus::UI::Button::; 3606our @ISA = DC::UI::Button::;
3337 3607
3338sub new { 3608sub new {
3339 my $class = shift; 3609 my $class = shift;
3340 3610
3341 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
… …
3353 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
3354} 3624}
3355 3625
3356############################################################################# 3626#############################################################################
3357 3627
3358package CFPlus::UI::Tooltip; 3628package DC::UI::Tooltip;
3359 3629
3360our @ISA = CFPlus::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
3361 3631
3362use CFPlus::OpenGL; 3632use DC::OpenGL;
3363 3633
3364sub new { 3634sub new {
3365 my $class = shift; 3635 my $class = shift;
3366 3636
3367 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
3371} 3641}
3372 3642
3373sub set_tooltip_from { 3643sub set_tooltip_from {
3374 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
3375 3645
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
3378
3379 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 =~ /^#(.*)$/;
3380 3651
3381 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
3382 $tooltip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
3383 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3384 . "req $widget->{req_w} $widget->{req_h}\n" 3655 . "req $widget->{req_w} $widget->{req_h}\n"
3385 . "visible $widget->{visible}"; 3656 . "visible $widget->{visible}";
3386 } 3657 }
3387 3658
3388 $tooltip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
3389 $tooltip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
3390 3661
3391 $self->add (new CFPlus::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
3392 markup => $tooltip, 3664 markup => $tip,
3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
3394 fontsize => 0.8, 3667 fontsize => 0.8,
3395 style => 1, # FLAG_INVERSE 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3396 ellipsise => 0, 3669 ellipsise => 0,
3397 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
3398 ); 3671 );
3399} 3672}
3400 3673
… …
3435} 3708}
3436 3709
3437sub _draw { 3710sub _draw {
3438 my ($self) = @_; 3711 my ($self) = @_;
3439 3712
3440 glTranslate 0.375, 0.375;
3441
3442 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
3443 3714
3444 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
3445 glBegin GL_QUADS; 3716 glRect 0, 0, $w, $h;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3717
3452 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
3453 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
3454 glVertex 0 , 0;
3455 glVertex 0 , $h;
3456 glVertex $w, $h;
3457 glVertex $w, 0;
3458 glEnd;
3459 3720
3460 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
3461 3722
3462 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
3463} 3724}
3464 3725
3465############################################################################# 3726#############################################################################
3466 3727
3467package CFPlus::UI::Face; 3728package DC::UI::Face;
3468 3729
3469our @ISA = CFPlus::UI::DrawBG::; 3730our @ISA = DC::UI::DrawBG::;
3470 3731
3471use CFPlus::OpenGL; 3732use DC::OpenGL;
3472 3733
3473sub new { 3734sub new {
3474 my $class = shift; 3735 my $class = shift;
3475 3736
3476 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
… …
3479 aspect => 1, 3740 aspect => 1,
3480 can_events => 0, 3741 can_events => 0,
3481 @_, 3742 @_,
3482 ); 3743 );
3483 3744
3484 if ($self->{anim} && $self->{animspeed}) {
3485 CFPlus::weaken (my $widget = $self);
3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3489 $self->{timer} = Event->timer (
3490 parked => 1,
3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
3494 ++$widget->{frame};
3495 $widget->update_face;
3496 $widget->update;
3497
3498 $widget->update_timer;
3499 },
3500 );
3501
3502 $self->update_face;
3503 $self->update_timer; 3745 $self->update_anim;
3504 }
3505 3746
3506 $self 3747 $self
3507} 3748}
3508 3749
3509sub update_timer { 3750sub update_timer {
3510 my ($self) = @_; 3751 my ($self) = @_;
3511 3752
3512 return unless $self->{timer}; 3753 return unless $self->{timer};
3513 3754
3514 if ($self->{visible}) { 3755 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start; 3756 $self->{timer}->start;
3521 } else { 3757 } else {
3522 $self->{timer}->stop; 3758 $self->{timer}->stop;
3523 } 3759 }
3524} 3760}
3525 3761
3526sub update_face { 3762sub update_face {
3527 my ($self) = @_; 3763 my ($self) = @_;
3528 3764
3529 return unless $::CONN;
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 }
3536 }
3537}
3538
3539sub size_request {
3540 my ($self) = @_;
3541
3542 if ($::CONN) { 3765 if ($::CONN) {
3543 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3766 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3544 if (my $tex = $::CONN->{texture}[$faceid]) { 3767 if ($anim && @$anim) {
3545 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3768 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3546 } else { 3769 delete $self->{face_change_cb};
3547 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3770
3548 $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 }
3549 }); 3775 }
3550 } 3776 }
3551 } 3777 }
3552 } 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 }
3553 3825
3554 ($self->{size_w} || 8, $self->{size_h} || 8) 3826 ($self->{size_w} || 8, $self->{size_h} || 8)
3555} 3827}
3556 3828
3557sub update { 3829sub update {
… …
3560 return unless $self->{visible}; 3832 return unless $self->{visible};
3561 3833
3562 $self->SUPER::update; 3834 $self->SUPER::update;
3563} 3835}
3564 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
3565sub invoke_visibility_change { 3858sub invoke_visibility_change {
3566 my ($self) = @_; 3859 my ($self) = @_;
3567 3860
3568 $self->update_timer; 3861 $self->update_timer;
3569 3862
… …
3571} 3864}
3572 3865
3573sub _draw { 3866sub _draw {
3574 my ($self) = @_; 3867 my ($self) = @_;
3575 3868
3576 return unless $::CONN;
3577
3578 $self->SUPER::_draw; 3869 $self->SUPER::_draw;
3579 3870
3580 my $faceid = $::CONN->{faceid}[$self->{face}] 3871 if (my $tex = $self->{tex}) {
3581 or return;
3582
3583 my $tex = $::CONN->{texture}[$faceid];
3584
3585 if ($tex) {
3586 glEnable GL_TEXTURE_2D; 3872 glEnable GL_TEXTURE_2D;
3587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3588 glColor 0, 0, 0, 1; 3874 glColor 0, 0, 0, 1;
3589 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3590 glDisable GL_TEXTURE_2D; 3876 glDisable GL_TEXTURE_2D;
… …
3600 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3601} 3887}
3602 3888
3603############################################################################# 3889#############################################################################
3604 3890
3605package CFPlus::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3606 3892
3607our @ISA = CFPlus::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3608 3894
3609# TODO: should actually wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3610 3896
3611############################################################################# 3897#############################################################################
3612 3898
3613package CFPlus::UI::Menu; 3899package DC::UI::Menu;
3614 3900
3615our @ISA = CFPlus::UI::Toplevel::; 3901our @ISA = DC::UI::Toplevel::;
3616 3902
3617use CFPlus::OpenGL; 3903use DC::OpenGL;
3618 3904
3619sub new { 3905sub new {
3620 my $class = shift; 3906 my $class = shift;
3621 3907
3622 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3623 items => [], 3909 items => [],
3624 z => 100, 3910 z => 100,
3625 @_, 3911 @_,
3626 ); 3912 );
3627 3913
3628 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3629 3915
3630 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3631 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3632 3918
3633 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3634 if (!ref $widget) { 3920 if (!ref $widget) {
3635 if ($widget =~ /\t/) { 3921 if ($widget =~ /\t/) {
3636 my ($left, $right) = split /\t/, $widget, 2; 3922 my ($left, $right) = split /\t/, $widget, 2;
3637 3923
3638 $widget = new CFPlus::UI::HBox 3924 $widget = new DC::UI::HBox
3639 can_hover => 1, 3925 can_hover => 1,
3640 can_events => 1, 3926 can_events => 1,
3641 tooltip => $tooltip, 3927 tooltip => $tooltip,
3642 children => [ 3928 children => [
3643 (new CFPlus::UI::Label markup => $left, expand => 1), 3929 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3644 (new CFPlus::UI::Label markup => $right, align => +1), 3930 (new DC::UI::Label markup => $right, align => 1),
3645 ], 3931 ],
3646 ; 3932 ;
3647 3933
3648 } else { 3934 } else {
3649 $widget = new CFPlus::UI::Label 3935 $widget = new DC::UI::Label
3650 can_hover => 1, 3936 can_hover => 1,
3651 can_events => 1, 3937 can_events => 1,
3938 align => 0,
3652 markup => $widget, 3939 markup => $widget,
3653 tooltip => $tooltip; 3940 tooltip => $tooltip;
3654 } 3941 }
3655 } 3942 }
3656 3943
… …
3671 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3672 $GRAB = $self; 3959 $GRAB = $self;
3673 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3674 3961
3675 $self->show; 3962 $self->show;
3676 $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
3677} 3972}
3678 3973
3679sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3680 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3681 3976
… …
3702 1 3997 1
3703} 3998}
3704 3999
3705############################################################################# 4000#############################################################################
3706 4001
3707package CFPlus::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3708 4003
3709our @ISA = CFPlus::UI::Container::; 4004our @ISA = DC::UI::Container::;
3710 4005
3711sub new { 4006sub new {
3712 my $class = shift; 4007 my $class = shift;
3713 4008
3714 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3715 @_, 4010 @_,
3716 ); 4011 );
3717 4012
3718 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3719 if @{ $self->{children} };
3720 4014
3721 $self 4015 $self
3722} 4016}
3723 4017
3724sub add { 4018sub add {
3725 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3726 4020
3727 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3728 4022
3729 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3730 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
3731} 4025}
3732 4026
3733sub get_current_page { 4027sub get_current_page {
3734 my ($self) = @_; 4028 my ($self) = @_;
3735 4029
… …
3741 4035
3742 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3743 ? $page_or_widget 4037 ? $page_or_widget
3744 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3745 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3746 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3747 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3748 4045
3749 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3750 4048
3751 $self->realloc; 4049 $self->realloc;
3752} 4050}
3753 4051
3754sub visible_children { 4052sub visible_children {
3755 $_[0]{current} 4053 $_[0]{current} || ()
3756} 4054}
3757 4055
3758sub size_request { 4056sub size_request {
3759 my ($self) = @_; 4057 my ($self) = @_;
3760 4058
4059 $self->{current}
3761 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3762} 4062}
3763 4063
3764sub invoke_size_allocate { 4064sub invoke_size_allocate {
3765 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3766 4066
3767 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3768 4069
3769 1 4070 1
3770} 4071}
3771 4072
3772sub _draw { 4073sub _draw {
3773 my ($self) = @_; 4074 my ($self) = @_;
3774 4075
3775 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3776} 4078}
3777 4079
3778############################################################################# 4080#############################################################################
3779 4081
3780package CFPlus::UI::Notebook; 4082package DC::UI::Notebook;
3781 4083
4084use DC::OpenGL;
4085
3782our @ISA = CFPlus::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3783 4087
3784sub new { 4088sub new {
3785 my $class = shift; 4089 my $class = shift;
3786 4090
3787 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3788 buttonbar => (new CFPlus::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3789 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
4094 active_outline => [.7, .7, 0.2],
3790 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3791 @_, 4096 @_,
3792 ); 4097 );
3793 4098
3794 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4099 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3795 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4100 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3796 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
3797 $self 4136 $self
3798} 4137}
3799 4138
3800sub 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 {
3801 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
3802 4170
3803 CFPlus::weaken $self; 4171 $title = [$title, $tooltip] unless ref $title;
4172 $widget->{c_tab} = $title;
3804 4173
3805 $self->{buttonbar}->add (new CFPlus::UI::Button
3806 markup => $title,
3807 tooltip => $tooltip,
3808 on_activate => sub { $self->set_current_page ($widget) },
3809 );
3810
3811 $self->{multiplexer}->add ($widget); 4174 $self->add ($widget);
3812} 4175}
3813 4176
3814sub get_current_page { 4177sub get_current_page {
3815 my ($self) = @_; 4178 my ($self) = @_;
3816 4179
… …
3822 4185
3823 $self->{multiplexer}->set_current_page ($page); 4186 $self->{multiplexer}->set_current_page ($page);
3824 $self->emit (page_changed => $self->{multiplexer}{current}); 4187 $self->emit (page_changed => $self->{multiplexer}{current});
3825} 4188}
3826 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
3827############################################################################# 4210#############################################################################
3828 4211
3829package CFPlus::UI::Selector; 4212package DC::UI::Selector;
3830 4213
3831use utf8; 4214use utf8;
3832 4215
3833our @ISA = CFPlus::UI::Button::; 4216our @ISA = DC::UI::Button::;
3834 4217
3835sub new { 4218sub new {
3836 my $class = shift; 4219 my $class = shift;
3837 4220
3838 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
… …
3855 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
3856 4239
3857 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3858 } 4241 }
3859 4242
3860 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3861} 4244}
3862 4245
3863sub _set_value { 4246sub _set_value {
3864 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
3865 4248
3866 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4249 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4250 $item ||= $self->{options}[0]
3867 or return; 4251 or return;
3868 4252
3869 $self->{value} = $item->[0]; 4253 $self->{value} = $item->[0];
3870 $self->set_markup ("$item->[1] ⇓"); 4254 $self->set_markup ("$item->[1] ⇓");
3871 $self->set_tooltip ($item->[2]); 4255# $self->set_tooltip ($item->[2]);
3872} 4256}
3873 4257
3874sub set_value { 4258sub set_value {
3875 my ($self, $value) = @_; 4259 my ($self, $value) = @_;
3876 4260
… …
3878 4262
3879 $self->_set_value ($value); 4263 $self->_set_value ($value);
3880 $self->emit (changed => $value); 4264 $self->emit (changed => $value);
3881} 4265}
3882 4266
4267sub set_options {
4268 my ($self, $options) = @_;
4269
4270 $self->{options} = $options;
4271 $self->_set_value ($self->{value});
4272}
4273
3883############################################################################# 4274#############################################################################
3884 4275
3885package CFPlus::UI::Statusbox; 4276package DC::UI::Statusbox;
3886 4277
3887our @ISA = CFPlus::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
3888 4279
3889sub new { 4280sub new {
3890 my $class = shift; 4281 my $class = shift;
3891 4282
3892 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
3893 fontsize => 0.8, 4284 fontsize => 0.8,
3894 @_, 4285 @_,
3895 ); 4286 );
3896 4287
3897 CFPlus::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
3898 4289
3899 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3900 4291
3901 $self 4292 $self
3902} 4293}
3903 4294
3904sub reorder { 4295sub reorder {
3905 my ($self) = @_; 4296 my ($self) = @_;
3906 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
3907 4298
3908 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
3909 return if $CFPlus::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
3910 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3911 values %{ $self->{item} }; 4302 values %{ $self->{item} };
3912 4303
3913 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
3914 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3915 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
3916 4309
3917 my @widgets; 4310 my @widgets;
3918 4311
3919 my @items = sort { 4312 my @items = sort {
3920 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
3921 or $b->{id} <=> $a->{id} 4314 or $b->{id} <=> $a->{id}
3922 } values %{ $self->{item} }; 4315 } values %{ $self->{item} };
3923
3924 $self->{timer}->interval (1);
3925 4316
3926 my $count = 10 + 1; 4317 my $count = 10 + 1;
3927 for my $item (@items) { 4318 for my $item (@items) {
3928 last unless --$count; 4319 last unless --$count;
3929 4320
… …
3936 for ($short) { 4327 for ($short) {
3937 s/^\s+//; 4328 s/^\s+//;
3938 s/\s+/ /g; 4329 s/\s+/ /g;
3939 } 4330 }
3940 4331
3941 new CFPlus::UI::Label 4332 new DC::UI::Label
3942 markup => $short, 4333 markup => $short,
3943 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
3944 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
3945 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
3946 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
3947 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
3948 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
3949 can_events => 1, 4341 can_events => 1,
3950 can_hover => 1 4342 can_hover => 1
3951 }; 4343 };
3952 4344
3953 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4345 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3954 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4346 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3955 $label->update; 4347 $label->update;
3956 $label->set_max_size (undef, $label->{req_h} * $diff) 4348 $label->set_max_size (undef, $label->{req_h} * $diff)
3957 if $diff < 1; 4349 if $diff < 1;
3958 $self->{timer}->interval (1/30); 4350 $self->{timer}->set (1/30, 1/30);
3959 } else { 4351 } else {
3960 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
3961 } 4353 }
3962 4354
3963 push @widgets, $label; 4355 push @widgets, $label;
3964 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
3965 4361
3966 $self->clear; 4362 $self->clear;
3967 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
3968} 4364}
3969 4365
… …
4025 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
4026} 4422}
4027 4423
4028############################################################################# 4424#############################################################################
4029 4425
4030package CFPlus::UI::Root; 4426package DC::UI::Root;
4031 4427
4032our @ISA = CFPlus::UI::Container::; 4428our @ISA = DC::UI::Container::;
4033 4429
4034use List::Util qw(min max); 4430use List::Util qw(min max);
4035 4431
4036use CFPlus::OpenGL; 4432use DC::OpenGL;
4037 4433
4038sub new { 4434sub new {
4039 my $class = shift; 4435 my $class = shift;
4040 4436
4041 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
4042 visible => 1, 4438 visible => 1,
4043 @_, 4439 @_,
4044 ); 4440 );
4045 4441
4046 CFPlus::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
4047 4443
4048 $self 4444 $self
4049} 4445}
4050 4446
4051sub size_request { 4447sub size_request {
… …
4099} 4495}
4100 4496
4101sub update { 4497sub update {
4102 my ($self) = @_; 4498 my ($self) = @_;
4103 4499
4104 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
4105} 4501}
4106 4502
4107sub add { 4503sub add {
4108 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
4109 4505
… …
4176 4572
4177 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
4178 4574
4179 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
4180 4576
4181 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
4182 $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;
4183 4582
4184 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4185 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4186 4585
4187 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4254 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4255 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
4256 glLoadIdentity; 4655 glLoadIdentity;
4257 4656
4258 { 4657 {
4259 package CFPlus::UI::Base; 4658 package DC::UI::Base;
4260 4659
4261 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4262 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
4263 4662
4264 $self->_draw; 4663 $self->_draw;
4265 } 4664 }
4266} 4665}
4267 4666
4268############################################################################# 4667#############################################################################
4269 4668
4270package CFPlus::UI; 4669package DC::UI;
4271 4670
4272$ROOT = new CFPlus::UI::Root; 4671$ROOT = new DC::UI::Root;
4273$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
4274 4673
42751 46741
4276

Diff Legend

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