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.403 by root, Sat Jul 21 21:25:23 2007 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Event; 7use AnyEvent ();
8use Guard ();
8 9
9use CFPlus; 10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
… …
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
… …
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200 199
201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use common::sense;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
… …
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
… …
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
… …
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
… …
364 $self->{force_h} = $h; 369 $self->{force_h} = $h;
365 370
366 $self->realloc; 371 $self->realloc;
367} 372}
368 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
372} 395}
373 396
… …
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
… …
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
… …
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
… …
593 616
594# using global variables seems a bit hacky, but passing through all drawing 617# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 618# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 619our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 620
598sub draw { 621#sub draw {
599 my ($self) = @_; 622#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 623
645sub _draw { 624sub _draw {
646 my ($self) = @_; 625 my ($self) = @_;
647 626
648 warn "no draw defined for $self\n"; 627 warn "no draw defined for $self\n";
649} 628}
650 629
651sub DESTROY { 630sub DESTROY {
652 my ($self) = @_; 631 my ($self) = @_;
653 632
654 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
655 634
635 local $@;
656 eval { $self->destroy }; 636 eval { $self->destroy };
657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658 638
659 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
660} 640}
661 641
662############################################################################# 642#############################################################################
663 643
664package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
665 645
666our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
667 647
668use strict; 648use common::sense;
649
669use CFPlus::OpenGL; 650use DC::OpenGL;
670 651
671sub new { 652sub new {
672 my $class = shift; 653 my $class = shift;
673
674 # range [value, low, high, page]
675 654
676 $class->SUPER::new ( 655 $class->SUPER::new (
677 #bg => [0, 0, 0, 0.2], 656 #bg => [0, 0, 0, 0.2],
678 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
679 @_ 658 @_
680 ) 659 )
681} 660}
682 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
683sub _draw { 669sub _draw {
684 my ($self) = @_; 670 my ($self) = @_;
685 671
686 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
687 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
688 : $self->{bg}; 674 : $self->{bg};
689 675
690 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
691 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
692 678
693 glEnable GL_BLEND; 679 glEnable GL_BLEND;
694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695 glColor_premultiply @$color; 681 glColor_premultiply @$color;
696
697 glBegin GL_QUADS;
698 glVertex 0 , 0;
699 glVertex 0 , $h;
700 glVertex $w, $h; 682 glRect 0, 0, $w, $h;
701 glVertex $w, 0;
702 glEnd;
703
704 glDisable GL_BLEND; 683 glDisable GL_BLEND;
705 } 684 }
706} 685}
707 686
708############################################################################# 687#############################################################################
709 688
710package CFPlus::UI::Empty; 689package DC::UI::Empty;
711 690
712our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
713 692
714sub new { 693sub new {
715 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
716 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
717} 696}
… …
724 703
725sub draw { } 704sub draw { }
726 705
727############################################################################# 706#############################################################################
728 707
729package CFPlus::UI::Container; 708package DC::UI::Container;
730 709
731our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
732 711
733sub new { 712sub new {
734 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
735 714
736 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
… …
769 @{$self->{children}}, @widgets 748 @{$self->{children}}, @widgets
770 ]; 749 ];
771 750
772 $self->realloc; 751 $self->realloc;
773 752
753 $self->emit (c_add => \@widgets);
754
774 map $_+0, @widgets 755 map $_+0, @widgets
775} 756}
776 757
777sub children { 758sub children {
778 @{ $_[0]{children} } 759 @{ $_[0]{children} }
779} 760}
780 761
781sub remove { 762sub remove {
782 my ($self, $child) = @_; 763 my ($self, @widgets) = @_;
783 764
765 $self->emit (c_remove => \@widgets);
766
767 for my $child (@widgets) {
784 delete $child->{parent}; 768 delete $child->{parent};
785 $child->hide; 769 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
771 }
788 772
789 $self->realloc; 773 $self->realloc;
790} 774}
791 775
792sub clear { 776sub clear {
… …
820} 804}
821 805
822sub _draw { 806sub _draw {
823 my ($self) = @_; 807 my ($self) = @_;
824 808
825 $_->draw for @{$self->{children}}; 809 $_->draw for $self->visible_children;
826} 810}
827 811
828############################################################################# 812#############################################################################
829 813
830package CFPlus::UI::Bin; 814package DC::UI::Bin;
831 815
832our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
833 817
834sub new { 818sub new {
835 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
836 820
837 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
838 822
839 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
840} 824}
841 825
842sub add { 826sub add {
843 my ($self, $child) = @_; 827 my ($self, $child) = @_;
844 828
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 829 $self->clear;
846 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
847} 831}
848 832
849sub remove { 833sub remove {
850 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
851 835
852 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
853 837
854 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
855 unless @{$self->{children}}; 839 unless @{$self->{children}};
856} 840}
857 841
858sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
859 843
… …
868 852
869 1 853 1
870} 854}
871 855
872############################################################################# 856#############################################################################
873
874# back-buffered drawing area 857# back-buffered drawing area
875 858
876package CFPlus::UI::Window; 859package DC::UI::Window;
877 860
878our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
879 862
880use CFPlus::OpenGL; 863use DC::OpenGL;
881 864
882sub new { 865sub new {
883 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
884 867
885 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
907} 890}
908 891
909sub render_child { 892sub render_child {
910 my ($self) = @_; 893 my ($self) = @_;
911 894
912 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
913 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
914 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
915 898
916 { 899 {
917 package CFPlus::UI::Base; 900 package DC::UI::Base;
918 901
919 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
920 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
921 904
922 $self->_render; 905 $self->_render;
… …
939 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
940} 923}
941 924
942############################################################################# 925#############################################################################
943 926
944package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
945 928
946use List::Util qw(min max); 929use List::Util qw(min max);
947 930
948our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
949 932
950sub new { 933sub new {
951 my $class = shift; 934 my $class = shift;
952 935
953 $class->SUPER::new ( 936 $class->SUPER::new (
… …
995 $self->emit (changed => $x, $y); 978 $self->emit (changed => $x, $y);
996 $self->update; 979 $self->update;
997 } 980 }
998} 981}
999 982
983sub set_center {
984 my ($self, $x, $y) = @_;
985
986 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
987}
988
989sub make_visible {
990 my ($self, $x, $y, $border) = @_;
991
992 if ( $x < $self->{view_x} + $self->{w} * $border
993 || $x > $self->{view_x} + $self->{w} * (1 - $border)
994 || $y < $self->{view_y} + $self->{h} * $border
995 || $y > $self->{view_y} + $self->{h} * (1 - $border)
996 ) {
997 $self->set_center ($x, $y);
998 }
999}
1000
1000# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
1001sub coord2local { 1002sub coord2local {
1002 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
1003 1004
1004 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1005 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1021 ) { 1022 ) {
1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1023 } else { 1024 } else {
1024 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
1025 } 1026 }
1026} 1027}
1027 1028
1028sub _render { 1029sub _render {
1029 my ($self) = @_; 1030 my ($self) = @_;
1030 1031
1031 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1032 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1033 1034
1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1035 1036
1036 $self->SUPER::_render; 1037 $self->SUPER::_render;
1037} 1038}
1038 1039
1039############################################################################# 1040#############################################################################
1040 1041
1041package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
1042 1043
1043our @ISA = CFPlus::UI::Table::; 1044our @ISA = DC::UI::Table::;
1044 1045
1045sub new { 1046sub new {
1046 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1047 1048
1048 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1049 1050
1050 my $self; 1051 my $self;
1051 1052
1052 my $hslider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1053 col => 0, 1054 c_col => 0,
1054 row => 1, 1055 c_row => 1,
1055 vertical => 0, 1056 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub { 1058 on_changed => sub {
1058 $self->{hpos} = $_[1]; 1059 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 }, 1061 },
1061 ; 1062 ;
1062 1063
1063 my $vslider = new CFPlus::UI::Slider 1064 my $vslider = new DC::UI::Slider
1064 col => 1, 1065 c_col => 1,
1065 row => 0, 1066 c_row => 0,
1066 vertical => 1, 1067 vertical => 1,
1067 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1068 on_changed => sub { 1069 on_changed => sub {
1069 $self->{vpos} = $_[1]; 1070 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 col_expand => [1, 0], 1081 col_expand => [1, 0],
1081 row_expand => [1, 0], 1082 row_expand => [1, 0],
1082 %arg, 1083 %arg,
1083 ); 1084 );
1084 1085
1085 $self->{vp} = new CFPlus::UI::ViewPort 1086 $self->{vp} = new DC::UI::ViewPort
1086 col => 0, 1087 c_col => 0,
1087 row => 0, 1088 c_row => 0,
1088 expand => 1, 1089 expand => 1,
1089 scroll_x => $self->{scroll_x}, 1090 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y}, 1091 scroll_y => $self->{scroll_y},
1091 on_changed => sub { 1092 on_changed => sub {
1092 my ($vp, $x, $y) = @_; 1093 my ($vp, $x, $y) = @_;
… …
1114 my ($self, $widget) = @_; 1115 my ($self, $widget) = @_;
1115 1116
1116 $self->{vp}->add ($self->{child} = $widget); 1117 $self->{vp}->add ($self->{child} = $widget);
1117} 1118}
1118 1119
1120sub set_offset { shift->{vp}->set_offset (@_) }
1121sub set_center { shift->{vp}->set_center (@_) }
1122sub make_visible { shift->{vp}->make_visible (@_) }
1123
1119sub update_slider { 1124sub update_slider {
1120 my ($self) = @_; 1125 my ($self) = @_;
1121 1126
1122 my $child = ($self->{vp} or return)->child; 1127 my $child = ($self->{vp} or return)->child;
1123 1128
… …
1212 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1213} 1218}
1214 1219
1215############################################################################# 1220#############################################################################
1216 1221
1217package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1218 1223
1219our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1220 1225
1221use CFPlus::OpenGL; 1226use DC::OpenGL;
1222 1227
1223sub new { 1228sub new {
1224 my $class = shift; 1229 my $class = shift;
1225 1230
1226 $class->SUPER::new ( 1231 $class->SUPER::new (
… …
1236 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1237 1242
1238 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1240 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1241
1242 glBegin GL_QUADS;
1243 glVertex 0 , 0;
1244 glVertex 0 , $h;
1245 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1246 glVertex $w, 0;
1247 glEnd;
1248
1249 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1250 } 1248 }
1251 1249
1252 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1253} 1251}
1254 1252
1255############################################################################# 1253#############################################################################
1256 1254
1257package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1258 1256
1259our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1260 1258
1261use CFPlus::OpenGL; 1259use DC::OpenGL;
1262 1260
1263sub new { 1261sub new {
1264 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1265 1263
1266 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1267 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1268 align => 1, 1266 align => 1,
1269 valign => 0, 1267 valign => 0.5,
1270 text => $arg{label}, 1268 text => $arg{label},
1271 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1272 } 1270 }
1273 1271
1274 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1275 # label => "", 1273 # label => "",
1276 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1277 border => 0.8, 1275 border => 0.8,
1278 style => 'single', 1276 style => 'single',
1279 %arg, 1277 %arg,
1280 ); 1278 );
1281 1279
… …
1284 1282
1285sub add { 1283sub add {
1286 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1287 1285
1288 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1289 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1290} 1288}
1291 1289
1292sub border { 1290sub border {
1293 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1294} 1292}
… …
1334 my $border = $self->border; 1332 my $border = $self->border;
1335 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1336 1334
1337 $child->draw; 1335 $child->draw;
1338 1336
1339 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1340 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1341 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1342 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1343 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1344 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1352 } 1350 }
1353} 1351}
1354 1352
1355############################################################################# 1353#############################################################################
1356 1354
1357package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1358 1356
1359our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1360 1358
1361use CFPlus::OpenGL; 1359use DC::OpenGL;
1362 1360
1363my $bg = 1361my $bg =
1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1365 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1366 1364
1367my @border = 1365my @border =
1368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 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); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1370 1368
1371my @icon = 1369my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png); 1371 qw(x1_move.png x1_resize.png);
1374 1372
1375sub new { 1373sub new {
1376 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1377 1375
1378 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1379 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1380 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1381 border => 0.6, 1379 border => 0.8,
1382 can_events => 1, 1380 can_events => 1,
1383 min_w => 64, 1381 min_w => 64,
1384 min_h => 32, 1382 min_h => 32,
1385 %arg, 1383 %arg,
1386 ); 1384 );
1387 1385
1388 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1389 align => 0, 1387 align => 0.5,
1390 valign => 1, 1388 valign => 1,
1391 text => $self->{title}, 1389 text => $self->{title},
1392 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1393 if exists $self->{title}; 1391 if exists $self->{title};
1394 1392
1395 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1396 $self->{close_button} = 1394 $self->{close_button} =
1397 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1398 path => 'x1_close.png', 1396 path => 'x1_close.png',
1399 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1400 1398
1401 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1402 } 1400 }
1403 1401
1404 $self 1402 $self
1405} 1403}
1406 1404
1407sub add { 1405sub add {
1408 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1409 1407
1410 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1411 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1412 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1413} 1411}
1414 1412
1415sub border { 1413sub border {
1416 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1415}
1416
1417sub get_max_wh {
1418 my ($self) = @_;
1419
1420 return ($self->{w}, $self->{h})
1421 if $self->{visible} && $self->{w};
1422
1423 $self->SUPER::get_max_wh
1417} 1424}
1418 1425
1419sub size_request { 1426sub size_request {
1420 my ($self) = @_; 1427 my ($self) = @_;
1421 1428
… …
1546 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1548 1555
1549 my $border = $self->border; 1556 my $border = $self->border;
1550 1557
1558 if ($border) {
1551 glColor @{ $self->{border_bg} }; 1559 glColor @{ $self->{border_bg} };
1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1560 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1561 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1562 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1563 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556 1564
1557 # move 1565 # move
1558 my $w2 = ($w - $border) * .5; 1566 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5; 1567 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1570 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563 1571
1564 # resize 1572 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1573 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1574 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button}; 1575 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1577 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1578 }
1570 1579
1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1580 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1572 glColor @{ $self->{bg} }; 1581 glColor @{ $self->{bg} };
1573 1582
1574 # TODO: repeat texture not scale 1583 # TODO: repeat texture not scale
… …
1593 if $self->{close_button}; 1602 if $self->{close_button};
1594} 1603}
1595 1604
1596############################################################################# 1605#############################################################################
1597 1606
1598package CFPlus::UI::Table; 1607package DC::UI::Table;
1599 1608
1600our @ISA = CFPlus::UI::Container::; 1609our @ISA = DC::UI::Container::;
1601 1610
1602use List::Util qw(max sum); 1611use List::Util qw(max sum);
1603 1612
1604use CFPlus::OpenGL; 1613use DC::OpenGL;
1605 1614
1606sub new { 1615sub new {
1607 my $class = shift; 1616 my $class = shift;
1608 1617
1609 $class->SUPER::new ( 1618 $class->SUPER::new (
… …
1615 1624
1616sub add { 1625sub add {
1617 my ($self, @widgets) = @_; 1626 my ($self, @widgets) = @_;
1618 1627
1619 for my $child (@widgets) { 1628 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1; 1629 $child->{c_rowspan} ||= 1;
1621 $child->{colspan} ||= 1; 1630 $child->{c_colspan} ||= 1;
1622 } 1631 }
1623 1632
1624 $self->SUPER::add (@widgets); 1633 $self->SUPER::add (@widgets);
1625} 1634}
1626 1635
… …
1630 my @widgets; 1639 my @widgets;
1631 1640
1632 while (@_) { 1641 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, (); 1642 my ($col, $row, $child) = splice @_, 0, 3, ();
1634 1643
1635 $child->{row} = $row; 1644 $child->{c_row} = $row;
1636 $child->{col} = $col; 1645 $child->{c_col} = $col;
1637 1646
1638 push @widgets, $child; 1647 push @widgets, $child;
1639 } 1648 }
1640 1649
1641 $self->add (@widgets); 1650 $self->add (@widgets);
… …
1647 my (@w, @h); 1656 my (@w, @h);
1648 1657
1649 my @children = $self->children; 1658 my @children = $self->children;
1650 1659
1651 # first pass, columns 1660 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1661 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1662 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1654 1663
1655 my $sw = sum @w[$c .. $c + $cs - 1]; 1664 my $sw = sum @w[$c .. $c + $cs - 1];
1656 1665
1657 if ($w > $sw) { 1666 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1667 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 } 1668 }
1660 } 1669 }
1661 1670
1662 # second pass, rows 1671 # second pass, rows
1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1672 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1673 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1665 1674
1666 my $sh = sum @h[$r .. $r + $rs - 1]; 1675 my $sh = sum @h[$r .. $r + $rs - 1];
1667 1676
1668 if ($h > $sh) { 1677 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1678 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1670 } 1679 }
1671 } 1680 }
1672 1681
1673 (\@w, \@h) 1682 (\@w, \@h)
1674} 1683}
… …
1697 @col_expand = (1) x @$ws unless @col_expand; 1706 @col_expand = (1) x @$ws unless @col_expand;
1698 my $col_expand = (sum @col_expand) || 1; 1707 my $col_expand = (sum @col_expand) || 1;
1699 1708
1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1709 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1701 1710
1702 CFPlus::UI::harmonize $ws; 1711 DC::UI::harmonize $ws;
1703 1712
1704 my @row_expand = @{$self->{row_expand}}; 1713 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand; 1714 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1; 1715 my $row_expand = (sum @row_expand) || 1;
1707 1716
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1717 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709 1718
1710 CFPlus::UI::harmonize $hs; 1719 DC::UI::harmonize $hs;
1711 1720
1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1721 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1722 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1723
1715 for my $widget ($self->children) { 1724 for my $widget ($self->children) {
1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1725 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1717 1726
1718 $widget->configure ( 1727 $widget->configure (
1719 $x[$c], $y[$r], 1728 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1729 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 ); 1730 );
… …
1724 1 1733 1
1725} 1734}
1726 1735
1727############################################################################# 1736#############################################################################
1728 1737
1729package CFPlus::UI::Fixed; 1738package DC::UI::Fixed;
1730 1739
1731use List::Util qw(min max); 1740use List::Util qw(min max);
1732 1741
1733our @ISA = CFPlus::UI::Container::; 1742our @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 1743
1742sub _scale($$$) { 1744sub _scale($$$) {
1743 my ($mode, $val, $max) = @_; 1745 my ($rel, $val, $max) = @_;
1744 1746
1745 $mode eq "abs" ? $val 1747 $rel ? $val * $max : $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748} 1748}
1749 1749
1750sub size_request { 1750sub size_request {
1751 my ($self) = @_; 1751 my ($self) = @_;
1752 1752
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754 1754
1755 # determine overall size by querying abs widgets 1755 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) { 1756 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1757 unless ($child->{c_rel}) {
1758 my $x = $child->{c_x};
1759 my $y = $child->{c_y};
1758 1760
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; 1761 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1762 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 } 1763 }
1766 } 1764 }
1767 1765
1768 my $W = $x2 - $x1; 1766 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1; 1767 my $H = $y2 - $y1;
1770 1768
1771 # now layout remaining widgets 1769 # now layout remaining widgets
1772 for my $child ($self->visible_children) { 1770 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1771 if ($child->{c_rel}) {
1772 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1773 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1774 1774
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; 1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783 } 1777 }
1784 } 1778 }
1785 1779
1786 my $W = $x2 - $x1; 1780 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1; 1781 my $H = $y2 - $y1;
… …
1791 1785
1792sub invoke_size_allocate { 1786sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_; 1787 my ($self, $W, $H) = @_;
1794 1788
1795 for my $child ($self->visible_children) { 1789 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1790 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1791 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1797 1792
1798 $x = _scale $pos, $x, $W; 1793 $x += $child->{c_halign} * $child->{req_w};
1799 $y = _scale $pos, $x, $H; 1794 $y += $child->{c_valign} * $child->{req_h};
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1802 1795
1803 $child->configure ($x, $y, $w, $h); 1796 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804 } 1797 }
1805 1798
1806 1 1799 1
1807} 1800}
1808 1801
1809############################################################################# 1802#############################################################################
1810 1803
1811package CFPlus::UI::Box; 1804package DC::UI::Box;
1812 1805
1813our @ISA = CFPlus::UI::Container::; 1806our @ISA = DC::UI::Container::;
1814 1807
1815sub size_request { 1808sub size_request {
1816 my ($self) = @_; 1809 my ($self) = @_;
1810
1811 my @children = $self->visible_children;
1817 1812
1818 $self->{vertical} 1813 $self->{vertical}
1819 ? ( 1814 ? (
1820 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1815 (List::Util::max map $_->{req_w}, @children),
1821 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1816 (List::Util::sum map $_->{req_h}, @children),
1822 ) 1817 )
1823 : ( 1818 : (
1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1819 (List::Util::sum map $_->{req_w}, @children),
1825 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1820 (List::Util::max map $_->{req_h}, @children),
1826 ) 1821 )
1827} 1822}
1828 1823
1829sub invoke_size_allocate { 1824sub invoke_size_allocate {
1830 my ($self, $w, $h) = @_; 1825 my ($self, $w, $h) = @_;
… …
1851 $req[$_] += $space * $children[$_]{expand} 1846 $req[$_] += $space * $children[$_]{expand}
1852 for 0 .. $#children; 1847 for 0 .. $#children;
1853 } 1848 }
1854 } 1849 }
1855 1850
1856 CFPlus::UI::harmonize \@req; 1851 DC::UI::harmonize \@req;
1857 1852
1858 my $pos = 0; 1853 my $pos = 0;
1859 for (0 .. $#children) { 1854 for (0 .. $#children) {
1860 my $alloc = $req[$_]; 1855 my $alloc = $req[$_];
1861 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1856 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1866 1 1861 1
1867} 1862}
1868 1863
1869############################################################################# 1864#############################################################################
1870 1865
1871package CFPlus::UI::HBox; 1866package DC::UI::HBox;
1872 1867
1873our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1874 1869
1875sub new { 1870sub new {
1876 my $class = shift; 1871 my $class = shift;
1877 1872
1878 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1881 ) 1876 )
1882} 1877}
1883 1878
1884############################################################################# 1879#############################################################################
1885 1880
1886package CFPlus::UI::VBox; 1881package DC::UI::VBox;
1887 1882
1888our @ISA = CFPlus::UI::Box::; 1883our @ISA = DC::UI::Box::;
1889 1884
1890sub new { 1885sub new {
1891 my $class = shift; 1886 my $class = shift;
1892 1887
1893 $class->SUPER::new ( 1888 $class->SUPER::new (
… …
1896 ) 1891 )
1897} 1892}
1898 1893
1899############################################################################# 1894#############################################################################
1900 1895
1901package CFPlus::UI::Label; 1896package DC::UI::Label;
1902 1897
1903our @ISA = CFPlus::UI::DrawBG::; 1898our @ISA = DC::UI::DrawBG::;
1904 1899
1905use CFPlus::OpenGL; 1900use DC::OpenGL;
1906 1901
1907sub new { 1902sub new {
1908 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1909 1904
1910 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
… …
1915 #text => initial text 1910 #text => initial text
1916 #markup => initial narkup 1911 #markup => initial narkup
1917 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1918 #style => 0, # render flags 1913 #style => 0, # render flags
1919 ellipsise => 3, # end 1914 ellipsise => 3, # end
1920 layout => (new CFPlus::Layout), 1915 layout => (new DC::Layout),
1921 fontsize => 1, 1916 fontsize => 1,
1922 align => -1, 1917 align => 0.5,
1923 valign => -1, 1918 valign => 0.5,
1924 padding_x => 2, 1919 padding_x => 4,
1925 padding_y => 2, 1920 padding_y => 2,
1926 can_events => 0, 1921 can_events => 0,
1927 %arg 1922 %arg
1928 ); 1923 );
1929 1924
1930 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1931 my $layout = new CFPlus::Layout; 1926 my $layout = new DC::Layout;
1932 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1933 $self->{template} = $layout; 1928 $self->{template} = $layout;
1934 } 1929 }
1935 1930
1936 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
… …
1954 1949
1955 delete $self->{ox}; 1950 delete $self->{ox};
1956 $self->SUPER::realloc; 1951 $self->SUPER::realloc;
1957} 1952}
1958 1953
1954sub clear {
1955 my ($self) = @_;
1956
1957 $self->set_text ("");
1958}
1959
1959sub set_text { 1960sub set_text {
1960 my ($self, $text) = @_; 1961 my ($self, $text) = @_;
1961 1962
1962 return if $self->{text} eq "T$text"; 1963 return if $self->{text} eq "T$text";
1963 $self->{text} = "T$text"; 1964 $self->{text} = "T$text";
… …
1986 1987
1987sub size_request { 1988sub size_request {
1988 my ($self) = @_; 1989 my ($self) = @_;
1989 1990
1990 $self->{size_req} ||= do { 1991 $self->{size_req} ||= do {
1992 my ($max_w, $max_h) = $self->get_max_wh;
1993
1991 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1994 $self->{layout}->set_font ($self->{font}) if $self->{font};
1992 $self->{layout}->set_width ($self->{max_w} || -1); 1995 $self->{layout}->set_width ($max_w);
1993 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1996 $self->{layout}->set_ellipsise ($self->{ellipsise});
1994 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1997 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1995 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1998 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1996 1999
1997 my ($w, $h) = $self->{layout}->size; 2000 my ($w, $h) = $self->{layout}->size;
1998 2001
1999 if (exists $self->{template}) { 2002 if (exists $self->{template}) {
2000 $self->{template}->set_font ($self->{font}) if $self->{font}; 2003 $self->{template}->set_font ($self->{font}) if $self->{font};
2001 $self->{template}->set_width ($self->{max_w} || -1); 2004 $self->{template}->set_width ($max_w);
2002 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2005 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2003 2006
2004 my ($w2, $h2) = $self->{template}->size; 2007 my ($w2, $h2) = $self->{template}->size;
2005 2008
2006 $w = List::Util::max $w, $w2; 2009 $w = List::Util::max $w, $w2;
… …
2062 2065
2063 [$self->{layout}->size] 2066 [$self->{layout}->size]
2064 }; 2067 };
2065 2068
2066 unless (exists $self->{ox}) { 2069 unless (exists $self->{ox}) {
2067 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2070 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2068 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2071 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2069 : ($self->{w} - $size->[0]) * 0.5);
2070 2072
2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2073 $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 }; 2074 };
2075 2075
2076 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2076# unless ($self->{list}) {
2077 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2077# $self->{list} = DC::OpenGL::glGenList;
2078 2078# DC::OpenGL::glNewList $self->{list};
2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2079# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2080# DC::OpenGL::glEndList;
2081# }
2082#
2083# DC::OpenGL::glCallList $self->{list};
2084
2085 $self->{layout}->draw;
2080} 2086}
2087
2088#sub destroy {
2089# my ($self) = @_;
2090#
2091# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2092#
2093# $self->SUPER::destroy;
2094#}
2081 2095
2082############################################################################# 2096#############################################################################
2083 2097
2084package CFPlus::UI::EntryBase; 2098package DC::UI::EntryBase;
2085 2099
2086our @ISA = CFPlus::UI::Label::; 2100our @ISA = DC::UI::Label::;
2087 2101
2088use CFPlus::OpenGL; 2102use DC::OpenGL;
2089 2103
2090sub new { 2104sub new {
2091 my $class = shift; 2105 my $class = shift;
2092 2106
2093 $class->SUPER::new ( 2107 $class->SUPER::new (
2094 fg => [1, 1, 1], 2108 fg => [1, 1, 1],
2095 bg => [0, 0, 0, 0.2], 2109 bg => [0, 0, 0, 0.2],
2110 outline => undef,
2096 active_bg => [1, 1, 1, 0.5], 2111 active_bg => [0, 0, 1, .2],
2097 active_fg => [0, 0, 0], 2112 active_fg => [1, 1, 1],
2113 active_outline => [1, 1, 0],
2098 can_hover => 1, 2114 can_hover => 1,
2099 can_focus => 1, 2115 can_focus => 1,
2116 align => 0,
2100 valign => 0, 2117 valign => 0.5,
2101 can_events => 1, 2118 can_events => 1,
2102 ellipsise => 0, 2119 ellipsise => 0,
2120 padding_x => 4,
2121 padding_y => 2,
2103 #text => ... 2122 #text => ...
2104 #hidden => "*", 2123 #hidden => "*",
2105 @_ 2124 @_
2106 ) 2125 )
2107} 2126}
… …
2154 2173
2155 my $text = $self->get_text; 2174 my $text = $self->get_text;
2156 2175
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2176 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2158 2177
2159 if ($uni == 8) { 2178 if ($sym == DC::SDLK_BACKSPACE) {
2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2179 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2161 } elsif ($uni == 127) { 2180 } elsif ($sym == DC::SDLK_DELETE) {
2162 substr $text, $self->{cursor}, 1, ""; 2181 substr $text, $self->{cursor}, 1, "";
2163 } elsif ($sym == CFPlus::SDLK_LEFT) { 2182 } elsif ($sym == DC::SDLK_LEFT) {
2164 --$self->{cursor} if $self->{cursor}; 2183 --$self->{cursor} if $self->{cursor};
2165 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2184 } elsif ($sym == DC::SDLK_RIGHT) {
2166 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2185 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2167 } elsif ($sym == CFPlus::SDLK_HOME) { 2186 } elsif ($sym == DC::SDLK_HOME) {
2168 # what a hack 2187 # what a hack
2169 $self->{cursor} = 2188 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2189 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1 2190 ? length $1
2172 : 0; 2191 : 0;
2173 } elsif ($sym == CFPlus::SDLK_END) { 2192 } elsif ($sym == DC::SDLK_END) {
2174 # uh, again 2193 # uh, again
2175 $self->{cursor} = 2194 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2195 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1 2196 ? $self->{cursor} + length $1
2178 : length $self->{text}; 2197 : length $self->{text};
… …
2242 glColor_premultiply @{$self->{bg}}; 2261 glColor_premultiply @{$self->{bg}};
2243 } 2262 }
2244 2263
2245 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2265 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}; 2266 glRect 0, 0, $self->{w}, $self->{h};
2251 glVertex $self->{w}, 0;
2252 glEnd;
2253 glDisable GL_BLEND; 2267 glDisable GL_BLEND;
2254 2268
2255 $self->SUPER::_draw; 2269 $self->SUPER::_draw;
2256 2270
2257 #TODO: force update every cursor change :( 2271 #TODO: force update every cursor change :(
… …
2259 2273
2260 unless (exists $self->{cur_h}) { 2274 unless (exists $self->{cur_h}) {
2261 my $text = substr $self->{text}, 0, $self->{cursor}; 2275 my $text = substr $self->{text}, 0, $self->{cursor};
2262 utf8::encode $text; 2276 utf8::encode $text;
2263 2277
2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2278 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2265 } 2279 }
2266 2280
2281 glColor_premultiply @{$self->{active_fg}};
2267 glBegin GL_LINES; 2282 glBegin GL_LINES;
2268 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2284 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2270 glEnd; 2285 glEnd;
2286
2287 glLineWidth 3;
2288 glColor @{$self->{active_outline}};
2289 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2290 glLineWidth 1;
2291
2292 } else {
2293 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2294 glBegin GL_LINE_STRIP;
2295 glVertex .5, $self->{h} * .5;
2296 glVertex .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} - 2.5;
2298 glVertex $self->{w} - .5, $self->{h} * .5;
2299 glEnd;
2271 } 2300 }
2272} 2301}
2273 2302
2274############################################################################# 2303#############################################################################
2275 2304
2276package CFPlus::UI::Entry; 2305package DC::UI::Entry;
2277 2306
2278our @ISA = CFPlus::UI::EntryBase::; 2307our @ISA = DC::UI::EntryBase::;
2279 2308
2280use CFPlus::OpenGL; 2309use DC::OpenGL;
2310
2311sub new {
2312 my $class = shift;
2313
2314 $class->SUPER::new (
2315 history_pointer => -1,
2316 @_
2317 )
2318}
2319
2281 2320
2282sub invoke_key_down { 2321sub invoke_key_down {
2283 my ($self, $ev) = @_; 2322 my ($self, $ev) = @_;
2284 2323
2285 my $sym = $ev->{sym}; 2324 my $sym = $ev->{sym};
… …
2291 $self->{history_pointer} = -1; 2330 $self->{history_pointer} = -1;
2292 $self->{history_saveback} = ''; 2331 $self->{history_saveback} = '';
2293 $self->emit (activate => $txt); 2332 $self->emit (activate => $txt);
2294 $self->update; 2333 $self->update;
2295 2334
2296 } elsif ($sym == CFPlus::SDLK_UP) { 2335 } elsif ($sym == DC::SDLK_UP) {
2297 if ($self->{history_pointer} < 0) { 2336 if ($self->{history_pointer} < 0) {
2298 $self->{history_saveback} = $self->get_text; 2337 $self->{history_saveback} = $self->get_text;
2299 } 2338 }
2300 if (@{$self->{history} || []} > 0) { 2339 if (@{$self->{history} || []} > 0) {
2301 $self->{history_pointer}++; 2340 $self->{history_pointer}++;
… …
2303 $self->{history_pointer} = @{$self->{history} || []} - 1; 2342 $self->{history_pointer} = @{$self->{history} || []} - 1;
2304 } 2343 }
2305 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2306 } 2345 }
2307 2346
2308 } elsif ($sym == CFPlus::SDLK_DOWN) { 2347 } elsif ($sym == DC::SDLK_DOWN) {
2309 $self->{history_pointer}--; 2348 $self->{history_pointer}--;
2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2349 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2311 2350
2312 if ($self->{history_pointer} >= 0) { 2351 if ($self->{history_pointer} >= 0) {
2313 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2352 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2314 } else { 2353 } else {
2354 if (defined $self->{history_saveback}) {
2315 $self->set_text ($self->{history_saveback}); 2355 $self->set_text ($self->{history_saveback});
2356 $self->{history_saveback} = undef;
2357 }
2316 } 2358 }
2317 2359
2318 } else { 2360 } else {
2319 return $self->SUPER::invoke_key_down ($ev) 2361 return $self->SUPER::invoke_key_down ($ev)
2320 } 2362 }
… …
2322 1 2364 1
2323} 2365}
2324 2366
2325############################################################################# 2367#############################################################################
2326 2368
2327package CFPlus::UI::TextEdit; 2369package DC::UI::TextEdit;
2328 2370
2329our @ISA = CFPlus::UI::EntryBase::; 2371our @ISA = DC::UI::EntryBase::;
2330 2372
2331use CFPlus::OpenGL; 2373use DC::OpenGL;
2374
2375sub new {
2376 my $class = shift;
2377
2378 $class->SUPER::new (
2379 padding_y => 4,
2380
2381 @_
2382 )
2383}
2332 2384
2333sub move_cursor_ver { 2385sub move_cursor_ver {
2334 my ($self, $dy) = @_; 2386 my ($self, $dy) = @_;
2335 2387
2336 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2388 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2337 2389
2338 $y += $dy; 2390 $line += $dy;
2339 2391
2340 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2392 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2341 $self->{cursor} = $index; 2393 $self->{cursor} = $index;
2342 delete $self->{cur_h}; 2394 delete $self->{cur_h};
2343 $self->update; 2395 $self->update;
2344 return; 2396 return;
2345 } 2397 }
… …
2348sub invoke_key_down { 2400sub invoke_key_down {
2349 my ($self, $ev) = @_; 2401 my ($self, $ev) = @_;
2350 2402
2351 my $sym = $ev->{sym}; 2403 my $sym = $ev->{sym};
2352 2404
2353 if ($sym == CFPlus::SDLK_UP) { 2405 if ($sym == DC::SDLK_UP) {
2354 $self->move_cursor_ver (-1); 2406 $self->move_cursor_ver (-1);
2355 } elsif ($sym == CFPlus::SDLK_DOWN) { 2407 } elsif ($sym == DC::SDLK_DOWN) {
2356 $self->move_cursor_ver (+1); 2408 $self->move_cursor_ver (+1);
2357 } else { 2409 } else {
2358 return $self->SUPER::invoke_key_down ($ev) 2410 return $self->SUPER::invoke_key_down ($ev)
2359 } 2411 }
2360 2412
2361 1 2413 1
2362} 2414}
2363 2415
2364############################################################################# 2416#############################################################################
2365 2417
2366package CFPlus::UI::Button; 2418package DC::UI::ButtonBin;
2367 2419
2368our @ISA = CFPlus::UI::Label::; 2420our @ISA = DC::UI::Bin::;
2369 2421
2370use CFPlus::OpenGL; 2422use DC::OpenGL;
2371 2423
2372my @tex = 2424my @tex =
2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2425 map { new_from_resource DC::Texture $_, mipmap => 1 }
2374 qw(b1_button_inactive.png b1_button_active.png); 2426 qw(b1_button_inactive.png b1_button_active.png);
2375 2427
2376sub new { 2428sub new {
2377 my $class = shift; 2429 my $class = shift;
2378 2430
2379 $class->SUPER::new ( 2431 $class->SUPER::new (
2432 can_hover => 1,
2433 align => 0.5,
2434 valign => 0.5,
2435 can_events => 1,
2436 @_
2437 )
2438}
2439
2440sub invoke_button_up {
2441 my ($self, $ev, $x, $y) = @_;
2442
2443 $self->emit ("activate")
2444 if $x >= 0 && $x < $self->{w}
2445 && $y >= 0 && $y < $self->{h};
2446
2447 1
2448}
2449
2450sub _draw {
2451 my ($self) = @_;
2452
2453 glEnable GL_TEXTURE_2D;
2454 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2455 glColor 0, 0, 0, 1;
2456
2457 my $tex = $tex[$GRAB == $self];
2458 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2459
2460 glDisable GL_TEXTURE_2D;
2461
2462 $self->SUPER::_draw;
2463}
2464
2465#############################################################################
2466
2467package DC::UI::Button;
2468
2469our @ISA = DC::UI::Label::;
2470
2471use DC::OpenGL;
2472
2473my @tex =
2474 map { new_from_resource DC::Texture $_, mipmap => 1 }
2475 qw(b1_button_inactive.png b1_button_active.png);
2476
2477sub new {
2478 my $class = shift;
2479
2480 $class->SUPER::new (
2380 padding_x => 4, 2481 padding_x => 8,
2381 padding_y => 4, 2482 padding_y => 4,
2382 fg => [1.0, 1.0, 1.0], 2483 fg => [1.0, 1.0, 1.0],
2383 active_fg => [0.8, 0.8, 0.8], 2484 active_fg => [0.8, 0.8, 0.8],
2384 can_hover => 1, 2485 can_hover => 1,
2385 align => 0, 2486 align => 0.5,
2386 valign => 0, 2487 valign => 0.5,
2387 can_events => 1, 2488 can_events => 1,
2388 @_ 2489 @_
2389 ) 2490 )
2390} 2491}
2391 2492
… …
2416 $self->SUPER::_draw; 2517 $self->SUPER::_draw;
2417} 2518}
2418 2519
2419############################################################################# 2520#############################################################################
2420 2521
2421package CFPlus::UI::CheckBox; 2522package DC::UI::CheckBox;
2422 2523
2423our @ISA = CFPlus::UI::DrawBG::; 2524our @ISA = DC::UI::DrawBG::;
2424 2525
2425my @tex = 2526my @tex =
2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2527 map { new_from_resource DC::Texture $_, mipmap => 1 }
2427 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2528 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2428 2529
2429use CFPlus::OpenGL; 2530use DC::OpenGL;
2430 2531
2431sub new { 2532sub new {
2432 my $class = shift; 2533 my $class = shift;
2433 2534
2434 $class->SUPER::new ( 2535 $class->SUPER::new (
2536 fontsize => 1,
2435 padding_x => 2, 2537 padding_x => 2,
2436 padding_y => 2, 2538 padding_y => 2,
2437 fg => [1, 1, 1], 2539 fg => [1, 1, 1],
2438 active_fg => [1, 1, 0], 2540 active_fg => [1, 1, 0],
2439 bg => [0, 0, 0, 0.2], 2541 bg => [0, 0, 0, 0.2],
… …
2445} 2547}
2446 2548
2447sub size_request { 2549sub size_request {
2448 my ($self) = @_; 2550 my ($self) = @_;
2449 2551
2450 (6) x 2 2552 ($self->{fontsize} * $::FONTSIZE) x 2
2451} 2553}
2452 2554
2453sub toggle { 2555sub toggle {
2454 my ($self) = @_; 2556 my ($self) = @_;
2455 2557
… …
2474sub _draw { 2576sub _draw {
2475 my ($self) = @_; 2577 my ($self) = @_;
2476 2578
2477 $self->SUPER::_draw; 2579 $self->SUPER::_draw;
2478 2580
2479 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2581 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2480 2582
2481 my ($w, $h) = @$self{qw(w h)}; 2583 my ($w, $h) = @$self{qw(w h)};
2482 2584
2483 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2585 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2484 2586
… …
2491 glDisable GL_TEXTURE_2D; 2593 glDisable GL_TEXTURE_2D;
2492} 2594}
2493 2595
2494############################################################################# 2596#############################################################################
2495 2597
2496package CFPlus::UI::Image; 2598package DC::UI::Image;
2497 2599
2498our @ISA = CFPlus::UI::Base::; 2600our @ISA = DC::UI::DrawBG::;
2499 2601
2500use CFPlus::OpenGL; 2602use DC::OpenGL;
2501 2603
2502our %texture_cache; 2604our %texture_cache;
2503 2605
2504sub new { 2606sub new {
2505 my $class = shift; 2607 my $class = shift;
2506 2608
2507 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2508 can_events => 0, 2610 can_events => 0,
2611 scale => 1,
2509 @_, 2612 @_,
2510 ); 2613 );
2511 2614
2512 $self->{path} || $self->{tex} 2615 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required"; 2616 or Carp::croak "'path' or 'tex' attributes required";
2514 2617
2515 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2618 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2619 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2517 2620
2518 CFPlus::weaken $texture_cache{$self->{path}}; 2621 DC::weaken $texture_cache{$self->{path}};
2519 2622
2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2623 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2521 2624
2522 $self 2625 $self
2523} 2626}
2524 2627
2525sub STORABLE_freeze { 2628sub STORABLE_freeze {
2526 my ($self, $cloning) = @_; 2629 my ($self, $cloning) = @_;
2527 2630
2528 $self->{path} 2631 $self->{path}
2529 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2632 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2530 2633
2531 $self->{path} 2634 $self->{path}
2532} 2635}
2533 2636
2534sub STORABLE_attach { 2637sub STORABLE_attach {
2535 my ($self, $cloning, $path) = @_; 2638 my ($self, $cloning, $path) = @_;
2536 2639
2537 $self->new (path => $path) 2640 $self->new (path => $path)
2538} 2641}
2539 2642
2643sub set_texture {
2644 my ($self, $tex) = @_;
2645
2646 $self->{tex} = $tex;
2647 $self->update;
2648}
2649
2540sub size_request { 2650sub size_request {
2541 my ($self) = @_; 2651 my ($self) = @_;
2542 2652
2543 ($self->{tex}{w}, $self->{tex}{h}) 2653 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2544} 2654}
2545 2655
2546sub _draw { 2656sub _draw {
2547 my ($self) = @_; 2657 my ($self) = @_;
2658
2659 $self->SUPER::_draw;
2548 2660
2549 my $tex = $self->{tex}; 2661 my $tex = $self->{tex};
2550 2662
2551 my ($w, $h) = ($self->{w}, $self->{h}); 2663 my ($w, $h) = ($self->{w}, $self->{h});
2552 2664
… …
2558 } 2670 }
2559 2671
2560 glEnable GL_TEXTURE_2D; 2672 glEnable GL_TEXTURE_2D;
2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562 2674
2563 $tex->draw_quad (0, 0, $w, $h); 2675 $tex->draw_quad_alpha (0, 0, $w, $h);
2564 2676
2565 glDisable GL_TEXTURE_2D; 2677 glDisable GL_TEXTURE_2D;
2566} 2678}
2567 2679
2568############################################################################# 2680#############################################################################
2569 2681
2570package CFPlus::UI::ImageButton; 2682package DC::UI::ImageButton;
2571 2683
2572our @ISA = CFPlus::UI::Image::; 2684our @ISA = DC::UI::Image::;
2573 2685
2574use CFPlus::OpenGL; 2686use DC::OpenGL;
2575
2576my %textures;
2577 2687
2578sub new { 2688sub new {
2579 my $class = shift; 2689 my $class = shift;
2580 2690
2581 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2582 padding_x => 4, 2692 padding_x => 4,
2583 padding_y => 4, 2693 padding_y => 4,
2584 fg => [1, 1, 1], 2694 fg => [1, 1, 1],
2585 active_fg => [0, 0, 1], 2695 active_fg => [0, 0, 1],
2586 can_hover => 1, 2696 can_hover => 1,
2587 align => 0, 2697 align => 0.5,
2588 valign => 0, 2698 valign => 0.5,
2589 can_events => 1, 2699 can_events => 1,
2590 @_ 2700 @_
2591 ); 2701 );
2592} 2702}
2593 2703
2704sub invoke_button_down {
2705 my ($self, $ev, $x, $y) = @_;
2706
2707 1
2708}
2709
2594sub invoke_button_up { 2710sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_; 2711 my ($self, $ev, $x, $y) = @_;
2596 2712
2597 $self->emit ("activate") 2713 $self->emit ("activate")
2598 if $x >= 0 && $x < $self->{w} 2714 if $x >= 0 && $x < $self->{w}
… …
2601 1 2717 1
2602} 2718}
2603 2719
2604############################################################################# 2720#############################################################################
2605 2721
2606package CFPlus::UI::VGauge; 2722package DC::UI::VGauge;
2607 2723
2608our @ISA = CFPlus::UI::Base::; 2724our @ISA = DC::UI::Base::;
2609 2725
2610use List::Util qw(min max); 2726use List::Util qw(min max);
2611 2727
2612use CFPlus::OpenGL; 2728use DC::OpenGL;
2613 2729
2614my %tex = ( 2730my %tex = (
2615 food => [ 2731 food => [
2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2733 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2618 ], 2734 ],
2619 grace => [ 2735 grace => [
2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 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/ 2737 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2622 ], 2738 ],
2623 hp => [ 2739 hp => [
2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2740 map { new_from_resource DC::Texture $_, mipmap => 1 }
2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2741 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2626 ], 2742 ],
2627 mana => [ 2743 mana => [
2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2744 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/ 2745 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2630 ], 2746 ],
2631); 2747);
2632 2748
2633# eg. VGauge->new (gauge => 'food'), default gauge: food 2749# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2736 glDisable GL_TEXTURE_2D; 2852 glDisable GL_TEXTURE_2D;
2737} 2853}
2738 2854
2739############################################################################# 2855#############################################################################
2740 2856
2857package DC::UI::Progress;
2858
2859our @ISA = DC::UI::Label::;
2860
2861use DC::OpenGL;
2862
2863sub new {
2864 my ($class, %arg) = @_;
2865
2866 my $self = $class->SUPER::new (
2867 padding_x => 2,
2868 padding_y => 2,
2869 fg => [1, 1, 1],
2870 bg => [0, 0, 1, 0.2],
2871 bar => [0.7, 0.5, 0.1, 0.8],
2872 outline => [0.4, 0.3, 0],
2873 fontsize => 0.9,
2874 valign => 0.5,
2875 align => 0.5,
2876 can_events => 1,
2877 ellipsise => 1,
2878 label => "%d%%",
2879 %arg,
2880 );
2881
2882 $self->set_value ($arg{value} || -1);
2883
2884 $self
2885}
2886
2887sub set_label {
2888 my ($self, $label) = @_;
2889
2890 return if $self->{label} eq $label;
2891 $self->{label} = $label;
2892
2893 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2894}
2895
2896sub set_value {
2897 my ($self, $value) = @_;
2898
2899 if ($self->{value} ne $value) {
2900 $self->{value} = $value;
2901
2902 if ($value < 0) {
2903 $self->set_text ("-");
2904 } else {
2905 $self->set_text (sprintf $self->{label}, $value * 100);
2906 }
2907
2908 $self->update;
2909 }
2910}
2911
2912sub _draw {
2913 my ($self) = @_;
2914
2915 glEnable GL_BLEND;
2916 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2917
2918 my $px = $self->{padding_x};
2919 my $py = $self->{padding_y};
2920
2921 if ($self->{value} >= 0) {
2922 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2923
2924 glColor_premultiply @{$self->{bar}};
2925 glRect $px, $py, $s, $self->{h} - $py;
2926 glColor_premultiply @{$self->{bg}};
2927 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2928 }
2929
2930 glColor_premultiply @{$self->{outline}};
2931
2932 $px -= .5;
2933 $py -= .5;
2934
2935 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2936
2937 glDisable GL_BLEND;
2938
2939 {
2940 local $self->{bg}; # do not draw background
2941 $self->SUPER::_draw;
2942 }
2943}
2944
2945#############################################################################
2946
2947package DC::UI::ExperienceProgress;
2948
2949our @ISA = DC::UI::Progress::;
2950
2951sub new {
2952 my ($class, %arg) = @_;
2953
2954 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2955
2956 my $self = $class->SUPER::new (
2957 %arg,
2958 tooltip => sub {
2959 my ($self) = @_;
2960
2961 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2962 $tt,
2963 $self->{lvl},
2964 ::formsep ($self->{exp}),
2965 ::formsep ($self->{nxt}),
2966 ::formsep ($self->{nxt} - $self->{exp}),
2967 $self->_percent * 100,
2968 },
2969 );
2970
2971 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2972 if $::CONN;
2973
2974 $self
2975}
2976
2977sub DESTROY {
2978 my ($self) = @_;
2979
2980 delete $::CONN->{on_exp_update}{$self+0}
2981 if $::CONN;
2982
2983 $self->SUPER::DESTROY;
2984}
2985
2986sub _percent {
2987 my ($self) = @_;
2988
2989 my $table = $::CONN && $::CONN->{exp_table}
2990 or return -1;
2991
2992 my $l0 = $table->[$self->{lvl} - 1];
2993 my $l1 = $table->[$self->{lvl}];
2994
2995 $self->{nxt} = $l1;
2996
2997 ($self->{exp} - $l0) / ($l1 - $l0)
2998}
2999
3000sub set_value {
3001 my ($self, $lvl, $exp) = @_;
3002
3003 $self->{lvl} = $lvl;
3004 $self->{exp} = $exp;
3005
3006 $self->SUPER::set_value ($self->_percent);
3007}
3008
3009#############################################################################
3010
2741package CFPlus::UI::Gauge; 3011package DC::UI::Gauge;
2742 3012
2743our @ISA = CFPlus::UI::VBox::; 3013our @ISA = DC::UI::VBox::;
2744 3014
2745sub new { 3015sub new {
2746 my ($class, %arg) = @_; 3016 my ($class, %arg) = @_;
2747 3017
2748 my $self = $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
… …
2750 can_hover => 1, 3020 can_hover => 1,
2751 can_events => 1, 3021 can_events => 1,
2752 %arg, 3022 %arg,
2753 ); 3023 );
2754 3024
2755 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3025 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2756 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3026 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2757 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3027 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2758 3028
2759 $self 3029 $self
2760} 3030}
2761 3031
2762sub set_fontsize { 3032sub set_fontsize {
… …
2783 $self->{value}->set_text ($val); 3053 $self->{value}->set_text ($val);
2784} 3054}
2785 3055
2786############################################################################# 3056#############################################################################
2787 3057
2788package CFPlus::UI::Slider; 3058package DC::UI::Slider;
2789 3059
2790use strict; 3060use common::sense;
2791 3061
2792use CFPlus::OpenGL; 3062use DC::OpenGL;
2793 3063
2794our @ISA = CFPlus::UI::DrawBG::; 3064our @ISA = DC::UI::DrawBG::;
2795 3065
2796my @tex = 3066my @tex =
2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3067 map { new_from_resource DC::Texture $_ }
2798 qw(s1_slider.png s1_slider_bg.png); 3068 qw(s1_slider.png s1_slider_bg.png);
2799 3069
2800sub new { 3070sub new {
2801 my $class = shift; 3071 my $class = shift;
2802 3072
… …
2839sub set_value { 3109sub set_value {
2840 my ($self, $value) = @_; 3110 my ($self, $value) = @_;
2841 3111
2842 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3112 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2843 3113
2844 $hi = $lo + 1 if $hi <= $lo; 3114 $hi = $lo if $hi < $lo;
2845 3115
2846 $page = $hi - $lo if $page > $hi - $lo; 3116 $value = $hi - $page if $value > $hi - $page;
2847
2848 $value = $lo if $value < $lo; 3117 $value = $lo if $value < $lo;
2849 $value = $hi - $page if $value > $hi - $page;
2850 3118
2851 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2852 if $unit; 3120 if $unit;
2853 3121
2854 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2870 3138
2871 $self->SUPER::invoke_button_down ($ev, $x, $y); 3139 $self->SUPER::invoke_button_down ($ev, $x, $y);
2872 3140
2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3141 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874 3142
2875 $self->invoke_mouse_motion ($ev, $x, $y) 3143 $self->invoke_mouse_motion ($ev, $x, $y);
3144
3145 1
2876} 3146}
2877 3147
2878sub invoke_mouse_motion { 3148sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3149 my ($self, $ev, $x, $y) = @_;
2880 3150
2881 if ($GRAB == $self) { 3151 if ($GRAB == $self) {
2882 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3152 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2883 3153
2884 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3154 my (undef, $lo, $hi, $page) = @{$self->{range}};
2885 3155
2886 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3156 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2887 3157
2888 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3158 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2889 } else { 3159 } else {
2890 return 0; 3160 return 0;
2891 } 3161 }
… …
2896sub invoke_mouse_wheel { 3166sub invoke_mouse_wheel {
2897 my ($self, $ev) = @_; 3167 my ($self, $ev) = @_;
2898 3168
2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3169 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2900 3170
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3171 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2902 3172
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3173 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904 3174
2905 ! ! $delta 3175 1
2906} 3176}
2907 3177
2908sub update { 3178sub update {
2909 my ($self) = @_; 3179 my ($self) = @_;
2910 3180
… …
2916 my ($self) = @_; 3186 my ($self) = @_;
2917 3187
2918 unless ($self->{knob_w}) { 3188 unless ($self->{knob_w}) {
2919 $self->set_value ($self->{range}[0]); 3189 $self->set_value ($self->{range}[0]);
2920 3190
2921 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3191 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2922 my $range = ($hi - $page - $lo) || 1e-100; 3192 my $range = ($hi - $page - $lo) || 1e-10;
2923 3193
2924 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3194 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2925 3195
2926 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2927 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2928 3198
2929 $value = ($value - $lo) / $range; 3199 $value = ($value - $lo) / $range;
… …
2959 glDisable GL_TEXTURE_2D; 3229 glDisable GL_TEXTURE_2D;
2960} 3230}
2961 3231
2962############################################################################# 3232#############################################################################
2963 3233
2964package CFPlus::UI::ValSlider; 3234package DC::UI::ValSlider;
2965 3235
2966our @ISA = CFPlus::UI::HBox::; 3236our @ISA = DC::UI::HBox::;
2967 3237
2968sub new { 3238sub new {
2969 my ($class, %arg) = @_; 3239 my ($class, %arg) = @_;
2970 3240
2971 my $range = delete $arg{range}; 3241 my $range = delete $arg{range};
2972 3242
2973 my $self = $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
2974 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3244 slider => (new DC::UI::Slider expand => 1, range => $range),
2975 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3245 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2976 to_value => sub { shift }, 3246 to_value => sub { shift },
2977 from_value => sub { shift }, 3247 from_value => sub { shift },
2978 %arg, 3248 %arg,
2979 ); 3249 );
2980 3250
… …
3000sub set_range { shift->{slider}->set_range (@_) } 3270sub set_range { shift->{slider}->set_range (@_) }
3001sub set_value { shift->{slider}->set_value (@_) } 3271sub set_value { shift->{slider}->set_value (@_) }
3002 3272
3003############################################################################# 3273#############################################################################
3004 3274
3005package CFPlus::UI::TextScroller; 3275package DC::UI::TextScroller;
3006 3276
3007our @ISA = CFPlus::UI::HBox::; 3277our @ISA = DC::UI::HBox::;
3008 3278
3009use CFPlus::OpenGL; 3279use DC::OpenGL;
3010 3280
3011sub new { 3281sub new {
3012 my $class = shift; 3282 my $class = shift;
3013 3283
3014 my $self = $class->SUPER::new ( 3284 my $self = $class->SUPER::new (
… …
3016 can_events => 1, 3286 can_events => 1,
3017 indent => 0, 3287 indent => 0,
3018 #font => default_font 3288 #font => default_font
3019 @_, 3289 @_,
3020 3290
3021 layout => (new CFPlus::Layout), 3291 layout => (new DC::Layout),
3022 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
3302 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3303
3033 $self 3304 $self
3034} 3305}
3035 3306
3036sub set_fontsize { 3307sub set_fontsize {
3037 my ($self, $fontsize) = @_; 3308 my ($self, $fontsize) = @_;
… …
3041} 3312}
3042 3313
3043sub size_request { 3314sub size_request {
3044 my ($self) = @_; 3315 my ($self) = @_;
3045 3316
3046 my ($empty, $slider) = @{ $self->{children} }; 3317 my ($empty, $slider) = $self->visible_children;
3047 3318
3048 local $self->{children} = [$empty, $slider]; 3319 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request 3320 $self->SUPER::size_request
3050} 3321}
3051 3322
… …
3088 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3359 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3089 $layout->set_markup ($para->{markup}); 3360 $layout->set_markup ($para->{markup});
3090 3361
3091 $layout->set_shapes ( 3362 $layout->set_shapes (
3092 map 3363 map
3093 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3364 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3094 @{$para->{widget}} 3365 @{$para->{widget}}
3095 ); 3366 );
3096 3367
3097 $layout 3368 $layout
3098} 3369}
… …
3215 $ROOT->on_post_alloc ($self => sub { 3486 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate; 3487 $self->force_uptodate;
3217 3488
3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3489 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3219 3490
3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3491 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3221 glClearColor 0, 0, 0, 0; 3492 glClearColor 0, 0, 0, 0;
3222 glClear GL_COLOR_BUFFER_BIT; 3493 glClear GL_COLOR_BUFFER_BIT;
3223 3494
3224 package CFPlus::UI::Base; 3495 package DC::UI::Base;
3225 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3496 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226 (0, 0, $self->{w}, $self->{h}); 3497 (0, 0, $self->{w}, $self->{h});
3227 3498
3228 my $top = int $self->{children}[1]{range}[0]; 3499 my $top = int $self->{children}[1]{range}[0];
3229 3500
… …
3240 3511
3241 if ($y0 < $y + $h && $y < $y1) { 3512 if ($y0 < $y + $h && $y < $y1) {
3242 my $layout = $self->get_layout ($para); 3513 my $layout = $self->get_layout ($para);
3243 3514
3244 $layout->render ($para->{indent}, $y - $y0); 3515 $layout->render ($para->{indent}, $y - $y0);
3516 $layout->draw;
3245 3517
3246 if (my @w = @{ $para->{widget} }) { 3518 if (my @w = @{ $para->{widget} }) {
3247 my @s = $layout->get_shapes; 3519 my @s = $layout->get_shapes;
3248 3520
3249 for (@w) { 3521 for (@w) {
… …
3287 $self->{children}[1]->draw; 3559 $self->{children}[1]->draw;
3288} 3560}
3289 3561
3290############################################################################# 3562#############################################################################
3291 3563
3292package CFPlus::UI::Animator; 3564package DC::UI::Animator;
3293 3565
3294use CFPlus::OpenGL; 3566use DC::OpenGL;
3295 3567
3296our @ISA = CFPlus::UI::Bin::; 3568our @ISA = DC::UI::Bin::;
3297 3569
3298sub moveto { 3570sub moveto {
3299 my ($self, $x, $y) = @_; 3571 my ($self, $x, $y) = @_;
3300 3572
3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3573 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3329 glPopMatrix; 3601 glPopMatrix;
3330} 3602}
3331 3603
3332############################################################################# 3604#############################################################################
3333 3605
3334package CFPlus::UI::Flopper; 3606package DC::UI::Flopper;
3335 3607
3336our @ISA = CFPlus::UI::Button::; 3608our @ISA = DC::UI::Button::;
3337 3609
3338sub new { 3610sub new {
3339 my $class = shift; 3611 my $class = shift;
3340 3612
3341 my $self = $class->SUPER::new ( 3613 my $self = $class->SUPER::new (
… …
3353 $self->{other}->toggle_visibility; 3625 $self->{other}->toggle_visibility;
3354} 3626}
3355 3627
3356############################################################################# 3628#############################################################################
3357 3629
3358package CFPlus::UI::Tooltip; 3630package DC::UI::Tooltip;
3359 3631
3360our @ISA = CFPlus::UI::Bin::; 3632our @ISA = DC::UI::Bin::;
3361 3633
3362use CFPlus::OpenGL; 3634use DC::OpenGL;
3363 3635
3364sub new { 3636sub new {
3365 my $class = shift; 3637 my $class = shift;
3366 3638
3367 $class->SUPER::new ( 3639 $class->SUPER::new (
… …
3371} 3643}
3372 3644
3373sub set_tooltip_from { 3645sub set_tooltip_from {
3374 my ($self, $widget) = @_; 3646 my ($self, $widget) = @_;
3375 3647
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
3378
3379 my $tooltip = $widget->{tooltip}; 3648 my $tip = $widget->{tooltip};
3649 $tip = $tip->($widget) if "CODE" eq ref $tip;
3650
3651 $tip = DC::Pod::section_label tooltip => $1
3652 if $tip =~ /^#(.*)$/;
3380 3653
3381 if ($ENV{CFPLUS_DEBUG} & 2) { 3654 if ($ENV{CFPLUS_DEBUG} & 2) {
3382 $tooltip .= "\n\n" . (ref $widget) . "\n" 3655 $tip .= "\n\n" . (ref $widget) . "\n"
3383 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3656 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3384 . "req $widget->{req_w} $widget->{req_h}\n" 3657 . "req $widget->{req_w} $widget->{req_h}\n"
3385 . "visible $widget->{visible}"; 3658 . "visible $widget->{visible}";
3386 } 3659 }
3387 3660
3388 $tooltip =~ s/^\n+//; 3661 $tip =~ s/^\n+//;
3389 $tooltip =~ s/\n+$//; 3662 $tip =~ s/\n+$//;
3390 3663
3391 $self->add (new CFPlus::UI::Label 3664 $self->add (new DC::UI::Label
3665 fg => $DC::THEME{tooltip_fg},
3392 markup => $tooltip, 3666 markup => $tip,
3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3667 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3668 align => 0,
3394 fontsize => 0.8, 3669 fontsize => 0.8,
3395 style => 1, # FLAG_INVERSE 3670 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3396 ellipsise => 0, 3671 ellipsise => 0,
3397 font => ($widget->{tooltip_font} || $::FONT_PROP), 3672 font => ($widget->{tooltip_font} || $::FONT_PROP),
3398 ); 3673 );
3399} 3674}
3400 3675
… …
3435} 3710}
3436 3711
3437sub _draw { 3712sub _draw {
3438 my ($self) = @_; 3713 my ($self) = @_;
3439 3714
3440 glTranslate 0.375, 0.375;
3441
3442 my ($w, $h) = @$self{qw(w h)}; 3715 my ($w, $h) = @$self{qw(w h)};
3443 3716
3444 glColor 1, 0.8, 0.4; 3717 glColor @{ $DC::THEME{tooltip_bg} };
3445 glBegin GL_QUADS; 3718 glRect 0, 0, $w, $h;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3719
3452 glColor 0, 0, 0; 3720 glColor @{ $DC::THEME{tooltip_border} };
3453 glBegin GL_LINE_LOOP; 3721 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 3722
3460 glTranslate 2 - 0.375, 2 - 0.375; 3723 glTranslate 2, 2;
3461 3724
3462 $self->SUPER::_draw; 3725 $self->SUPER::_draw;
3463} 3726}
3464 3727
3465############################################################################# 3728#############################################################################
3466 3729
3467package CFPlus::UI::Face; 3730package DC::UI::Face;
3468 3731
3469our @ISA = CFPlus::UI::DrawBG::; 3732our @ISA = DC::UI::DrawBG::;
3470 3733
3471use CFPlus::OpenGL; 3734use DC::OpenGL;
3472 3735
3473sub new { 3736sub new {
3474 my $class = shift; 3737 my $class = shift;
3475 3738
3476 my $self = $class->SUPER::new ( 3739 my $self = $class->SUPER::new (
… …
3479 aspect => 1, 3742 aspect => 1,
3480 can_events => 0, 3743 can_events => 0,
3481 @_, 3744 @_,
3482 ); 3745 );
3483 3746
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; 3747 $self->update_anim;
3504 }
3505 3748
3506 $self 3749 $self
3507} 3750}
3508 3751
3509sub update_timer { 3752sub update_timer {
3510 my ($self) = @_; 3753 my ($self) = @_;
3511 3754
3512 return unless $self->{timer}; 3755 return unless $self->{timer};
3513 3756
3514 if ($self->{visible}) { 3757 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; 3758 $self->{timer}->start;
3521 } else { 3759 } else {
3522 $self->{timer}->stop; 3760 $self->{timer}->stop;
3523 } 3761 }
3524} 3762}
3525 3763
3526sub update_face { 3764sub update_face {
3527 my ($self) = @_; 3765 my ($self) = @_;
3528 3766
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 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3536 }
3537 }
3538}
3539
3540sub size_request {
3541 my ($self) = @_;
3542
3543 if ($::CONN) { 3767 if ($::CONN) {
3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3768 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3545 if (my $tex = $::CONN->{texture}[$faceid]) { 3769 if ($anim && @$anim) {
3546 $self->{tex} = $tex; 3770 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3771 delete $self->{face_change_cb};
3548 } else { 3772
3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3773 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3550 $self->realloc; 3774 unless ($tex->{name} || $tex->{loading}) {
3775 $tex->upload (sub { $self->reconfigure });
3776 }
3551 }); 3777 }
3552 } 3778 }
3553 } 3779 }
3554 } 3780 }
3781}
3782
3783sub update_anim {
3784 my ($self) = @_;
3785
3786 if ($self->{anim} && $self->{animspeed}) {
3787 DC::weaken (my $widget = $self);
3788
3789 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3790 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3791 return unless $::CONN;
3792
3793 my $w = $widget
3794 or return;
3795
3796 ++$w->{frame};
3797 $w->update_face;
3798
3799 # somehow, $widget can go away
3800 $w->update;
3801 $w->update_timer;
3802 };
3803
3804 $self->update_face;
3805 $self->update_timer;
3806 } else {
3807 delete $self->{timer};
3808 }
3809}
3810
3811sub size_request {
3812 my ($self) = @_;
3813
3814 if ($::CONN) {
3815 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3816 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3817 if ($tex->{name}) {
3818 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3819 } elsif (!$tex->{loading}) {
3820 $tex->upload (sub { $self->reconfigure });
3821 }
3822 }
3823
3824 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3825 }
3826 }
3555 3827
3556 ($self->{size_w} || 8, $self->{size_h} || 8) 3828 ($self->{size_w} || 8, $self->{size_h} || 8)
3557} 3829}
3558 3830
3559sub update { 3831sub update {
3560 my ($self) = @_; 3832 my ($self) = @_;
3561 3833
3562 return unless $self->{visible}; 3834 return unless $self->{visible};
3563 3835
3564 $self->SUPER::update; 3836 $self->SUPER::update;
3837}
3838
3839sub set_face {
3840 my ($self, $face) = @_;
3841
3842 $self->{face} = $face;
3843 $self->reconfigure;
3844}
3845
3846sub set_anim {
3847 my ($self, $anim) = @_;
3848
3849 $self->{anim} = $anim;
3850 $self->update_anim;
3851}
3852
3853sub set_animspeed {
3854 my ($self, $animspeed) = @_;
3855
3856 $self->{animspeed} = $animspeed;
3857 $self->update_anim;
3565} 3858}
3566 3859
3567sub invoke_visibility_change { 3860sub invoke_visibility_change {
3568 my ($self) = @_; 3861 my ($self) = @_;
3569 3862
… …
3595 $self->SUPER::destroy; 3888 $self->SUPER::destroy;
3596} 3889}
3597 3890
3598############################################################################# 3891#############################################################################
3599 3892
3600package CFPlus::UI::Buttonbar; 3893package DC::UI::Buttonbar;
3601 3894
3602our @ISA = CFPlus::UI::HBox::; 3895our @ISA = DC::UI::HBox::;
3603 3896
3604# TODO: should actually wrap buttons and other goodies. 3897# TODO: should actually wrap buttons and other goodies.
3605 3898
3606############################################################################# 3899#############################################################################
3607 3900
3608package CFPlus::UI::Menu; 3901package DC::UI::Menu;
3609 3902
3610our @ISA = CFPlus::UI::Toplevel::; 3903our @ISA = DC::UI::Toplevel::;
3611 3904
3612use CFPlus::OpenGL; 3905use DC::OpenGL;
3613 3906
3614sub new { 3907sub new {
3615 my $class = shift; 3908 my $class = shift;
3616 3909
3617 my $self = $class->SUPER::new ( 3910 my $self = $class->SUPER::new (
3618 items => [], 3911 items => [],
3619 z => 100, 3912 z => 100,
3620 @_, 3913 @_,
3621 ); 3914 );
3622 3915
3623 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3916 $self->add ($self->{vbox} = new DC::UI::VBox);
3624 3917
3625 for my $item (@{ $self->{items} }) { 3918 for my $item (@{ $self->{items} }) {
3626 my ($widget, $cb, $tooltip) = @$item; 3919 my ($widget, $cb, $tooltip) = @$item;
3627 3920
3628 # handle various types of items, only text for now 3921 # handle various types of items, only text for now
3629 if (!ref $widget) { 3922 if (!ref $widget) {
3630 if ($widget =~ /\t/) { 3923 if ($widget =~ /\t/) {
3631 my ($left, $right) = split /\t/, $widget, 2; 3924 my ($left, $right) = split /\t/, $widget, 2;
3632 3925
3633 $widget = new CFPlus::UI::HBox 3926 $widget = new DC::UI::HBox
3634 can_hover => 1, 3927 can_hover => 1,
3635 can_events => 1, 3928 can_events => 1,
3636 tooltip => $tooltip, 3929 tooltip => $tooltip,
3637 children => [ 3930 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1), 3931 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1), 3932 (new DC::UI::Label markup => $right, align => 1),
3640 ], 3933 ],
3641 ; 3934 ;
3642 3935
3643 } else { 3936 } else {
3644 $widget = new CFPlus::UI::Label 3937 $widget = new DC::UI::Label
3645 can_hover => 1, 3938 can_hover => 1,
3646 can_events => 1, 3939 can_events => 1,
3940 align => 0,
3647 markup => $widget, 3941 markup => $widget,
3648 tooltip => $tooltip; 3942 tooltip => $tooltip;
3649 } 3943 }
3650 } 3944 }
3651 3945
… …
3666 # maybe save $GRAB? must be careful about events... 3960 # maybe save $GRAB? must be careful about events...
3667 $GRAB = $self; 3961 $GRAB = $self;
3668 $self->{button} = $ev->{button}; 3962 $self->{button} = $ev->{button};
3669 3963
3670 $self->show; 3964 $self->show;
3671 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3965
3966 my $x = $ev->{x};
3967 my $y = $ev->{y};
3968
3969 $self->{root}->on_post_alloc ($self => sub {
3970 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3971 });
3972
3973 1 # so it can be used inside event handlers
3672} 3974}
3673 3975
3674sub invoke_mouse_motion { 3976sub invoke_mouse_motion {
3675 my ($self, $ev, $x, $y) = @_; 3977 my ($self, $ev, $x, $y) = @_;
3676 3978
… …
3697 1 3999 1
3698} 4000}
3699 4001
3700############################################################################# 4002#############################################################################
3701 4003
3702package CFPlus::UI::Multiplexer; 4004package DC::UI::Multiplexer;
3703 4005
3704our @ISA = CFPlus::UI::Container::; 4006our @ISA = DC::UI::Container::;
3705 4007
3706sub new { 4008sub new {
3707 my $class = shift; 4009 my $class = shift;
3708 4010
3709 my $self = $class->SUPER::new ( 4011 my $self = $class->SUPER::new (
3710 @_, 4012 @_,
3711 ); 4013 );
3712 4014
3713 $self->{current} = $self->{children}[0] 4015 $self->set_current_page (0);
3714 if @{ $self->{children} };
3715 4016
3716 $self 4017 $self
3717} 4018}
3718 4019
3719sub add { 4020sub add {
3720 my ($self, @widgets) = @_; 4021 my ($self, @widgets) = @_;
3721 4022
3722 $self->SUPER::add (@widgets); 4023 $self->SUPER::add (@widgets);
3723 4024
3724 $self->{current} = $self->{children}[0] 4025 $self->set_current_page (0)
3725 if @{ $self->{children} }; 4026 if @widgets == @{ $self->{children} };
3726} 4027}
3727 4028
3728sub get_current_page { 4029sub get_current_page {
3729 my ($self) = @_; 4030 my ($self) = @_;
3730 4031
… …
3736 4037
3737 my $widget = ref $page_or_widget 4038 my $widget = ref $page_or_widget
3738 ? $page_or_widget 4039 ? $page_or_widget
3739 : $self->{children}[$page_or_widget]; 4040 : $self->{children}[$page_or_widget];
3740 4041
4042 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4043
3741 $self->{current} = $widget; 4044 if (($self->{current} = $widget)) {
4045 $self->{current}->set_visible if $self->{current} && $self->{visible};
3742 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4046 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3743 4047
3744 $self->emit (page_changed => $self->{current}); 4048 $self->emit (page_changed => $self->{current});
4049 }
3745 4050
3746 $self->realloc; 4051 $self->realloc;
3747} 4052}
3748 4053
3749sub visible_children { 4054sub visible_children {
3750 $_[0]{current} 4055 $_[0]{current} || ()
3751} 4056}
3752 4057
3753sub size_request { 4058sub size_request {
3754 my ($self) = @_; 4059 my ($self) = @_;
3755 4060
4061 $self->{current}
3756 $self->{current}->size_request 4062 ? $self->{current}->size_request
4063 : (0, 0)
3757} 4064}
3758 4065
3759sub invoke_size_allocate { 4066sub invoke_size_allocate {
3760 my ($self, $w, $h) = @_; 4067 my ($self, $w, $h) = @_;
3761 4068
3762 $self->{current}->configure (0, 0, $w, $h); 4069 $self->{current}->configure (0, 0, $w, $h)
4070 if $self->{current};
3763 4071
3764 1 4072 1
3765} 4073}
3766 4074
3767sub _draw { 4075sub _draw {
3768 my ($self) = @_; 4076 my ($self) = @_;
3769 4077
3770 $self->{current}->draw; 4078 $self->{current}->draw
4079 if $self->{current};
3771} 4080}
3772 4081
3773############################################################################# 4082#############################################################################
3774 4083
3775package CFPlus::UI::Notebook; 4084package DC::UI::Notebook;
3776 4085
4086use DC::OpenGL;
4087
3777our @ISA = CFPlus::UI::VBox::; 4088our @ISA = DC::UI::VBox::;
3778 4089
3779sub new { 4090sub new {
3780 my $class = shift; 4091 my $class = shift;
3781 4092
3782 my $self = $class->SUPER::new ( 4093 my $self = $class->SUPER::new (
3783 buttonbar => (new CFPlus::UI::Buttonbar), 4094 buttonbar => (new DC::UI::Buttonbar),
3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4095 multiplexer => (new DC::UI::Multiplexer expand => 1),
4096 active_outline => [.7, .7, 0.2],
3785 # filter => # will be put between multiplexer and $self 4097 # filter => # will be put between multiplexer and $self
3786 @_, 4098 @_,
3787 ); 4099 );
3788 4100
3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4101 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3790 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4102 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3791 4103
4104 {
4105 Scalar::Util::weaken (my $wself = $self);
4106
4107 $self->{multiplexer}->connect (c_add => sub {
4108 my ($mplex, $widgets) = @_;
4109
4110 for my $child (@$widgets) {
4111 Scalar::Util::weaken $child;
4112 $child->{c_tab_} ||= do {
4113 my $tab =
4114 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4115 ? $child->{c_tab}
4116 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4117
4118 $tab->connect (activate => sub {
4119 $wself->set_current_page ($child);
4120 });
4121
4122 $tab
4123 };
4124
4125 $self->{buttonbar}->add ($child->{c_tab_});
4126 }
4127 });
4128
4129 $self->{multiplexer}->connect (c_remove => sub {
4130 my ($mplex, $widgets) = @_;
4131
4132 for my $child (@$widgets) {
4133 $wself->{buttonbar}->remove ($child->{c_tab_});
4134 }
4135 });
4136 }
4137
3792 $self 4138 $self
3793} 4139}
3794 4140
3795sub add { 4141sub add {
4142 my ($self, @widgets) = @_;
4143
4144 $self->{multiplexer}->add (@widgets)
4145}
4146
4147sub remove {
4148 my ($self, @widgets) = @_;
4149
4150 $self->{multiplexer}->remove (@widgets)
4151}
4152
4153sub pages {
4154 my ($self) = @_;
4155 $self->{multiplexer}->children
4156}
4157
4158sub page_index {
4159 my ($self, $widget) = @_;
4160
4161 my $i = 0;
4162 for ($self->pages) {
4163 if ($_ eq $widget) { return $i };
4164 $i++;
4165 }
4166
4167 undef
4168}
4169
4170sub add_tab {
3796 my ($self, $title, $widget, $tooltip) = @_; 4171 my ($self, $title, $widget, $tooltip) = @_;
3797 4172
3798 CFPlus::weaken $self; 4173 $title = [$title, $tooltip] unless ref $title;
4174 $widget->{c_tab} = $title;
3799 4175
3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3801 markup => $title,
3802 tooltip => $tooltip,
3803 on_activate => sub { $self->set_current_page ($widget) },
3804 );
3805
3806 $self->{multiplexer}->add ($widget); 4176 $self->add ($widget);
3807} 4177}
3808 4178
3809sub get_current_page { 4179sub get_current_page {
3810 my ($self) = @_; 4180 my ($self) = @_;
3811 4181
… …
3817 4187
3818 $self->{multiplexer}->set_current_page ($page); 4188 $self->{multiplexer}->set_current_page ($page);
3819 $self->emit (page_changed => $self->{multiplexer}{current}); 4189 $self->emit (page_changed => $self->{multiplexer}{current});
3820} 4190}
3821 4191
4192sub _draw {
4193 my ($self) = @_;
4194
4195 $self->SUPER::_draw ();
4196
4197 if (my $cur = $self->{multiplexer}{current}) {
4198 if ($cur = $cur->{c_tab_}) {
4199 glTranslate $self->{buttonbar}{x} + $cur->{x},
4200 $self->{buttonbar}{y} + $cur->{y};
4201 glLineWidth 3;
4202 #glEnable GL_BLEND;
4203 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4204 glColor @{$self->{active_outline}};
4205 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4206 glLineWidth 1;
4207 #glDisable GL_BLEND;
4208 }
4209 }
4210}
4211
3822############################################################################# 4212#############################################################################
3823 4213
3824package CFPlus::UI::Selector; 4214package DC::UI::Selector;
3825 4215
3826use utf8; 4216use utf8;
3827 4217
3828our @ISA = CFPlus::UI::Button::; 4218our @ISA = DC::UI::Button::;
3829 4219
3830sub new { 4220sub new {
3831 my $class = shift; 4221 my $class = shift;
3832 4222
3833 my $self = $class->SUPER::new ( 4223 my $self = $class->SUPER::new (
… …
3850 my ($value, $title, $tooltip) = @$_; 4240 my ($value, $title, $tooltip) = @$_;
3851 4241
3852 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4242 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3853 } 4243 }
3854 4244
3855 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4245 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3856} 4246}
3857 4247
3858sub _set_value { 4248sub _set_value {
3859 my ($self, $value) = @_; 4249 my ($self, $value) = @_;
3860 4250
3861 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4251 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4252 $item ||= $self->{options}[0]
3862 or return; 4253 or return;
3863 4254
3864 $self->{value} = $item->[0]; 4255 $self->{value} = $item->[0];
3865 $self->set_markup ("$item->[1] ⇓"); 4256 $self->set_markup ("$item->[1] ⇓");
3866 $self->set_tooltip ($item->[2]); 4257# $self->set_tooltip ($item->[2]);
3867} 4258}
3868 4259
3869sub set_value { 4260sub set_value {
3870 my ($self, $value) = @_; 4261 my ($self, $value) = @_;
3871 4262
… …
3873 4264
3874 $self->_set_value ($value); 4265 $self->_set_value ($value);
3875 $self->emit (changed => $value); 4266 $self->emit (changed => $value);
3876} 4267}
3877 4268
4269sub set_options {
4270 my ($self, $options) = @_;
4271
4272 $self->{options} = $options;
4273 $self->_set_value ($self->{value});
4274}
4275
3878############################################################################# 4276#############################################################################
3879 4277
3880package CFPlus::UI::Statusbox; 4278package DC::UI::Statusbox;
3881 4279
3882our @ISA = CFPlus::UI::VBox::; 4280our @ISA = DC::UI::VBox::;
3883 4281
3884sub new { 4282sub new {
3885 my $class = shift; 4283 my $class = shift;
3886 4284
3887 my $self = $class->SUPER::new ( 4285 my $self = $class->SUPER::new (
3888 fontsize => 0.8, 4286 fontsize => 0.8,
3889 @_, 4287 @_,
3890 ); 4288 );
3891 4289
3892 CFPlus::weaken (my $this = $self); 4290 DC::weaken (my $this = $self);
3893 4291
3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4292 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3895 4293
3896 $self 4294 $self
3897} 4295}
3898 4296
3899sub reorder { 4297sub reorder {
3900 my ($self) = @_; 4298 my ($self) = @_;
3901 my $NOW = Time::HiRes::time; 4299 my $NOW = AE::time;
3902 4300
3903 # freeze display when hovering over any label 4301 # freeze display when hovering over any label
3904 return if $CFPlus::UI::TOOLTIP->{owner} 4302 return if $DC::UI::TOOLTIP->{owner}
3905 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4303 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3906 values %{ $self->{item} }; 4304 values %{ $self->{item} };
3907 4305
3908 while (my ($k, $v) = each %{ $self->{item} }) { 4306 while (my ($k, $v) = each %{ $self->{item} }) {
3909 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4307 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3910 } 4308 }
4309
4310 $self->{timer}->set (1, 1);
3911 4311
3912 my @widgets; 4312 my @widgets;
3913 4313
3914 my @items = sort { 4314 my @items = sort {
3915 $a->{pri} <=> $b->{pri} 4315 $a->{pri} <=> $b->{pri}
3916 or $b->{id} <=> $a->{id} 4316 or $b->{id} <=> $a->{id}
3917 } values %{ $self->{item} }; 4317 } values %{ $self->{item} };
3918
3919 $self->{timer}->interval (1);
3920 4318
3921 my $count = 10 + 1; 4319 my $count = 10 + 1;
3922 for my $item (@items) { 4320 for my $item (@items) {
3923 last unless --$count; 4321 last unless --$count;
3924 4322
… …
3931 for ($short) { 4329 for ($short) {
3932 s/^\s+//; 4330 s/^\s+//;
3933 s/\s+/ /g; 4331 s/\s+/ /g;
3934 } 4332 }
3935 4333
3936 new CFPlus::UI::Label 4334 new DC::UI::Label
3937 markup => $short, 4335 markup => $short,
3938 tooltip => $item->{tooltip}, 4336 tooltip => $item->{tooltip},
3939 tooltip_font => $::FONT_PROP, 4337 tooltip_font => $::FONT_PROP,
3940 tooltip_width => 0.67, 4338 tooltip_width => 0.67,
3941 fontsize => $item->{fontsize} || $self->{fontsize}, 4339 fontsize => $item->{fontsize} || $self->{fontsize},
3942 max_w => $::WIDTH * 0.44, 4340 max_w => $::WIDTH * 0.44,
4341 align => 0,
3943 fg => [@{ $item->{fg} }], 4342 fg => [@{ $item->{fg} }],
3944 can_events => 1, 4343 can_events => 1,
3945 can_hover => 1 4344 can_hover => 1
3946 }; 4345 };
3947 4346
3948 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4347 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3949 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4348 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3950 $label->update; 4349 $label->update;
3951 $label->set_max_size (undef, $label->{req_h} * $diff) 4350 $label->set_max_size (undef, $label->{req_h} * $diff)
3952 if $diff < 1; 4351 if $diff < 1;
3953 $self->{timer}->interval (1/30); 4352 $self->{timer}->set (1/30, 1/30);
3954 } else { 4353 } else {
3955 $label->{fg}[3] = $item->{fg}[3] || 1; 4354 $label->{fg}[3] = $item->{fg}[3] || 1;
3956 } 4355 }
3957 4356
3958 push @widgets, $label; 4357 push @widgets, $label;
3959 } 4358 }
4359
4360 my $hash = join ",", @widgets;
4361 return if $hash eq $self->{last_widget_hash};
4362 $self->{last_widget_hash} = $hash;
3960 4363
3961 $self->clear; 4364 $self->clear;
3962 $self->SUPER::add (reverse @widgets); 4365 $self->SUPER::add (reverse @widgets);
3963} 4366}
3964 4367
… …
4000 $ROOT->on_refresh (reorder => sub { 4403 $ROOT->on_refresh (reorder => sub {
4001 $self->reorder; 4404 $self->reorder;
4002 }); 4405 });
4003} 4406}
4004 4407
4408sub clr_group {
4409 my ($self, $group) = @_;
4410
4411 if (delete $self->{item}{$group}) {
4412 $ROOT->on_refresh (reorder => sub {
4413 $self->reorder;
4414 });
4415 }
4416}
4417
4005sub reconfigure { 4418sub reconfigure {
4006 my ($self) = @_; 4419 my ($self) = @_;
4007 4420
4008 delete $_->{label} 4421 delete $_->{label}
4009 for values %{ $self->{item} || {} }; 4422 for values %{ $self->{item} || {} };
… …
4020 $self->SUPER::destroy; 4433 $self->SUPER::destroy;
4021} 4434}
4022 4435
4023############################################################################# 4436#############################################################################
4024 4437
4025package CFPlus::UI::Root; 4438package DC::UI::Root;
4026 4439
4027our @ISA = CFPlus::UI::Container::; 4440our @ISA = DC::UI::Container::;
4028 4441
4029use List::Util qw(min max); 4442use List::Util qw(min max);
4030 4443
4031use CFPlus::OpenGL; 4444use DC::OpenGL;
4032 4445
4033sub new { 4446sub new {
4034 my $class = shift; 4447 my $class = shift;
4035 4448
4036 my $self = $class->SUPER::new ( 4449 my $self = $class->SUPER::new (
4037 visible => 1, 4450 visible => 1,
4038 @_, 4451 @_,
4039 ); 4452 );
4040 4453
4041 CFPlus::weaken ($self->{root} = $self); 4454 DC::weaken ($self->{root} = $self);
4042 4455
4043 $self 4456 $self
4044} 4457}
4045 4458
4046sub size_request { 4459sub size_request {
… …
4094} 4507}
4095 4508
4096sub update { 4509sub update {
4097 my ($self) = @_; 4510 my ($self) = @_;
4098 4511
4099 $::WANT_REFRESH++; 4512 $::WANT_REFRESH = 1;
4100} 4513}
4101 4514
4102sub add { 4515sub add {
4103 my ($self, @children) = @_; 4516 my ($self, @children) = @_;
4104 4517
… …
4171 4584
4172 delete $queue{$widget+0}; 4585 delete $queue{$widget+0};
4173 4586
4174 my ($w, $h) = $widget->size_request; 4587 my ($w, $h) = $widget->size_request;
4175 4588
4176 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4589 $w += $widget->{padding_x} * 2;
4177 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4590 $h += $widget->{padding_y} * 2;
4591
4592 $w = max $widget->{min_w}, $w;
4593 $h = max $widget->{min_h}, $h;
4178 4594
4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4595 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4596 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4181 4597
4182 $w = $widget->{force_w} if exists $widget->{force_w}; 4598 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4665 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4250 glMatrixMode GL_MODELVIEW; 4666 glMatrixMode GL_MODELVIEW;
4251 glLoadIdentity; 4667 glLoadIdentity;
4252 4668
4253 { 4669 {
4254 package CFPlus::UI::Base; 4670 package DC::UI::Base;
4255 4671
4256 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4672 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4257 (0, 0, $self->{w}, $self->{h}); 4673 (0, 0, $self->{w}, $self->{h});
4258 4674
4259 $self->_draw; 4675 $self->_draw;
4260 } 4676 }
4261} 4677}
4262 4678
4263############################################################################# 4679#############################################################################
4264 4680
4265package CFPlus::UI; 4681package DC::UI;
4266 4682
4267$ROOT = new CFPlus::UI::Root; 4683$ROOT = new DC::UI::Root;
4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4684$TOOLTIP = new DC::UI::Tooltip z => 900;
4269 4685
42701 46861
4271

Diff Legend

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