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.344 by root, Sun Aug 13 16:29:36 2006 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 UTC

1package CFPlus::UI; 1package dc::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFPlus; 8use dc;
11use CFPlus::Pod; 9use dc::Pod;
12use CFPlus::Texture; 10use dc::Texture;
13 11
14our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
15 13
16our $LAYOUT; 14our $LAYOUT;
17our $ROOT; 15our $ROOT;
18our $TOOLTIP; 16our $TOOLTIP;
19our $BUTTON_STATE; 17our $BUTTON_STATE;
20 18
21our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
22 20
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
24 if (!$GRAB) { 24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 29 $TOOLTIP->hide;
29 30
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 33
32 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
33 35
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 37 $TOOLTIP->show;
40 } 38 }
41 39
42 return; 40 return;
43 } 41 }
44 } 42 }
45 } 43 }
46 44
47 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
49}); 48};
50 49
51sub get_layout { 50sub get_layout {
52 my $layout; 51 my $layout;
53 52
54 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
89 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
90 89
91 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
93 92
94 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
95 } 94 }
96} 95}
97 96
98sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
99 my ($ev) = @_; 98 my ($ev) = @_;
… …
105 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
106 105
107 $GRAB = $widget; 106 $GRAB = $widget;
108 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
109 108
110 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
111 } 110 }
112 111
113 if ($GRAB) { 112 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 114 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & dc::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
118 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
119 } else { 122 } else {
120 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
121 } 124 }
122 } 125 }
… …
136 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
137 $grab->update if $grab; 140 $grab->update if $grab;
138 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
139 142
140 check_hover $widget; 143 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
142 } 145 }
143} 146}
144 147
145sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
146 my ($ev) = @_; 149 my ($ev) = @_;
… …
208 reconfigure_widgets; 211 reconfigure_widgets;
209} 212}
210 213
211############################################################################# 214#############################################################################
212 215
213package CFPlus::UI::Event; 216package dc::UI::Event;
214 217
215sub xy { 218sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217} 220}
218 221
219############################################################################# 222#############################################################################
220 223
221package CFPlus::UI::Base; 224package dc::UI::Base;
222 225
223use strict; 226use strict;
224 227
225use CFPlus::OpenGL; 228use dc::OpenGL;
226 229
227sub new { 230sub new {
228 my $class = shift; 231 my $class = shift;
229 232
230 my $self = bless { 233 my $self = bless {
… …
235 h => undef, 238 h => undef,
236 can_events => 1, 239 can_events => 1,
237 @_ 240 @_
238 }, $class; 241 }, $class;
239 242
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 dc::weaken ($dc::UI::WIDGET{$self+0} = $self);
241 244
242 for (keys %$self) { 245 for (keys %$self) {
243 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
245 } 248 }
246 } 249 }
247 250
248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $dc::UI::LAYOUT->{$self->{name}}) {
249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $dc::UI::ROOT->{alloc_w} if exists $layout->{x};
250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $dc::UI::ROOT->{alloc_h} if exists $layout->{y};
251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $dc::UI::ROOT->{alloc_w} if exists $layout->{w};
252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $dc::UI::ROOT->{alloc_h} if exists $layout->{h};
253 256
254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
256 259
257 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
262 265
263sub destroy { 266sub destroy {
264 my ($self) = @_; 267 my ($self) = @_;
265 268
266 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
267 %$self = (); 271 %$self = ();
268} 272}
269 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
270sub show { 278sub show {
271 my ($self) = @_; 279 my ($self) = @_;
272 280
273 return if $self->{parent}; 281 return if $self->{parent};
274 282
275 $CFPlus::UI::ROOT->add ($self); 283 $dc::UI::ROOT->add ($self);
276} 284}
277 285
278sub set_visible { 286sub set_visible {
279 my ($self) = @_; 287 my ($self) = @_;
280 288
… …
301 delete $self->{root}; 309 delete $self->{root};
302 310
303 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
304 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
305 313
306 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $dc::UI::TOOLTIP_WATCHER->invoke
307 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
308 316
309 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
310 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
311} 319}
… …
313sub set_visibility { 321sub set_visibility {
314 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
315 323
316 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
317 325
318 $visible ? $self->hide 326 $visible ? $self->show
319 : $self->show; 327 : $self->hide;
320} 328}
321 329
322sub toggle_visibility { 330sub toggle_visibility {
323 my ($self) = @_; 331 my ($self) = @_;
324 332
… …
330sub hide { 338sub hide {
331 my ($self) = @_; 339 my ($self) = @_;
332 340
333 $self->set_invisible; 341 $self->set_invisible;
334 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
335 $self->{parent}->remove ($self) 346 $parent->remove ($self);
336 if $self->{parent}; 347 }
337} 348}
338 349
339sub move_abs { 350sub move_abs {
340 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
341 352
… …
353 $self->{force_h} = $h; 364 $self->{force_h} = $h;
354 365
355 $self->realloc; 366 $self->realloc;
356} 367}
357 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
377}
378
358sub size_request { 379sub size_request {
359 require Carp; 380 require Carp;
360 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
361} 382}
362 383
… …
368 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
369 390
370 if ($self->{aspect}) { 391 if ($self->{aspect}) {
371 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
372 393
373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 394 $w = List::Util::min $w, dc::ceil $h * $self->{aspect};
374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 395 $h = List::Util::min $h, dc::ceil $w / $self->{aspect};
375 396
376 # use alignment to adjust x, y 397 # use alignment to adjust x, y
377 398
378 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
379 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
… …
420 441
421 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
422 443
423 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
424 445
425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($dc::UI::TOOLTIP->{owner} == $self) {
426 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $dc::UI::TOOLTIP->{owner};
427 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $dc::UI::TOOLTIP_WATCHER->invoke;
428 } 449 }
429} 450}
430 451
431# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
432sub coord2local { 453sub coord2local {
433 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
434 455
435 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
436 457
437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
438} 459}
439 460
440# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
441sub coord2global { 462sub coord2global {
442 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
443 464
444 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
445 466
446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
447} 468}
448 469
449sub invoke_focus_in { 470sub invoke_focus_in {
… …
498sub connect { 519sub connect {
499 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
500 521
501 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
502 523
503 defined wantarray and CFPlus::guard { 524 defined wantarray and dc::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 526 @{ $self->{signal_cb}{$signal} };
506 } 527 }
528}
529
530sub disconnect_all {
531 my ($self, $signal) = @_;
532
533 delete $self->{signal_cb}{$signal};
507} 534}
508 535
509my %has_coords = ( 536my %has_coords = (
510 button_down => 1, 537 button_down => 1,
511 button_up => 1, 538 button_up => 1,
… …
514); 541);
515 542
516sub emit { 543sub emit {
517 my ($self, $signal, @args) = @_; 544 my ($self, $signal, @args) = @_;
518 545
519 # I do not really like this solution, but I dislike duplication 546 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 547 # and needlessly verbose code, either.
521 my @append 548 my @append
522 = $has_coords{$signal} 549 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 550 ? $args[0]->xy ($self)
524 : (); 551 : ();
525 552
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 553 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 554
528 #d##TODO# stop propagating at first true, do not use sum 555 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 556 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 557 ($self->can ("invoke_$signal") || sub { 1 }), # closure
558 ) {
559 return $cb->($self, @args, @append) || next;
560 }
561
562 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 563 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 564}
533 565
534sub find_widget { 566#sub find_widget {
535 my ($self, $x, $y) = @_; 567# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 568
546sub set_parent { 569sub set_parent {
547 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
548 571
549 Scalar::Util::weaken ($self->{parent} = $parent); 572 dc::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
551} 574}
552 575
553sub realloc { 576sub realloc {
554 my ($self) = @_; 577 my ($self) = @_;
… …
580 603
581# using global variables seems a bit hacky, but passing through all drawing 604# using global variables seems a bit hacky, but passing through all drawing
582# functions seems pointless. 605# functions seems pointless.
583our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 606our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584 607
585sub draw { 608#sub draw {
586 my ($self) = @_; 609#CFPlus.xs
587
588 return unless $self->{h} && $self->{w};
589
590 # update screen rectangle
591 local $draw_x = $draw_x + $self->{x};
592 local $draw_y = $draw_y + $self->{y};
593
594 # skip widgets that are entirely outside the drawing area
595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598 glPushMatrix;
599 glTranslate $self->{x}, $self->{y}, 0;
600
601 if ($self == $HOVER && $self->{can_hover}) {
602 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603 glEnable GL_BLEND;
604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glBegin GL_QUADS;
606 glVertex 0 , 0;
607 glVertex $self->{w}, 0;
608 glVertex $self->{w}, $self->{h};
609 glVertex 0 , $self->{h};
610 glEnd;
611 glDisable GL_BLEND;
612 }
613
614 if ($ENV{CFPLUS_DEBUG} & 1) {
615 glPushMatrix;
616 glColor 1, 1, 0, 1;
617 glTranslate 0.375, 0.375;
618 glBegin GL_LINE_LOOP;
619 glVertex 0 , 0;
620 glVertex $self->{w} - 1, 0;
621 glVertex $self->{w} - 1, $self->{h} - 1;
622 glVertex 0 , $self->{h} - 1;
623 glEnd;
624 glPopMatrix;
625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626 }
627
628 $self->_draw;
629 glPopMatrix;
630}
631 610
632sub _draw { 611sub _draw {
633 my ($self) = @_; 612 my ($self) = @_;
634 613
635 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
636} 615}
637 616
638sub DESTROY { 617sub DESTROY {
639 my ($self) = @_; 618 my ($self) = @_;
640 619
641 return if CFPlus::in_destruct; 620 return if dc::in_destruct;
642 621
643 delete $WIDGET{$self+0}; 622 local $@;
644
645 eval { $self->destroy }; 623 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
625
626 delete $WIDGET{$self+0};
647} 627}
648 628
649############################################################################# 629#############################################################################
650 630
651package CFPlus::UI::DrawBG; 631package dc::UI::DrawBG;
652 632
653our @ISA = CFPlus::UI::Base::; 633our @ISA = dc::UI::Base::;
654 634
655use strict; 635use strict;
656use CFPlus::OpenGL; 636use dc::OpenGL;
657 637
658sub new { 638sub new {
659 my $class = shift; 639 my $class = shift;
660
661 # range [value, low, high, page]
662 640
663 $class->SUPER::new ( 641 $class->SUPER::new (
664 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
665 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
666 @_ 644 @_
… …
678 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
679 657
680 glEnable GL_BLEND; 658 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 660 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 662 glDisable GL_BLEND;
692 } 663 }
693} 664}
694 665
695############################################################################# 666#############################################################################
696 667
697package CFPlus::UI::Empty; 668package dc::UI::Empty;
698 669
699our @ISA = CFPlus::UI::Base::; 670our @ISA = dc::UI::Base::;
700 671
701sub new { 672sub new {
702 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
703 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
704} 675}
… …
711 682
712sub draw { } 683sub draw { }
713 684
714############################################################################# 685#############################################################################
715 686
716package CFPlus::UI::Container; 687package dc::UI::Container;
717 688
718our @ISA = CFPlus::UI::Base::; 689our @ISA = dc::UI::Base::;
719 690
720sub new { 691sub new {
721 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
722 693
723 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
… …
727 can_events => 0, 698 can_events => 0,
728 %arg, 699 %arg,
729 ); 700 );
730 701
731 $self->add (@$children) 702 $self->add (@$children)
732 if $children; 703 if $children && @$children;
733 704
734 $self 705 $self
735} 706}
736 707
737sub realloc { 708sub realloc {
… …
746 my ($self, @widgets) = @_; 717 my ($self, @widgets) = @_;
747 718
748 $_->set_parent ($self) 719 $_->set_parent ($self)
749 for @widgets; 720 for @widgets;
750 721
722 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 723 use sort 'stable';
752 724
753 $self->{children} = [ 725 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
756 ]; 728 ];
757 729
758 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
759} 735}
760 736
761sub children { 737sub children {
762 @{ $_[0]{children} } 738 @{ $_[0]{children} }
763} 739}
764 740
765sub remove { 741sub remove {
766 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
767 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
768 delete $child->{parent}; 747 delete $child->{parent};
769 $child->hide; 748 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
772 751
773 $self->realloc; 752 $self->realloc;
774} 753}
775 754
776sub clear { 755sub clear {
777 my ($self) = @_; 756 my ($self) = @_;
778 757
779 my $children = delete $self->{children}; 758 my $children = $self->{children};
780 $self->{children} = []; 759 $self->{children} = [];
781 760
782 for (@$children) { 761 for (@$children) {
783 delete $_->{parent}; 762 delete $_->{parent};
784 $_->hide; 763 $_->hide;
… …
804} 783}
805 784
806sub _draw { 785sub _draw {
807 my ($self) = @_; 786 my ($self) = @_;
808 787
809 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
810} 789}
811 790
812############################################################################# 791#############################################################################
813 792
814package CFPlus::UI::Bin; 793package dc::UI::Bin;
815 794
816our @ISA = CFPlus::UI::Container::; 795our @ISA = dc::UI::Container::;
817 796
818sub new { 797sub new {
819 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
820 799
821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 800 my $child = (delete $arg{child}) || new dc::UI::Empty::;
822 801
823 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
824} 803}
825 804
826sub add { 805sub add {
827 my ($self, $child) = @_; 806 my ($self, $child) = @_;
828 807
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
830 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
831} 810}
832 811
833sub remove { 812sub remove {
834 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
835 814
836 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
837 816
838 $self->{children} = [new CFPlus::UI::Empty] 817 $self->{children} = [new dc::UI::Empty]
839 unless @{$self->{children}}; 818 unless @{$self->{children}};
840} 819}
841 820
842sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
843 822
… …
852 831
853 1 832 1
854} 833}
855 834
856############################################################################# 835#############################################################################
857
858# back-buffered drawing area 836# back-buffered drawing area
859 837
860package CFPlus::UI::Window; 838package dc::UI::Window;
861 839
862our @ISA = CFPlus::UI::Bin::; 840our @ISA = dc::UI::Bin::;
863 841
864use CFPlus::OpenGL; 842use dc::OpenGL;
865 843
866sub new { 844sub new {
867 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
868 846
869 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
… …
891} 869}
892 870
893sub render_child { 871sub render_child {
894 my ($self) = @_; 872 my ($self) = @_;
895 873
896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 874 $self->{texture} = new_from_opengl dc::Texture $self->{w}, $self->{h}, sub {
897 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
898 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
899 877
900 { 878 {
901 package CFPlus::UI::Base; 879 package dc::UI::Base;
902 880
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
883
884 $self->_render;
905 } 885 }
906
907 $self->_render;
908 }; 886 };
909} 887}
910 888
911sub _draw { 889sub _draw {
912 my ($self) = @_; 890 my ($self) = @_;
… …
923 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
924} 902}
925 903
926############################################################################# 904#############################################################################
927 905
928package CFPlus::UI::ViewPort; 906package dc::UI::ViewPort;
929 907
908use List::Util qw(min max);
909
930our @ISA = CFPlus::UI::Window::; 910our @ISA = dc::UI::Window::;
931 911
932sub new { 912sub new {
933 my $class = shift; 913 my $class = shift;
934 914
935 $class->SUPER::new ( 915 $class->SUPER::new (
… …
942sub size_request { 922sub size_request {
943 my ($self) = @_; 923 my ($self) = @_;
944 924
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 926
947 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
949 929
950 ($w, $h) 930 ($w, $h)
951} 931}
952 932
953sub invoke_size_allocate { 933sub invoke_size_allocate {
… …
965} 945}
966 946
967sub set_offset { 947sub set_offset {
968 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
969 949
950 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
951 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
952
953 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 954 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 955 $self->{view_y} = $y;
972 956
957 $self->emit (changed => $x, $y);
973 $self->update; 958 $self->update;
959 }
960}
961
962sub set_center {
963 my ($self, $x, $y) = @_;
964
965 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
966}
967
968sub make_visible {
969 my ($self, $x, $y, $border) = @_;
970
971 if ( $x < $self->{view_x} + $self->{w} * $border
972 || $x > $self->{view_x} + $self->{w} * (1 - $border)
973 || $y < $self->{view_y} + $self->{h} * $border
974 || $y > $self->{view_y} + $self->{h} * (1 - $border)
975 ) {
976 $self->set_center ($x, $y);
977 }
974} 978}
975 979
976# hmm, this does not work for topleft of $self... but we should not ask for that 980# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 981sub coord2local {
978 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
994 998
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1001 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1003 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->dc::UI::Base::find_widget ($x, $y)
1001 } 1005 }
1002} 1006}
1003 1007
1004sub _render { 1008sub _render {
1005 my ($self) = @_; 1009 my ($self) = @_;
1006 1010
1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1011 local $dc::UI::Base::draw_x = $dc::UI::Base::draw_x - $self->{view_x};
1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1012 local $dc::UI::Base::draw_y = $dc::UI::Base::draw_y - $self->{view_y};
1009 1013
1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1011 1015
1012 $self->SUPER::_render; 1016 $self->SUPER::_render;
1013} 1017}
1014 1018
1015############################################################################# 1019#############################################################################
1016 1020
1017package CFPlus::UI::ScrolledWindow; 1021package dc::UI::ScrolledWindow;
1018 1022
1019our @ISA = CFPlus::UI::HBox::; 1023our @ISA = dc::UI::Table::;
1020 1024
1021sub new { 1025sub new {
1022 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1023 1027
1024 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1025 1029
1026 my $self; 1030 my $self;
1027 1031
1028 my $slider = new CFPlus::UI::Slider 1032 my $hslider = new dc::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1035 vertical => 0,
1036 range => [0, 0, 1, 0.01], # HACK fix
1037 on_changed => sub {
1038 $self->{hpos} = $_[1];
1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 },
1041 ;
1042
1043 my $vslider = new dc::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
1029 vertical => 1, 1046 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1048 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1049 $self->{vpos} = $_[1];
1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1051 },
1034 ; 1052 ;
1035 1053
1036 $self = $class->SUPER::new ( 1054 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1055 scroll_x => 0,
1056 scroll_y => 1,
1038 can_events => 1, 1057 can_events => 1,
1039 slider => $slider, 1058 hslider => $hslider,
1059 vslider => $vslider,
1060 col_expand => [1, 0],
1061 row_expand => [1, 0],
1040 %arg, 1062 %arg,
1041 ); 1063 );
1042 1064
1065 $self->{vp} = new dc::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1068 expand => 1,
1069 scroll_x => $self->{scroll_x},
1070 scroll_y => $self->{scroll_y},
1071 on_changed => sub {
1072 my ($vp, $x, $y) = @_;
1073
1074 $vp->{parent}{hslider}->set_value ($x);
1075 $vp->{parent}{vslider}->set_value ($y);
1076
1077 0
1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1084 ;
1085
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1086 $self->SUPER::add ($self->{vp});
1087
1044 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1045 1089
1046 $self 1090 $self
1047} 1091}
1048
1049#TODO# update range on size_allocate depending on child
1050 1092
1051sub add { 1093sub add {
1052 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1053 1095
1054 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1055} 1097}
1056 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1103sub update_slider {
1104 my ($self) = @_;
1105
1106 my $child = ($self->{vp} or return)->child;
1107
1108 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1115 $visible ? $self->SUPER::add ($self->{hslider})
1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1118 }
1119
1120 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
1134 my ($self, $ev) = @_;
1135
1136 $self->grab_focus;
1137
1138 my $ox = $self->{vp}{view_x};
1139 my $oy = $self->{vp}{view_y};
1140
1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1148 };
1149}
1150
1057sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1059 1153
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1156
1064 1 1157 1
1065} 1158}
1066 1159
1067sub update_slider { 1160sub invoke_button_down {
1068 my ($self) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1069 1162
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1163 if ($ev->{button} == 2) {
1071} 1164 $self->start_dragging ($ev);
1165 return 1;
1166 }
1072 1167
1073sub update { 1168 0
1074 my ($self) = @_; 1169}
1075 1170
1076 $self->SUPER::update; 1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1077 1173
1078 $self->update_slider; 1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1079} 1190}
1080 1191
1081sub invoke_size_allocate { 1192sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1083 1194
1084 $self->update_slider; 1195 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1197}
1088 1198
1089############################################################################# 1199#############################################################################
1090 1200
1091package CFPlus::UI::Frame; 1201package dc::UI::Frame;
1092 1202
1093our @ISA = CFPlus::UI::Bin::; 1203our @ISA = dc::UI::Bin::;
1094 1204
1095use CFPlus::OpenGL; 1205use dc::OpenGL;
1096 1206
1097sub new { 1207sub new {
1098 my $class = shift; 1208 my $class = shift;
1099 1209
1100 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1110 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1111 1221
1112 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1124 } 1227 }
1125 1228
1126 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1127} 1230}
1128 1231
1129############################################################################# 1232#############################################################################
1130 1233
1131package CFPlus::UI::FancyFrame; 1234package dc::UI::FancyFrame;
1132 1235
1133our @ISA = CFPlus::UI::Bin::; 1236our @ISA = dc::UI::Bin::;
1134 1237
1135use CFPlus::OpenGL; 1238use dc::OpenGL;
1239
1240sub new {
1241 my ($class, %arg) = @_;
1242
1243 if ((exists $arg{label}) && !ref $arg{label}) {
1244 $arg{label} = new dc::UI::Label
1245 align => 1,
1246 valign => 0,
1247 text => $arg{label},
1248 fontsize => ($arg{border} || 0.8) * 0.75;
1249 }
1250
1251 my $self = $class->SUPER::new (
1252 # label => "",
1253 fg => [0.6, 0.3, 0.1],
1254 border => 0.8,
1255 style => 'single',
1256 %arg,
1257 );
1258
1259 $self
1260}
1261
1262sub add {
1263 my ($self, @widgets) = @_;
1264
1265 $self->SUPER::add (@widgets);
1266 $self->dc::UI::Container::add ($self->{label}) if $self->{label};
1267}
1268
1269sub border {
1270 int $_[0]{border} * $::FONTSIZE
1271}
1272
1273sub size_request {
1274 my ($self) = @_;
1275
1276 ($self->{label_w}, undef) = $self->{label}->size_request
1277 if $self->{label};
1278
1279 my ($w, $h) = $self->SUPER::size_request;
1280
1281 (
1282 $w + $self->border * 2,
1283 $h + $self->border * 2,
1284 )
1285}
1286
1287sub invoke_size_allocate {
1288 my ($self, $w, $h) = @_;
1289
1290 my $border = $self->border;
1291
1292 $w -= List::Util::max 0, $border * 2;
1293 $h -= List::Util::max 0, $border * 2;
1294
1295 if (my $label = $self->{label}) {
1296 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1297 $label->{h} = List::Util::min $h, $border;
1298 $label->invoke_size_allocate ($label->{w}, $label->{h});
1299 }
1300
1301 $self->child->configure ($border, $border, $w, $h);
1302
1303 1
1304}
1305
1306sub _draw {
1307 my ($self) = @_;
1308
1309 my $child = $self->{children}[0];
1310
1311 my $border = $self->border;
1312 my ($w, $h) = ($self->{w}, $self->{h});
1313
1314 $child->draw;
1315
1316 glColor @{$self->{fg}};
1317 glBegin GL_LINE_STRIP;
1318 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1319 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1321 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1322 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1324 glEnd;
1325
1326 if ($self->{label}) {
1327 glTranslate $border * 2, 0;
1328 $self->{label}->_draw;
1329 }
1330}
1331
1332#############################################################################
1333
1334package dc::UI::Toplevel;
1335
1336our @ISA = dc::UI::Bin::;
1337
1338use dc::OpenGL;
1136 1339
1137my $bg = 1340my $bg =
1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1139 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1140 1343
1141my @border = 1344my @border =
1142 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1143 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1347
1348my @icon =
1349 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1350 qw(x1_move.png x1_resize.png);
1144 1351
1145sub new { 1352sub new {
1146 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1147 1354
1148 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
… …
1153 min_w => 64, 1360 min_w => 64,
1154 min_h => 32, 1361 min_h => 32,
1155 %arg, 1362 %arg,
1156 ); 1363 );
1157 1364
1158 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new dc::UI::Label
1159 align => 0, 1366 align => 0,
1160 valign => 1, 1367 valign => 1,
1161 text => $self->{title}, 1368 text => $self->{title},
1162 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1163 if exists $self->{title}; 1370 if exists $self->{title};
1164 1371
1165 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1166 $self->{close_button} = 1373 $self->{close_button} =
1167 new CFPlus::UI::ImageButton 1374 new dc::UI::ImageButton
1168 path => 'x1_close.png', 1375 path => 'x1_close.png',
1169 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1170 1377
1171 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->dc::UI::Container::add ($self->{close_button});
1172 } 1379 }
1173 1380
1174 $self 1381 $self
1175} 1382}
1176 1383
1177sub add { 1384sub add {
1178 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1179 1386
1180 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1181 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1388 $self->dc::UI::Container::add ($self->{close_button}) if $self->{close_button};
1182 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1389 $self->dc::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1183} 1390}
1184 1391
1185sub border { 1392sub border {
1186 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1394}
1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1187} 1403}
1188 1404
1189sub size_request { 1405sub size_request {
1190 my ($self) = @_; 1406 my ($self) = @_;
1191 1407
… …
1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1318 1534
1319 my $border = $self->border; 1535 my $border = $self->border;
1320 1536
1321 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1322 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1325 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1326 1556
1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1328 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1329 1559
1330 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1349 if $self->{close_button}; 1579 if $self->{close_button};
1350} 1580}
1351 1581
1352############################################################################# 1582#############################################################################
1353 1583
1354package CFPlus::UI::Table; 1584package dc::UI::Table;
1355 1585
1356our @ISA = CFPlus::UI::Base::; 1586our @ISA = dc::UI::Container::;
1357 1587
1358use List::Util qw(max sum); 1588use List::Util qw(max sum);
1359 1589
1360use CFPlus::OpenGL; 1590use dc::OpenGL;
1361 1591
1362sub new { 1592sub new {
1363 my $class = shift; 1593 my $class = shift;
1364 1594
1365 $class->SUPER::new ( 1595 $class->SUPER::new (
1366 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1367 @_, 1598 @_,
1368 ) 1599 )
1369} 1600}
1370 1601
1371sub children {
1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1373}
1374
1375sub add { 1602sub add {
1603 my ($self, @widgets) = @_;
1604
1605 for my $child (@widgets) {
1606 $child->{c_rowspan} ||= 1;
1607 $child->{c_colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1611}
1612
1613sub add_at {
1376 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1377 1617
1378 while (@_) { 1618 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1380 $child->set_parent ($self);
1381 $self->{children}[$y][$x] = $child;
1382 }
1383 1620
1384 $self->{force_realloc} = 1; 1621 $child->{c_row} = $row;
1385 $self->{force_size_alloc} = 1; 1622 $child->{c_col} = $col;
1386 $self->realloc;
1387}
1388 1623
1389sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1390 my ($self, $child) = @_; 1631 my ($self) = @_;
1391 1632
1392 # TODO: not yet implemented 1633 my (@w, @h);
1393}
1394
1395# TODO: move to container class maybe? send children a signal on removal?
1396sub clear {
1397 my ($self) = @_;
1398 1634
1399 my @children = $self->children; 1635 my @children = $self->children;
1400 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1401 1646 }
1402 for (@children) {
1403 delete $_->{parent};
1404 $_->hide;
1405 }
1406 1647
1407 $self->realloc; 1648 # second pass, rows
1408} 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1409
1410sub get_wh {
1411 my ($self) = @_;
1412
1413 my (@w, @h);
1414
1415 for my $y (0 .. $#{$self->{children}}) {
1416 my $row = $self->{children}[$y]
1417 or next;
1418
1419 for my $x (0 .. $#$row) {
1420 my $widget = $row->[$x]
1421 or next;
1422 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1423 1651
1424 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1425 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1426 } 1656 }
1427 } 1657 }
1428 1658
1429 (\@w, \@h) 1659 (\@w, \@h)
1430} 1660}
… …
1446 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1447 1677
1448 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1450 1680
1451 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1452 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1455 1685
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1687
1460 CFPlus::UI::harmonize $ws; 1688 dc::UI::harmonize $ws;
1689
1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1;
1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695
1461 CFPlus::UI::harmonize $hs; 1696 dc::UI::harmonize $hs;
1462 1697
1463 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1464 1700
1465 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1466 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1467 or next;
1468 1703
1469 my $x = 0; 1704 $widget->configure (
1470 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1471 1707 );
1472 for my $c (0 .. $#$row) { 1708 }
1473 my $col_w = $ws->[$c];
1474 1709
1475 if (my $widget = $row->[$c]) { 1710 1
1476 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1477 }
1478 1712
1479 $x += $col_w; 1713#############################################################################
1714
1715package dc::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = dc::UI::Container::;
1720
1721sub _scale($$$) {
1722 my ($rel, $val, $max) = @_;
1723
1724 $rel ? $val * $max : $val
1725}
1726
1727sub size_request {
1728 my ($self) = @_;
1729
1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1731
1732 # determine overall size by querying abs widgets
1733 for my $child ($self->visible_children) {
1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1737
1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1480 } 1740 }
1741 }
1481 1742
1482 $y += $row_h; 1743 my $W = $x2 - $x1;
1744 my $H = $y2 - $y1;
1745
1746 # now layout remaining widgets
1747 for my $child ($self->visible_children) {
1748 if ($child->{c_rel}) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1754 }
1755 }
1756
1757 my $W = $x2 - $x1;
1758 my $H = $y2 - $y1;
1759
1760 ($W, $H)
1761}
1762
1763sub invoke_size_allocate {
1764 my ($self, $W, $H) = @_;
1765
1766 for my $child ($self->visible_children) {
1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1769
1770 $x += $child->{c_halign} * $child->{req_w};
1771 $y += $child->{c_valign} * $child->{req_h};
1772
1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1483 } 1774 }
1484 1775
1485 1 1776 1
1486} 1777}
1487 1778
1488sub find_widget {
1489 my ($self, $x, $y) = @_;
1490
1491 $x -= $self->{x};
1492 $y -= $self->{y};
1493
1494 my $res;
1495
1496 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1497 $res = $_->find_widget ($x, $y)
1498 and return $res;
1499 }
1500
1501 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1502}
1503
1504sub _draw {
1505 my ($self) = @_;
1506
1507 for (grep $_, @{$self->{children}}) {
1508 $_->draw for grep $_, @$_;
1509 }
1510}
1511
1512############################################################################# 1779#############################################################################
1513 1780
1514package CFPlus::UI::Box; 1781package dc::UI::Box;
1515 1782
1516our @ISA = CFPlus::UI::Container::; 1783our @ISA = dc::UI::Container::;
1517 1784
1518sub size_request { 1785sub size_request {
1519 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1520 1789
1521 $self->{vertical} 1790 $self->{vertical}
1522 ? ( 1791 ? (
1523 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1524 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1525 ) 1794 )
1526 : ( 1795 : (
1527 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1528 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1529 ) 1798 )
1530} 1799}
1531 1800
1532sub invoke_size_allocate { 1801sub invoke_size_allocate {
1533 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1554 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1555 for 0 .. $#children; 1824 for 0 .. $#children;
1556 } 1825 }
1557 } 1826 }
1558 1827
1559 CFPlus::UI::harmonize \@req; 1828 dc::UI::harmonize \@req;
1560 1829
1561 my $pos = 0; 1830 my $pos = 0;
1562 for (0 .. $#children) { 1831 for (0 .. $#children) {
1563 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1564 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1569 1 1838 1
1570} 1839}
1571 1840
1572############################################################################# 1841#############################################################################
1573 1842
1574package CFPlus::UI::HBox; 1843package dc::UI::HBox;
1575 1844
1576our @ISA = CFPlus::UI::Box::; 1845our @ISA = dc::UI::Box::;
1577 1846
1578sub new { 1847sub new {
1579 my $class = shift; 1848 my $class = shift;
1580 1849
1581 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1584 ) 1853 )
1585} 1854}
1586 1855
1587############################################################################# 1856#############################################################################
1588 1857
1589package CFPlus::UI::VBox; 1858package dc::UI::VBox;
1590 1859
1591our @ISA = CFPlus::UI::Box::; 1860our @ISA = dc::UI::Box::;
1592 1861
1593sub new { 1862sub new {
1594 my $class = shift; 1863 my $class = shift;
1595 1864
1596 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1599 ) 1868 )
1600} 1869}
1601 1870
1602############################################################################# 1871#############################################################################
1603 1872
1604package CFPlus::UI::Label; 1873package dc::UI::Label;
1605 1874
1606our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = dc::UI::DrawBG::;
1607 1876
1608use CFPlus::OpenGL; 1877use dc::OpenGL;
1609 1878
1610sub new { 1879sub new {
1611 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1612 1881
1613 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1618 #text => initial text 1887 #text => initial text
1619 #markup => initial narkup 1888 #markup => initial narkup
1620 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1621 #style => 0, # render flags 1890 #style => 0, # render flags
1622 ellipsise => 3, # end 1891 ellipsise => 3, # end
1623 layout => (new CFPlus::Layout), 1892 layout => (new dc::Layout),
1624 fontsize => 1, 1893 fontsize => 1,
1625 align => -1, 1894 align => -1,
1626 valign => -1, 1895 valign => -1,
1627 padding_x => 2, 1896 padding_x => 2,
1628 padding_y => 2, 1897 padding_y => 2,
1629 can_events => 0, 1898 can_events => 0,
1630 %arg 1899 %arg
1631 ); 1900 );
1632 1901
1633 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1634 my $layout = new CFPlus::Layout; 1903 my $layout = new dc::Layout;
1635 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1636 $self->{template} = $layout; 1905 $self->{template} = $layout;
1637 } 1906 }
1638 1907
1639 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1657 1926
1658 delete $self->{ox}; 1927 delete $self->{ox};
1659 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1660} 1929}
1661 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1662sub set_text { 1937sub set_text {
1663 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1664 1939
1665 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1666 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
1689 1964
1690sub size_request { 1965sub size_request {
1691 my ($self) = @_; 1966 my ($self) = @_;
1692 1967
1693 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1694 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1695 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1696 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1699 1976
1700 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
1772 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
1773 2050
1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1777 }; 2056 };
1778 2057
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = dc::OpenGL::glGenList;
1781 2060# dc::OpenGL::glNewList $self->{list};
1782 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062# dc::OpenGL::glEndList;
2063# }
2064#
2065# dc::OpenGL::glCallList $self->{list};
2066
2067 $self->{layout}->draw;
1783} 2068}
2069
2070#sub destroy {
2071# my ($self) = @_;
2072#
2073# dc::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074#
2075# $self->SUPER::destroy;
2076#}
1784 2077
1785############################################################################# 2078#############################################################################
1786 2079
1787package CFPlus::UI::EntryBase; 2080package dc::UI::EntryBase;
1788 2081
1789our @ISA = CFPlus::UI::Label::; 2082our @ISA = dc::UI::Label::;
1790 2083
1791use CFPlus::OpenGL; 2084use dc::OpenGL;
1792 2085
1793sub new { 2086sub new {
1794 my $class = shift; 2087 my $class = shift;
1795 2088
1796 $class->SUPER::new ( 2089 $class->SUPER::new (
1797 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
1798 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
1799 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
1800 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
1801 can_hover => 1, 2096 can_hover => 1,
1802 can_focus => 1, 2097 can_focus => 1,
1803 valign => 0, 2098 valign => 0,
1804 can_events => 1, 2099 can_events => 1,
2100 ellipsise => 0,
1805 #text => ... 2101 #text => ...
1806 #hidden => "*", 2102 #hidden => "*",
1807 @_ 2103 @_
1808 ) 2104 )
1809} 2105}
… …
1854 my $sym = $ev->{sym}; 2150 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2151 my $uni = $ev->{unicode};
1856 2152
1857 my $text = $self->get_text; 2153 my $text = $self->get_text;
1858 2154
2155 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2156
1859 if ($uni == 8) { 2157 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2159 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2160 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2161 } elsif ($sym == dc::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2162 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2163 } elsif ($sym == dc::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2164 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2165 } elsif ($sym == dc::SDLK_HOME) {
2166 # what a hack
2167 $self->{cursor} =
2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2169 ? length $1
2170 : 0;
2171 } elsif ($sym == dc::SDLK_END) {
2172 # uh, again
2173 $self->{cursor} =
2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2175 ? $self->{cursor} + length $1
2176 : length $self->{text};
2177 } elsif ($uni == 21) { # ctrl-u
2178 $text = "";
1868 $self->{cursor} = 0; 2179 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2180 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2181 $self->emit ('escape');
1873 } elsif ($uni) { 2182 } elsif ($uni == 0x0d) {
2183 substr $text, $self->{cursor}++, 0, "\012";
2184 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2185 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2186 } else {
1876 return 0; 2187 return 0;
1877 } 2188 }
1878 2189
1879 $self->_set_text ($text); 2190 $self->_set_text ($text);
1880 2191
1881 $self->realloc; 2192 $self->realloc;
2193 $self->update;
1882 2194
1883 1 2195 1
1884} 2196}
1885 2197
1886sub invoke_focus_in { 2198sub invoke_focus_in {
… …
1928 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
1929 } 2241 }
1930 2242
1931 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1933 glBegin GL_QUADS;
1934 glVertex 0 , 0;
1935 glVertex 0 , $self->{h};
1936 glVertex $self->{w}, $self->{h}; 2245 glRect 0, 0, $self->{w}, $self->{h};
1937 glVertex $self->{w}, 0;
1938 glEnd;
1939 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
1940 2247
1941 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
1942 2249
1943 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
… …
1945 2252
1946 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
1947 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
1948 utf8::encode $text; 2255 utf8::encode $text;
1949 2256
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1951 } 2258 }
1952 2259
2260 glColor_premultiply @{$self->{active_fg}};
1953 glBegin GL_LINES; 2261 glBegin GL_LINES;
1954 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1956 glEnd; 2264 glEnd;
1957 }
1958}
1959 2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2269 glLineWidth 1;
2270
2271 } else {
2272 glColor @{$self->{outline}};
2273 glBegin GL_LINE_STRIP;
2274 glVertex .5, $self->{h} * .5;
2275 glVertex .5, $self->{h} - 2.5;
2276 glVertex $self->{w} - .5, $self->{h} - 2.5;
2277 glVertex $self->{w} - .5, $self->{h} * .5;
2278 glEnd;
2279 }
2280}
2281
2282#############################################################################
2283
1960package CFPlus::UI::Entry; 2284package dc::UI::Entry;
1961 2285
1962our @ISA = CFPlus::UI::EntryBase::; 2286our @ISA = dc::UI::EntryBase::;
1963 2287
1964use CFPlus::OpenGL; 2288use dc::OpenGL;
1965 2289
1966sub invoke_key_down { 2290sub invoke_key_down {
1967 my ($self, $ev) = @_; 2291 my ($self, $ev) = @_;
1968 2292
1969 my $sym = $ev->{sym}; 2293 my $sym = $ev->{sym};
1970 2294
1971 if ($sym == 13) { 2295 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2296 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2297 my $txt = $self->get_text;
1974 2298
1975 $self->{history_pointer} = -1; 2299 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2300 $self->{history_saveback} = '';
1977 $self->emit (activate => $txt); 2301 $self->emit (activate => $txt);
1978 $self->update; 2302 $self->update;
1979 2303
1980 } elsif ($sym == CFPlus::SDLK_UP) { 2304 } elsif ($sym == dc::SDLK_UP) {
1981 if ($self->{history_pointer} < 0) { 2305 if ($self->{history_pointer} < 0) {
1982 $self->{history_saveback} = $self->get_text; 2306 $self->{history_saveback} = $self->get_text;
1983 } 2307 }
1984 if (@{$self->{history} || []} > 0) { 2308 if (@{$self->{history} || []} > 0) {
1985 $self->{history_pointer}++; 2309 $self->{history_pointer}++;
… …
1987 $self->{history_pointer} = @{$self->{history} || []} - 1; 2311 $self->{history_pointer} = @{$self->{history} || []} - 1;
1988 } 2312 }
1989 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1990 } 2314 }
1991 2315
1992 } elsif ($sym == CFPlus::SDLK_DOWN) { 2316 } elsif ($sym == dc::SDLK_DOWN) {
1993 $self->{history_pointer}--; 2317 $self->{history_pointer}--;
1994 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1995 2319
1996 if ($self->{history_pointer} >= 0) { 2320 if ($self->{history_pointer} >= 0) {
1997 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2321 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2006 1 2330 1
2007} 2331}
2008 2332
2009############################################################################# 2333#############################################################################
2010 2334
2335package dc::UI::TextEdit;
2336
2337our @ISA = dc::UI::EntryBase::;
2338
2339use dc::OpenGL;
2340
2341sub move_cursor_ver {
2342 my ($self, $dy) = @_;
2343
2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2345
2346 $y += $dy;
2347
2348 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2349 $self->{cursor} = $index;
2350 delete $self->{cur_h};
2351 $self->update;
2352 return;
2353 }
2354}
2355
2356sub invoke_key_down {
2357 my ($self, $ev) = @_;
2358
2359 my $sym = $ev->{sym};
2360
2361 if ($sym == dc::SDLK_UP) {
2362 $self->move_cursor_ver (-1);
2363 } elsif ($sym == dc::SDLK_DOWN) {
2364 $self->move_cursor_ver (+1);
2365 } else {
2366 return $self->SUPER::invoke_key_down ($ev)
2367 }
2368
2369 1
2370}
2371
2372#############################################################################
2373
2011package CFPlus::UI::Button; 2374package dc::UI::ButtonBin;
2012 2375
2013our @ISA = CFPlus::UI::Label::; 2376our @ISA = dc::UI::Bin::;
2014 2377
2015use CFPlus::OpenGL; 2378use dc::OpenGL;
2016 2379
2017my @tex = 2380my @tex =
2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2381 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2019 qw(b1_button_active.png); 2382 qw(b1_button_inactive.png b1_button_active.png);
2020 2383
2021sub new { 2384sub new {
2022 my $class = shift; 2385 my $class = shift;
2023 2386
2024 $class->SUPER::new ( 2387 $class->SUPER::new (
2025 padding_x => 4,
2026 padding_y => 4,
2027 fg => [1, 1, 1],
2028 active_fg => [0, 0, 1],
2029 can_hover => 1, 2388 can_hover => 1,
2030 align => 0, 2389 align => 0,
2031 valign => 0, 2390 valign => 0,
2032 can_events => 1, 2391 can_events => 1,
2033 @_ 2392 @_
… …
2045} 2404}
2046 2405
2047sub _draw { 2406sub _draw {
2048 my ($self) = @_; 2407 my ($self) = @_;
2049 2408
2050 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2051
2052 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 glColor 0, 0, 0, 1; 2411 glColor 0, 0, 0, 1;
2055 2412
2413 my $tex = $tex[$GRAB == $self];
2056 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2414 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2057 2415
2058 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
2059 2417
2060 $self->SUPER::_draw; 2418 $self->SUPER::_draw;
2061} 2419}
2062 2420
2063############################################################################# 2421#############################################################################
2064 2422
2065package CFPlus::UI::CheckBox; 2423package dc::UI::Button;
2066 2424
2067our @ISA = CFPlus::UI::DrawBG::; 2425our @ISA = dc::UI::Label::;
2426
2427use dc::OpenGL;
2068 2428
2069my @tex = 2429my @tex =
2070 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2431 qw(b1_button_inactive.png b1_button_active.png);
2432
2433sub new {
2434 my $class = shift;
2435
2436 $class->SUPER::new (
2437 padding_x => 4,
2438 padding_y => 4,
2439 fg => [1.0, 1.0, 1.0],
2440 active_fg => [0.8, 0.8, 0.8],
2441 can_hover => 1,
2442 align => 0,
2443 valign => 0,
2444 can_events => 1,
2445 @_
2446 )
2447}
2448
2449sub invoke_button_up {
2450 my ($self, $ev, $x, $y) = @_;
2451
2452 $self->emit ("activate")
2453 if $x >= 0 && $x < $self->{w}
2454 && $y >= 0 && $y < $self->{h};
2455
2456 1
2457}
2458
2459sub _draw {
2460 my ($self) = @_;
2461
2462 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2463
2464 glEnable GL_TEXTURE_2D;
2465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2466 glColor 0, 0, 0, 1;
2467
2468 my $tex = $tex[$GRAB == $self];
2469 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470
2471 glDisable GL_TEXTURE_2D;
2472
2473 $self->SUPER::_draw;
2474}
2475
2476#############################################################################
2477
2478package dc::UI::CheckBox;
2479
2480our @ISA = dc::UI::DrawBG::;
2481
2482my @tex =
2483 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2071 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2484 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2072 2485
2073use CFPlus::OpenGL; 2486use dc::OpenGL;
2074 2487
2075sub new { 2488sub new {
2076 my $class = shift; 2489 my $class = shift;
2077 2490
2078 $class->SUPER::new ( 2491 $class->SUPER::new (
… …
2118sub _draw { 2531sub _draw {
2119 my ($self) = @_; 2532 my ($self) = @_;
2120 2533
2121 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2122 2535
2123 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2124 2537
2125 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2126 2539
2127 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2540 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2128 2541
… …
2135 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2136} 2549}
2137 2550
2138############################################################################# 2551#############################################################################
2139 2552
2140package CFPlus::UI::Image; 2553package dc::UI::Image;
2141 2554
2142our @ISA = CFPlus::UI::Base::; 2555our @ISA = dc::UI::Base::;
2143 2556
2144use CFPlus::OpenGL; 2557use dc::OpenGL;
2145 2558
2146our %texture_cache; 2559our %texture_cache;
2147 2560
2148sub new { 2561sub new {
2149 my $class = shift; 2562 my $class = shift;
2150 2563
2151 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2152 can_events => 0, 2565 can_events => 0,
2566 scale => 1,
2153 @_, 2567 @_,
2154 ); 2568 );
2155 2569
2156 $self->{path} || $self->{tex} 2570 $self->{path} || $self->{tex}
2157 or Carp::croak "'path' or 'tex' attributes required"; 2571 or Carp::croak "'path' or 'tex' attributes required";
2158 2572
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2573 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2574 new_from_file dc::Texture dc::find_rcfile $self->{path}, mipmap => 1;
2161 2575
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2576 dc::weaken $texture_cache{$self->{path}};
2163 2577
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2579
2166 $self 2580 $self
2167} 2581}
2168 2582
2169sub STORABLE_freeze { 2583sub STORABLE_freeze {
2170 my ($self, $cloning) = @_; 2584 my ($self, $cloning) = @_;
2171 2585
2172 $self->{path} 2586 $self->{path}
2173 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2587 or die "cannot serialise dc::UI::Image on non-loadable images\n";
2174 2588
2175 $self->{path} 2589 $self->{path}
2176} 2590}
2177 2591
2178sub STORABLE_attach { 2592sub STORABLE_attach {
… …
2182} 2596}
2183 2597
2184sub size_request { 2598sub size_request {
2185 my ($self) = @_; 2599 my ($self) = @_;
2186 2600
2187 ($self->{tex}{w}, $self->{tex}{h}) 2601 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2188} 2602}
2189 2603
2190sub _draw { 2604sub _draw {
2191 my ($self) = @_; 2605 my ($self) = @_;
2192 2606
… …
2202 } 2616 }
2203 2617
2204 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2206 2620
2207 $tex->draw_quad (0, 0, $w, $h); 2621 $tex->draw_quad_alpha (0, 0, $w, $h);
2208 2622
2209 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2210} 2624}
2211 2625
2212############################################################################# 2626#############################################################################
2213 2627
2214package CFPlus::UI::ImageButton; 2628package dc::UI::ImageButton;
2215 2629
2216our @ISA = CFPlus::UI::Image::; 2630our @ISA = dc::UI::Image::;
2217 2631
2218use CFPlus::OpenGL; 2632use dc::OpenGL;
2219 2633
2220my %textures; 2634my %textures;
2221 2635
2222sub new { 2636sub new {
2223 my $class = shift; 2637 my $class = shift;
… …
2233 can_events => 1, 2647 can_events => 1,
2234 @_ 2648 @_
2235 ); 2649 );
2236} 2650}
2237 2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2656}
2657
2238sub invoke_button_up { 2658sub invoke_button_up {
2239 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2240 2660
2241 $self->emit ("activate") 2661 $self->emit ("activate")
2242 if $x >= 0 && $x < $self->{w} 2662 if $x >= 0 && $x < $self->{w}
… …
2245 1 2665 1
2246} 2666}
2247 2667
2248############################################################################# 2668#############################################################################
2249 2669
2250package CFPlus::UI::VGauge; 2670package dc::UI::VGauge;
2251 2671
2252our @ISA = CFPlus::UI::Base::; 2672our @ISA = dc::UI::Base::;
2253 2673
2254use List::Util qw(min max); 2674use List::Util qw(min max);
2255 2675
2256use CFPlus::OpenGL; 2676use dc::OpenGL;
2257 2677
2258my %tex = ( 2678my %tex = (
2259 food => [ 2679 food => [
2260 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2261 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2262 ], 2682 ],
2263 grace => [ 2683 grace => [
2264 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2265 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2685 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2266 ], 2686 ],
2267 hp => [ 2687 hp => [
2268 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2269 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2270 ], 2690 ],
2271 mana => [ 2691 mana => [
2272 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2273 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2693 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2274 ], 2694 ],
2275); 2695);
2276 2696
2277# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2380 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2381} 2801}
2382 2802
2383############################################################################# 2803#############################################################################
2384 2804
2805package dc::UI::Progress;
2806
2807our @ISA = dc::UI::Label::;
2808
2809use dc::OpenGL;
2810
2811sub new {
2812 my ($class, %arg) = @_;
2813
2814 my $self = $class->SUPER::new (
2815 fg => [1, 1, 1],
2816 bg => [0, 0, 1, 0.2],
2817 bar => [0.7, 0.5, 0.1, 0.8],
2818 outline => [0.4, 0.3, 0],
2819 fontsize => 0.9,
2820 valign => 0,
2821 align => 0,
2822 can_events => 1,
2823 ellipsise => 1,
2824 label => "%d%%",
2825 %arg,
2826 );
2827
2828 $self->set_value ($arg{value} || -1);
2829
2830 $self
2831}
2832
2833sub set_label {
2834 my ($self, $label) = @_;
2835
2836 return if $self->{label} eq $label;
2837 $self->{label} = $label;
2838
2839 $self->dc::UI::Progress::set_value (0 + delete $self->{value});
2840}
2841
2842sub set_value {
2843 my ($self, $value) = @_;
2844
2845 if ($self->{value} ne $value) {
2846 $self->{value} = $value;
2847
2848 if ($value < 0) {
2849 $self->set_text ("-");
2850 } else {
2851 $self->set_text (sprintf $self->{label}, $value * 100);
2852 }
2853
2854 $self->update;
2855 }
2856}
2857
2858sub _draw {
2859 my ($self) = @_;
2860
2861 glEnable GL_BLEND;
2862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2863
2864 if ($self->{value} >= 0) {
2865 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2866
2867 glColor_premultiply @{$self->{bar}};
2868 glRect 2, 2, $s, $self->{h} - 2;
2869 glColor_premultiply @{$self->{bg}};
2870 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2871 }
2872
2873 glColor_premultiply @{$self->{outline}};
2874 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2875
2876 glDisable GL_BLEND;
2877
2878 {
2879 local $self->{bg}; # do not draw background
2880 $self->SUPER::_draw;
2881 }
2882}
2883
2884#############################################################################
2885
2886package dc::UI::ExperienceProgress;
2887
2888our @ISA = dc::UI::Progress::;
2889
2890sub new {
2891 my ($class, %arg) = @_;
2892
2893 my $self = $class->SUPER::new (
2894 tooltip => sub {
2895 my ($self) = @_;
2896
2897 sprintf "level %d\n%s points\n%s next level\n%s to go",
2898 $self->{lvl},
2899 ::formsep ($self->{exp}),
2900 ::formsep ($self->{nxt}),
2901 ::formsep ($self->{nxt} - $self->{exp}),
2902 },
2903 %arg
2904 );
2905
2906 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2907 if $::CONN;
2908
2909 $self
2910}
2911
2912sub DESTROY {
2913 my ($self) = @_;
2914
2915 delete $::CONN->{on_exp_update}{$self+0}
2916 if $::CONN;
2917
2918 $self->SUPER::DESTROY;
2919}
2920
2921sub set_value {
2922 my ($self, $lvl, $exp) = @_;
2923
2924 $self->{lvl} = $lvl;
2925 $self->{exp} = $exp;
2926
2927 my $v = -1;
2928
2929 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2930 my $l0 = $table->[$lvl - 1];
2931 my $l1 = $table->[$lvl];
2932
2933 $self->{nxt} = $l1;
2934
2935 $v = ($exp - $l0) / ($l1 - $l0);
2936 }
2937
2938 $self->SUPER::set_value ($v);
2939}
2940
2941#############################################################################
2942
2385package CFPlus::UI::Gauge; 2943package dc::UI::Gauge;
2386 2944
2387our @ISA = CFPlus::UI::VBox::; 2945our @ISA = dc::UI::VBox::;
2388 2946
2389sub new { 2947sub new {
2390 my ($class, %arg) = @_; 2948 my ($class, %arg) = @_;
2391 2949
2392 my $self = $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
… …
2394 can_hover => 1, 2952 can_hover => 1,
2395 can_events => 1, 2953 can_events => 1,
2396 %arg, 2954 %arg,
2397 ); 2955 );
2398 2956
2399 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2957 $self->add ($self->{value} = new dc::UI::Label valign => +1, align => 0, template => "999");
2400 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2958 $self->add ($self->{gauge} = new dc::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2401 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2959 $self->add ($self->{max} = new dc::UI::Label valign => -1, align => 0, template => "999");
2402 2960
2403 $self 2961 $self
2404} 2962}
2405 2963
2406sub set_fontsize { 2964sub set_fontsize {
… …
2427 $self->{value}->set_text ($val); 2985 $self->{value}->set_text ($val);
2428} 2986}
2429 2987
2430############################################################################# 2988#############################################################################
2431 2989
2432package CFPlus::UI::Slider; 2990package dc::UI::Slider;
2433 2991
2434use strict; 2992use strict;
2435 2993
2436use CFPlus::OpenGL; 2994use dc::OpenGL;
2437 2995
2438our @ISA = CFPlus::UI::DrawBG::; 2996our @ISA = dc::UI::DrawBG::;
2439 2997
2440my @tex = 2998my @tex =
2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 2999 map { new_from_file dc::Texture dc::find_rcfile $_ }
2442 qw(s1_slider.png s1_slider_bg.png); 3000 qw(s1_slider.png s1_slider_bg.png);
2443 3001
2444sub new { 3002sub new {
2445 my $class = shift; 3003 my $class = shift;
2446 3004
… …
2514 3072
2515 $self->SUPER::invoke_button_down ($ev, $x, $y); 3073 $self->SUPER::invoke_button_down ($ev, $x, $y);
2516 3074
2517 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3075 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2518 3076
2519 $self->invoke_mouse_motion ($ev, $x, $y) 3077 $self->invoke_mouse_motion ($ev, $x, $y);
3078
3079 1
2520} 3080}
2521 3081
2522sub invoke_mouse_motion { 3082sub invoke_mouse_motion {
2523 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2524 3084
… …
2540sub invoke_mouse_wheel { 3100sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2542 3102
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 3104
3105 my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
3106
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 3108
2547 ! ! $delta 3109 1
2548} 3110}
2549 3111
2550sub update { 3112sub update {
2551 my ($self) = @_; 3113 my ($self) = @_;
2552 3114
… …
2601 glDisable GL_TEXTURE_2D; 3163 glDisable GL_TEXTURE_2D;
2602} 3164}
2603 3165
2604############################################################################# 3166#############################################################################
2605 3167
2606package CFPlus::UI::ValSlider; 3168package dc::UI::ValSlider;
2607 3169
2608our @ISA = CFPlus::UI::HBox::; 3170our @ISA = dc::UI::HBox::;
2609 3171
2610sub new { 3172sub new {
2611 my ($class, %arg) = @_; 3173 my ($class, %arg) = @_;
2612 3174
2613 my $range = delete $arg{range}; 3175 my $range = delete $arg{range};
2614 3176
2615 my $self = $class->SUPER::new ( 3177 my $self = $class->SUPER::new (
2616 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3178 slider => (new dc::UI::Slider expand => 1, range => $range),
2617 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3179 entry => (new dc::UI::Label text => "", template => delete $arg{template}),
2618 to_value => sub { shift }, 3180 to_value => sub { shift },
2619 from_value => sub { shift }, 3181 from_value => sub { shift },
2620 %arg, 3182 %arg,
2621 ); 3183 );
2622 3184
… …
2642sub set_range { shift->{slider}->set_range (@_) } 3204sub set_range { shift->{slider}->set_range (@_) }
2643sub set_value { shift->{slider}->set_value (@_) } 3205sub set_value { shift->{slider}->set_value (@_) }
2644 3206
2645############################################################################# 3207#############################################################################
2646 3208
2647package CFPlus::UI::TextScroller; 3209package dc::UI::TextScroller;
2648 3210
2649our @ISA = CFPlus::UI::HBox::; 3211our @ISA = dc::UI::HBox::;
2650 3212
2651use CFPlus::OpenGL; 3213use dc::OpenGL;
2652 3214
2653sub new { 3215sub new {
2654 my $class = shift; 3216 my $class = shift;
2655 3217
2656 my $self = $class->SUPER::new ( 3218 my $self = $class->SUPER::new (
… …
2658 can_events => 1, 3220 can_events => 1,
2659 indent => 0, 3221 indent => 0,
2660 #font => default_font 3222 #font => default_font
2661 @_, 3223 @_,
2662 3224
2663 layout => (new CFPlus::Layout), 3225 layout => (new dc::Layout),
2664 par => [], 3226 par => [],
3227 max_par => 0,
2665 height => 0, 3228 height => 0,
2666 children => [ 3229 children => [
2667 (new CFPlus::UI::Empty expand => 1), 3230 (new dc::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 3231 (new dc::UI::Slider vertical => 1),
2669 ], 3232 ],
2670 ); 3233 );
2671 3234
2672 $self->{children}[1]->connect (changed => sub { $self->update }); 3235 $self->{children}[1]->connect (changed => sub { $self->update });
2673 3236
… …
2682} 3245}
2683 3246
2684sub size_request { 3247sub size_request {
2685 my ($self) = @_; 3248 my ($self) = @_;
2686 3249
2687 my ($empty, $slider) = @{ $self->{children} }; 3250 my ($empty, $slider) = $self->visible_children;
2688 3251
2689 local $self->{children} = [$empty, $slider]; 3252 local $self->{children} = [$empty, $slider];
2690 $self->SUPER::size_request 3253 $self->SUPER::size_request
2691} 3254}
2692 3255
… …
2748sub set_offset { 3311sub set_offset {
2749 my ($self, $offset) = @_; 3312 my ($self, $offset) = @_;
2750 3313
2751 # todo: base offset on lines or so, not on pixels 3314 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset); 3315 $self->{children}[1]->set_value ($offset);
3316}
3317
3318sub current_paragraph {
3319 my ($self) = @_;
3320
3321 $self->{top_paragraph} - 1
3322}
3323
3324sub scroll_to {
3325 my ($self, $para) = @_;
3326
3327 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3328
3329 $self->{scroll_to} = $para;
3330 $self->update;
2753} 3331}
2754 3332
2755sub clear { 3333sub clear {
2756 my ($self) = @_; 3334 my ($self) = @_;
2757 3335
… …
2779 3357
2780 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3358 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2781 push @{$self->{par}}, $para; 3359 push @{$self->{par}}, $para;
2782 } 3360 }
2783 3361
3362 if (my $max = $self->{max_par}) {
3363 shift @{$self->{par}} while @{$self->{par}} > $max;
3364 }
3365
2784 $self->{need_reflow}++; 3366 $self->{need_reflow}++;
2785 $self->update; 3367 $self->update;
2786} 3368}
2787 3369
2788sub scroll_to_bottom { 3370sub scroll_to_bottom {
2789 my ($self) = @_; 3371 my ($self) = @_;
2790 3372
2791 $self->{scroll_to_bottom} = 1; 3373 $self->{scroll_to} = $#{$self->{par}};
2792 $self->update; 3374 $self->update;
2793} 3375}
2794 3376
3377sub force_uptodate {
3378 my ($self) = @_;
3379
3380 if (delete $self->{need_reflow}) {
3381 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3382
3383 my $height = 0;
3384
3385 for my $para (@{$self->{par}}) {
3386 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3387 my $layout = $self->get_layout ($para);
3388 my ($w, $h) = $layout->size;
3389
3390 $para->{w} = $w + $para->{indent};
3391 $para->{h} = $h;
3392 $para->{wrapped} = $layout->has_wrapped;
3393 }
3394
3395 $para->{y} = $height;
3396 $height += $para->{h};
3397 }
3398
3399 $self->{height} = $height;
3400 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3401
3402 delete $self->{texture};
3403 }
3404
3405 if (my $paridx = delete $self->{scroll_to}) {
3406 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3407 }
3408}
3409
2795sub update { 3410sub update {
2796 my ($self) = @_; 3411 my ($self) = @_;
2797 3412
2798 $self->SUPER::update; 3413 $self->SUPER::update;
2799 3414
2800 return unless $self->{h} > 0; 3415 return unless $self->{h} > 0;
2801 3416
2802 delete $self->{texture}; 3417 delete $self->{texture};
2803 3418
2804 $ROOT->on_post_alloc ($self => sub { 3419 $ROOT->on_post_alloc ($self => sub {
3420 $self->force_uptodate;
3421
2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2806 3423
2807 if (delete $self->{need_reflow}) {
2808 my $height = 0;
2809
2810 for my $para (@{$self->{par}}) {
2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2812 my $layout = $self->get_layout ($para);
2813 my ($w, $h) = $layout->size;
2814
2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2818 }
2819
2820 $height += $para->{h};
2821 }
2822
2823 $self->{height} = $height;
2824
2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2826
2827 delete $self->{texture};
2828 }
2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833
2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3424 $self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
2835 glClearColor 0, 0, 0, 0; 3425 glClearColor 0, 0, 0, 0;
2836 glClear GL_COLOR_BUFFER_BIT; 3426 glClear GL_COLOR_BUFFER_BIT;
2837 3427
3428 package dc::UI::Base;
3429 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3430 (0, 0, $self->{w}, $self->{h});
3431
3432 my $top = int $self->{children}[1]{range}[0];
3433
3434 my $paridx = 0;
3435 my $top_paragraph;
2838 my $top = int $self->{children}[1]{range}[0]; 3436 my $top = int $self->{children}[1]{range}[0];
2839 3437
2840 my $y0 = $top; 3438 my $y0 = $top;
2841 my $y1 = $top + $H; 3439 my $y1 = $top + $H;
2842 3440
2843 my $y = 0;
2844
2845 for my $para (@{$self->{par}}) { 3441 for my $para (@{$self->{par}}) {
2846 my $h = $para->{h}; 3442 my $h = $para->{h};
3443 my $y = $para->{y};
2847 3444
2848 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
2849
2850 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
2851 3447
2852 $layout->render ($para->{indent}, $y - $y0); 3448 $layout->render ($para->{indent}, $y - $y0);
3449 $layout->draw;
2853 3450
2854 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
2855 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
2856 3453
2857 for (@w) { 3454 for (@w) {
… …
2863 $_->draw; 3460 $_->draw;
2864 } 3461 }
2865 } 3462 }
2866 } 3463 }
2867 3464
2868 $y += $h; 3465 $paridx++;
3466 $top_paragraph ||= $paridx if $y >= $top;
2869 } 3467 }
3468
3469 $self->{top_paragraph} = $top_paragraph;
2870 }; 3470 };
2871 }); 3471 });
2872} 3472}
2873 3473
2874sub reconfigure { 3474sub reconfigure {
… …
2892 $self->{children}[1]->draw; 3492 $self->{children}[1]->draw;
2893} 3493}
2894 3494
2895############################################################################# 3495#############################################################################
2896 3496
2897package CFPlus::UI::Animator; 3497package dc::UI::Animator;
2898 3498
2899use CFPlus::OpenGL; 3499use dc::OpenGL;
2900 3500
2901our @ISA = CFPlus::UI::Bin::; 3501our @ISA = dc::UI::Bin::;
2902 3502
2903sub moveto { 3503sub moveto {
2904 my ($self, $x, $y) = @_; 3504 my ($self, $x, $y) = @_;
2905 3505
2906 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2934 glPopMatrix; 3534 glPopMatrix;
2935} 3535}
2936 3536
2937############################################################################# 3537#############################################################################
2938 3538
2939package CFPlus::UI::Flopper; 3539package dc::UI::Flopper;
2940 3540
2941our @ISA = CFPlus::UI::Button::; 3541our @ISA = dc::UI::Button::;
2942 3542
2943sub new { 3543sub new {
2944 my $class = shift; 3544 my $class = shift;
2945 3545
2946 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
… …
2958 $self->{other}->toggle_visibility; 3558 $self->{other}->toggle_visibility;
2959} 3559}
2960 3560
2961############################################################################# 3561#############################################################################
2962 3562
2963package CFPlus::UI::Tooltip; 3563package dc::UI::Tooltip;
2964 3564
2965our @ISA = CFPlus::UI::Bin::; 3565our @ISA = dc::UI::Bin::;
2966 3566
2967use CFPlus::OpenGL; 3567use dc::OpenGL;
2968 3568
2969sub new { 3569sub new {
2970 my $class = shift; 3570 my $class = shift;
2971 3571
2972 $class->SUPER::new ( 3572 $class->SUPER::new (
… …
2976} 3576}
2977 3577
2978sub set_tooltip_from { 3578sub set_tooltip_from {
2979 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
2980 3580
2981 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2982 if $widget->{tooltip} =~ /^#(.*)$/;
2983
2984 my $tooltip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583
3584 $tip = dc::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/;
2985 3586
2986 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
2987 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
2988 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2989 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
2990 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
2991 } 3592 }
2992 3593
2993 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
2994 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
2995 3596
2996 $self->add (new CFPlus::UI::Label 3597 $self->add (new dc::UI::Label
2997 markup => $tooltip, 3598 markup => $tip,
2998 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2999 fontsize => 0.8, 3600 fontsize => 0.8,
3000 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3001 ellipsise => 0, 3602 ellipsise => 0,
3002 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3040} 3641}
3041 3642
3042sub _draw { 3643sub _draw {
3043 my ($self) = @_; 3644 my ($self) = @_;
3044 3645
3045 glTranslate 0.375, 0.375;
3046
3047 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3048 3647
3049 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3050 glBegin GL_QUADS; 3649 glRect 0, 0, $w, $h;
3051 glVertex 0 , 0;
3052 glVertex 0 , $h;
3053 glVertex $w, $h;
3054 glVertex $w, 0;
3055 glEnd;
3056 3650
3057 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3058 glBegin GL_LINE_LOOP; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3059 glVertex 0 , 0;
3060 glVertex 0 , $h;
3061 glVertex $w, $h;
3062 glVertex $w, 0;
3063 glEnd;
3064 3653
3065 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3066 3655
3067 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3068} 3657}
3069 3658
3070############################################################################# 3659#############################################################################
3071 3660
3072package CFPlus::UI::Face; 3661package dc::UI::Face;
3073 3662
3074our @ISA = CFPlus::UI::DrawBG::; 3663our @ISA = dc::UI::DrawBG::;
3075 3664
3076use CFPlus::OpenGL; 3665use dc::OpenGL;
3077 3666
3078sub new { 3667sub new {
3079 my $class = shift; 3668 my $class = shift;
3080 3669
3081 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
3671 size_w => 32,
3672 size_h => 8,
3082 aspect => 1, 3673 aspect => 1,
3083 can_events => 0, 3674 can_events => 0,
3084 @_, 3675 @_,
3085 ); 3676 );
3086 3677
3087 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3088 Scalar::Util::weaken (my $widget = $self); 3679 dc::weaken (my $widget = $self);
3089 3680
3090 $self->{timer} = Event->timer ( 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3091 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3092 hard => 1, 3683 return unless $::CONN;
3093 interval => $self->{animspeed}, 3684
3094 cb => sub { 3685 my $w = $widget
3686 or return;
3687
3095 ++$widget->{frame}; 3688 ++$w->{frame};
3689 $w->update_face;
3690
3691 # somehow, $widget can go away
3096 $widget->update; 3692 $w->update;
3097 }, 3693 $w->update_timer;
3098 ); 3694 };
3695
3696 $self->update_face;
3697 $self->update_timer;
3099 } 3698 }
3100 3699
3101 $self 3700 $self
3102} 3701}
3103 3702
3703sub update_timer {
3704 my ($self) = @_;
3705
3706 return unless $self->{timer};
3707
3708 if ($self->{visible}) {
3709 $self->{timer}->start;
3710 } else {
3711 $self->{timer}->stop;
3712 }
3713}
3714
3715sub update_face {
3716 my ($self) = @_;
3717
3718 if ($::CONN) {
3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3720 if ($anim && @$anim) {
3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3722 delete $self->{face_change_cb};
3723
3724 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3725 unless ($tex->{name} || $tex->{loading}) {
3726 $tex->upload (sub { $self->reconfigure });
3727 }
3728 }
3729 }
3730 }
3731 }
3732}
3733
3104sub size_request { 3734sub size_request {
3105 (32, 8) 3735 my ($self) = @_;
3736
3737 if ($::CONN) {
3738 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3739 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3740 if ($tex->{name}) {
3741 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3742 } elsif (!$tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746
3747 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3748 }
3749 }
3750
3751 ($self->{size_w} || 8, $self->{size_h} || 8)
3106} 3752}
3107 3753
3108sub update { 3754sub update {
3109 my ($self) = @_; 3755 my ($self) = @_;
3110 3756
3111 return unless $self->{visible}; 3757 return unless $self->{visible};
3112 3758
3113 $self->SUPER::update; 3759 $self->SUPER::update;
3114} 3760}
3115 3761
3762sub invoke_visibility_change {
3763 my ($self) = @_;
3764
3765 $self->update_timer;
3766
3767 0
3768}
3769
3116sub _draw { 3770sub _draw {
3117 my ($self) = @_; 3771 my ($self) = @_;
3118 3772
3119 return unless $::CONN;
3120
3121 $self->SUPER::_draw; 3773 $self->SUPER::_draw;
3122 3774
3123 my $face; 3775 if (my $tex = $self->{tex}) {
3124
3125 if ($self->{frame}) {
3126 my $anim = $::CONN->{anim}[$self->{anim}];
3127
3128 $face = $anim->[ $self->{frame} % @$anim ]
3129 if $anim && @$anim;
3130 }
3131
3132 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3133
3134 if ($tex) {
3135 glEnable GL_TEXTURE_2D; 3776 glEnable GL_TEXTURE_2D;
3136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3137 glColor 0, 0, 0, 1; 3778 glColor 0, 0, 0, 1;
3138 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3779 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3139 glDisable GL_TEXTURE_2D; 3780 glDisable GL_TEXTURE_2D;
… …
3141} 3782}
3142 3783
3143sub destroy { 3784sub destroy {
3144 my ($self) = @_; 3785 my ($self) = @_;
3145 3786
3146 $self->{timer}->cancel 3787 (delete $self->{timer})->cancel
3147 if $self->{timer}; 3788 if $self->{timer};
3148 3789
3149 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3150} 3791}
3151 3792
3152############################################################################# 3793#############################################################################
3153 3794
3154package CFPlus::UI::Buttonbar; 3795package dc::UI::Buttonbar;
3155 3796
3156our @ISA = CFPlus::UI::HBox::; 3797our @ISA = dc::UI::HBox::;
3157 3798
3158# TODO: should actualyl wrap buttons and other goodies. 3799# TODO: should actually wrap buttons and other goodies.
3159 3800
3160############################################################################# 3801#############################################################################
3161 3802
3162package CFPlus::UI::Menu; 3803package dc::UI::Menu;
3163 3804
3164our @ISA = CFPlus::UI::FancyFrame::; 3805our @ISA = dc::UI::Toplevel::;
3165 3806
3166use CFPlus::OpenGL; 3807use dc::OpenGL;
3167 3808
3168sub new { 3809sub new {
3169 my $class = shift; 3810 my $class = shift;
3170 3811
3171 my $self = $class->SUPER::new ( 3812 my $self = $class->SUPER::new (
3172 items => [], 3813 items => [],
3173 z => 100, 3814 z => 100,
3174 @_, 3815 @_,
3175 ); 3816 );
3176 3817
3177 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3818 $self->add ($self->{vbox} = new dc::UI::VBox);
3178 3819
3179 for my $item (@{ $self->{items} }) { 3820 for my $item (@{ $self->{items} }) {
3180 my ($widget, $cb, $tooltip) = @$item; 3821 my ($widget, $cb, $tooltip) = @$item;
3181 3822
3182 # handle various types of items, only text for now 3823 # handle various types of items, only text for now
3183 if (!ref $widget) { 3824 if (!ref $widget) {
3184 if ($widget =~ /\t/) { 3825 if ($widget =~ /\t/) {
3185 my ($left, $right) = split /\t/, $widget, 2; 3826 my ($left, $right) = split /\t/, $widget, 2;
3186 3827
3187 $widget = new CFPlus::UI::HBox 3828 $widget = new dc::UI::HBox
3188 can_hover => 1, 3829 can_hover => 1,
3189 can_events => 1, 3830 can_events => 1,
3190 tooltip => $tooltip, 3831 tooltip => $tooltip,
3191 children => [ 3832 children => [
3192 (new CFPlus::UI::Label markup => $left, expand => 1), 3833 (new dc::UI::Label markup => $left, expand => 1),
3193 (new CFPlus::UI::Label markup => $right, align => +1), 3834 (new dc::UI::Label markup => $right, align => +1),
3194 ], 3835 ],
3195 ; 3836 ;
3196 3837
3197 } else { 3838 } else {
3198 $widget = new CFPlus::UI::Label 3839 $widget = new dc::UI::Label
3199 can_hover => 1, 3840 can_hover => 1,
3200 can_events => 1, 3841 can_events => 1,
3201 markup => $widget, 3842 markup => $widget,
3202 tooltip => $tooltip; 3843 tooltip => $tooltip;
3203 } 3844 }
… …
3251 1 3892 1
3252} 3893}
3253 3894
3254############################################################################# 3895#############################################################################
3255 3896
3256package CFPlus::UI::Multiplexer; 3897package dc::UI::Multiplexer;
3257 3898
3258our @ISA = CFPlus::UI::Container::; 3899our @ISA = dc::UI::Container::;
3259 3900
3260sub new { 3901sub new {
3261 my $class = shift; 3902 my $class = shift;
3262 3903
3263 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
… …
3324 $self->{current}->draw; 3965 $self->{current}->draw;
3325} 3966}
3326 3967
3327############################################################################# 3968#############################################################################
3328 3969
3329package CFPlus::UI::Notebook; 3970package dc::UI::Notebook;
3330 3971
3972use dc::OpenGL;
3973
3331our @ISA = CFPlus::UI::VBox::; 3974our @ISA = dc::UI::VBox::;
3332 3975
3333sub new { 3976sub new {
3334 my $class = shift; 3977 my $class = shift;
3335 3978
3336 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3337 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new dc::UI::Buttonbar),
3338 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new dc::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3339 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3340 @_, 3984 @_,
3341 ); 3985 );
3342 3986
3343 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3344 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3988 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3345 3989
3990 {
3991 Scalar::Util::weaken (my $wself = $self);
3992
3993 $self->{multiplexer}->connect (c_add => sub {
3994 my ($mplex, $widgets) = @_;
3995
3996 for my $child (@$widgets) {
3997 Scalar::Util::weaken $child;
3998 $child->{c_tab_} ||= do {
3999 my $tab =
4000 (UNIVERSAL::isa $child->{c_tab}, "dc::UI::Base")
4001 ? $child->{c_tab}
4002 : new dc::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4003
4004 $tab->connect (activate => sub {
4005 $wself->set_current_page ($child);
4006 });
4007
4008 $tab
4009 };
4010
4011 $self->{buttonbar}->add ($child->{c_tab_});
4012 }
4013 });
4014
4015 $self->{multiplexer}->connect (c_remove => sub {
4016 my ($mplex, $widgets) = @_;
4017
4018 for my $child (@$widgets) {
4019 $wself->{buttonbar}->remove ($child->{c_tab_});
4020 }
4021 });
4022 }
4023
3346 $self 4024 $self
3347} 4025}
3348 4026
3349sub add { 4027sub add {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->add (@widgets)
4031}
4032
4033sub remove {
4034 my ($self, @widgets) = @_;
4035
4036 $self->{multiplexer}->remove (@widgets)
4037}
4038
4039sub pages {
4040 my ($self) = @_;
4041 $self->{multiplexer}->children
4042}
4043
4044sub add_tab {
3350 my ($self, $title, $widget, $tooltip) = @_; 4045 my ($self, $title, $widget, $tooltip) = @_;
3351 4046
3352 Scalar::Util::weaken $self; 4047 $title = [$title, $tooltip] unless ref $title;
4048 $widget->{c_tab} = $title;
3353 4049
3354 $self->{buttonbar}->add (new CFPlus::UI::Button
3355 markup => $title,
3356 tooltip => $tooltip,
3357 on_activate => sub { $self->set_current_page ($widget) },
3358 );
3359
3360 $self->{multiplexer}->add ($widget); 4050 $self->add ($widget);
3361} 4051}
3362 4052
3363sub get_current_page { 4053sub get_current_page {
3364 my ($self) = @_; 4054 my ($self) = @_;
3365 4055
… …
3371 4061
3372 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3373 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
3374} 4064}
3375 4065
4066sub _draw {
4067 my ($self) = @_;
4068
4069 $self->SUPER::_draw ();
4070
4071 if (my $cur = $self->{multiplexer}{current}) {
4072 if ($cur = $cur->{c_tab_}) {
4073 glTranslate $self->{buttonbar}{x} + $cur->{x},
4074 $self->{buttonbar}{y} + $cur->{y};
4075 glLineWidth 3;
4076 #glEnable GL_BLEND;
4077 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4078 glColor @{$self->{active_outline}};
4079 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4080 glLineWidth 1;
4081 #glDisable GL_BLEND;
4082 }
4083 }
4084}
4085
3376############################################################################# 4086#############################################################################
3377 4087
3378package CFPlus::UI::Selector; 4088package dc::UI::Selector;
3379 4089
3380use utf8; 4090use utf8;
3381 4091
3382our @ISA = CFPlus::UI::Button::; 4092our @ISA = dc::UI::Button::;
3383 4093
3384sub new { 4094sub new {
3385 my $class = shift; 4095 my $class = shift;
3386 4096
3387 my $self = $class->SUPER::new ( 4097 my $self = $class->SUPER::new (
… …
3404 my ($value, $title, $tooltip) = @$_; 4114 my ($value, $title, $tooltip) = @$_;
3405 4115
3406 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3407 } 4117 }
3408 4118
3409 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4119 dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
3410} 4120}
3411 4121
3412sub _set_value { 4122sub _set_value {
3413 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3414 4124
3415 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3416 or return; 4127 or return;
3417 4128
3418 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3419 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3420 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3421} 4132}
3422 4133
3423sub set_value { 4134sub set_value {
3424 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3425 4136
… …
3427 4138
3428 $self->_set_value ($value); 4139 $self->_set_value ($value);
3429 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
3430} 4141}
3431 4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
4148}
4149
3432############################################################################# 4150#############################################################################
3433 4151
3434package CFPlus::UI::Statusbox; 4152package dc::UI::Statusbox;
3435 4153
3436our @ISA = CFPlus::UI::VBox::; 4154our @ISA = dc::UI::VBox::;
3437 4155
3438sub new { 4156sub new {
3439 my $class = shift; 4157 my $class = shift;
3440 4158
3441 my $self = $class->SUPER::new ( 4159 my $self = $class->SUPER::new (
3442 fontsize => 0.8, 4160 fontsize => 0.8,
3443 @_, 4161 @_,
3444 ); 4162 );
3445 4163
3446 Scalar::Util::weaken (my $this = $self); 4164 dc::weaken (my $this = $self);
3447 4165
3448 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3449 4167
3450 $self 4168 $self
3451} 4169}
3452 4170
3453sub reorder { 4171sub reorder {
3454 my ($self) = @_; 4172 my ($self) = @_;
3455 my $NOW = Time::HiRes::time; 4173 my $NOW = Time::HiRes::time;
3456 4174
3457 # freeze display when hovering over any label 4175 # freeze display when hovering over any label
3458 return if $CFPlus::UI::TOOLTIP->{owner} 4176 return if $dc::UI::TOOLTIP->{owner}
3459 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4177 && grep $dc::UI::TOOLTIP->{owner} == $_->{label},
3460 values %{ $self->{item} }; 4178 values %{ $self->{item} };
3461 4179
3462 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
3463 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3464 } 4182 }
4183
4184 $self->{timer}->set (1, 1);
3465 4185
3466 my @widgets; 4186 my @widgets;
3467 4187
3468 my @items = sort { 4188 my @items = sort {
3469 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3470 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3471 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3472
3473 $self->{timer}->interval (1);
3474 4192
3475 my $count = 10 + 1; 4193 my $count = 10 + 1;
3476 for my $item (@items) { 4194 for my $item (@items) {
3477 last unless --$count; 4195 last unless --$count;
3478 4196
… …
3485 for ($short) { 4203 for ($short) {
3486 s/^\s+//; 4204 s/^\s+//;
3487 s/\s+/ /g; 4205 s/\s+/ /g;
3488 } 4206 }
3489 4207
3490 new CFPlus::UI::Label 4208 new dc::UI::Label
3491 markup => $short, 4209 markup => $short,
3492 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
3493 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
3494 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
3495 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3502 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3503 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3504 $label->update; 4222 $label->update;
3505 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3506 if $diff < 1; 4224 if $diff < 1;
3507 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3508 } else { 4226 } else {
3509 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3510 } 4228 }
3511 4229
3512 push @widgets, $label; 4230 push @widgets, $label;
… …
3574 $self->SUPER::destroy; 4292 $self->SUPER::destroy;
3575} 4293}
3576 4294
3577############################################################################# 4295#############################################################################
3578 4296
3579package CFPlus::UI::Inventory;
3580
3581our @ISA = CFPlus::UI::Table::;
3582
3583sub new {
3584 my $class = shift;
3585
3586 my $self = $class->SUPER::new (
3587 col_expand => [0, 1, 0],
3588 items => [],
3589 @_,
3590 );
3591
3592 $self->set_sort_order (undef);
3593
3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3630}
3631
3632sub set_items {
3633 my ($self, $items) = @_;
3634
3635 $self->{items} = [$items ? values %$items : ()];
3636 $self->update_items;
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::SpellList;
3642
3643our @ISA = CFPlus::UI::Table::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 binding => [],
3650 commands => [],
3651 @_,
3652 )
3653}
3654
3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3740sub add_spell {
3741 my ($self, $spell) = @_;
3742
3743 $self->{spell}->{$spell->{name}} = $spell;
3744 $self->rebuild_spell_list;
3745}
3746
3747sub remove_spell {
3748 my ($self, $spell) = @_;
3749
3750 delete $self->{spell}->{$spell->{name}};
3751 $self->rebuild_spell_list;
3752}
3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Root; 4297package dc::UI::Root;
3764 4298
3765our @ISA = CFPlus::UI::Container::; 4299our @ISA = dc::UI::Container::;
3766 4300
3767use List::Util qw(min max); 4301use List::Util qw(min max);
3768 4302
3769use CFPlus::OpenGL; 4303use dc::OpenGL;
3770 4304
3771sub new { 4305sub new {
3772 my $class = shift; 4306 my $class = shift;
3773 4307
3774 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
3775 visible => 1, 4309 visible => 1,
3776 @_, 4310 @_,
3777 ); 4311 );
3778 4312
3779 Scalar::Util::weaken ($self->{root} = $self); 4313 dc::weaken ($self->{root} = $self);
3780 4314
3781 $self 4315 $self
3782} 4316}
3783 4317
3784sub size_request { 4318sub size_request {
… …
3832} 4366}
3833 4367
3834sub update { 4368sub update {
3835 my ($self) = @_; 4369 my ($self) = @_;
3836 4370
3837 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
3838} 4372}
3839 4373
3840sub add { 4374sub add {
3841 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
3842 4376
… …
3879 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
3880 $_->() 4414 $_->()
3881 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
3882 } 4416 }
3883 4417
3884 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
3885 my %queue; 4419 my %queue;
3886 my @queue; 4420 my @queue;
3887 my $widget; 4421 my $widget;
3888 4422
3889 outer: 4423 outer:
… …
3936 } 4470 }
3937 } 4471 }
3938 4472
3939 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
3940 } 4474 }
3941 }
3942 4475
3943 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
3944 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
3945 values %$size_alloc; 4478 values %$size_alloc;
3946 4479
3947 while () { 4480 while () {
3948 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
3949 4482
3950 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3951 4484
3952 $w = 0 if $w < 0;
3953 $h = 0 if $h < 0;
3954
3955 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
3956 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
3957 4487
3958# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3959# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3960 4490
3961 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3962 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3963 4493
3964 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
3965 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
3966 4496
3967 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4497 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3968 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
3969 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
3970 4500
3971 $widget->{w} = $w; 4501 $widget->{w} = $w;
3972 $widget->{h} = $h; 4502 $widget->{h} = $h;
3973 4503
3974 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
3975 } 4506 }
3976 } 4507 }
3977 } 4508 }
3978 4509
3979 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
3980 $_->() 4511 $_->()
3981 for values %{delete $self->{post_alloc_hook}}; 4512 for values %{delete $self->{post_alloc_hook}};
3982 } 4513 }
3983
3984 4514
3985 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3986 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3987 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
3988 4518
… …
3991 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3992 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
3993 glLoadIdentity; 4523 glLoadIdentity;
3994 4524
3995 { 4525 {
3996 package CFPlus::UI::Base; 4526 package dc::UI::Base;
3997 4527
3998 ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3999 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
4000 }
4001 4530
4002 $self->_draw; 4531 $self->_draw;
4532 }
4003} 4533}
4004 4534
4005############################################################################# 4535#############################################################################
4006 4536
4007package CFPlus::UI; 4537package dc::UI;
4008 4538
4009$ROOT = new CFPlus::UI::Root; 4539$ROOT = new dc::UI::Root;
4010$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4540$TOOLTIP = new dc::UI::Tooltip z => 900;
4011 4541
40121 45421
4013 4543

Diff Legend

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