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.354 by root, Sat Nov 18 23:31:23 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 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 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
358sub size_request { 387sub size_request {
359 require Carp; 388 require Carp;
360 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
361} 390}
362 391
368 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
369 398
370 if ($self->{aspect}) { 399 if ($self->{aspect}) {
371 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
372 401
373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
375 404
376 # use alignment to adjust x, y 405 # use alignment to adjust x, y
377 406
378 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
379 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
420 449
421 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
422 451
423 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
424 453
425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
426 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
427 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
428 } 457 }
429} 458}
430 459
431# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
432sub coord2local { 461sub coord2local {
433 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
434 463
435 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
436 465
437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
438} 467}
439 468
440# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
441sub coord2global { 470sub coord2global {
442 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
443 472
444 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
445 474
446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
447} 476}
448 477
449sub invoke_focus_in { 478sub invoke_focus_in {
498sub connect { 527sub connect {
499 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
500 529
501 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
502 531
503 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
506 } 535 }
536}
537
538sub disconnect_all {
539 my ($self, $signal) = @_;
540
541 delete $self->{signal_cb}{$signal};
507} 542}
508 543
509my %has_coords = ( 544my %has_coords = (
510 button_down => 1, 545 button_down => 1,
511 button_up => 1, 546 button_up => 1,
523 ? $args[0]->xy ($self) 558 ? $args[0]->xy ($self)
524 : (); 559 : ();
525 560
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 561 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 562
528 if ($self->{tooltip} =~ /Apply.*audio/) { 563 for my $cb (
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d# 564 @{$self->{signal_cb}{$signal} || []}, # before
530 warn "3 $self->{parent}\n";#d# 565 ($self->can ("invoke_$signal") || sub { 1 }), # closure
566 ) {
567 return $cb->($self, @args, @append) || next;
531 } 568 }
532 569
533 #d##TODO# stop propagating at first true, do not use sum 570 # parent
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
545} 572}
546 573
547sub find_widget { 574#sub find_widget {
548 my ($self, $x, $y) = @_; 575# in .xs
549
550 return () unless $self->{can_events};
551
552 return $self
553 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
554 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
555
556 ()
557}
558 576
559sub set_parent { 577sub set_parent {
560 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
561 579
562 Scalar::Util::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
564} 582}
565 583
566sub realloc { 584sub realloc {
567 my ($self) = @_; 585 my ($self) = @_;
593 611
594# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 613# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 615
598sub draw { 616#sub draw {
599 my ($self) = @_; 617#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 618
645sub _draw { 619sub _draw {
646 my ($self) = @_; 620 my ($self) = @_;
647 621
648 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
649} 623}
650 624
651sub DESTROY { 625sub DESTROY {
652 my ($self) = @_; 626 my ($self) = @_;
653 627
654 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
655 629
656 delete $WIDGET{$self+0}; 630 local $@;
657
658 eval { $self->destroy }; 631 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
633
634 delete $WIDGET{$self+0};
660} 635}
661 636
662############################################################################# 637#############################################################################
663 638
664package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
665 640
666our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
667 642
668use strict; 643use strict;
669use CFPlus::OpenGL; 644use DC::OpenGL;
670 645
671sub new { 646sub new {
672 my $class = shift; 647 my $class = shift;
673
674 # range [value, low, high, page]
675 648
676 $class->SUPER::new ( 649 $class->SUPER::new (
677 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
678 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
679 @_ 652 @_
691 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
692 665
693 glEnable GL_BLEND; 666 glEnable GL_BLEND;
694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695 glColor_premultiply @$color; 668 glColor_premultiply @$color;
696
697 glBegin GL_QUADS;
698 glVertex 0 , 0;
699 glVertex 0 , $h;
700 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
701 glVertex $w, 0;
702 glEnd;
703
704 glDisable GL_BLEND; 670 glDisable GL_BLEND;
705 } 671 }
706} 672}
707 673
708############################################################################# 674#############################################################################
709 675
710package CFPlus::UI::Empty; 676package DC::UI::Empty;
711 677
712our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
713 679
714sub new { 680sub new {
715 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
716 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
717} 683}
724 690
725sub draw { } 691sub draw { }
726 692
727############################################################################# 693#############################################################################
728 694
729package CFPlus::UI::Container; 695package DC::UI::Container;
730 696
731our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
732 698
733sub new { 699sub new {
734 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
735 701
736 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
740 can_events => 0, 706 can_events => 0,
741 %arg, 707 %arg,
742 ); 708 );
743 709
744 $self->add (@$children) 710 $self->add (@$children)
745 if $children; 711 if $children && @$children;
746 712
747 $self 713 $self
748} 714}
749 715
750sub realloc { 716sub realloc {
759 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
760 726
761 $_->set_parent ($self) 727 $_->set_parent ($self)
762 for @widgets; 728 for @widgets;
763 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
764 use sort 'stable'; 731 use sort 'stable';
765 732
766 $self->{children} = [ 733 $self->{children} = [
767 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
768 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
769 ]; 736 ];
770 737
771 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
772} 743}
773 744
774sub children { 745sub children {
775 @{ $_[0]{children} } 746 @{ $_[0]{children} }
776} 747}
777 748
778sub remove { 749sub remove {
779 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
780 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
781 delete $child->{parent}; 755 delete $child->{parent};
782 $child->hide; 756 $child->hide;
783
784 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
785 759
786 $self->realloc; 760 $self->realloc;
787} 761}
788 762
789sub clear { 763sub clear {
790 my ($self) = @_; 764 my ($self) = @_;
791 765
792 my $children = delete $self->{children}; 766 my $children = $self->{children};
793 $self->{children} = []; 767 $self->{children} = [];
794 768
795 for (@$children) { 769 for (@$children) {
796 delete $_->{parent}; 770 delete $_->{parent};
797 $_->hide; 771 $_->hide;
817} 791}
818 792
819sub _draw { 793sub _draw {
820 my ($self) = @_; 794 my ($self) = @_;
821 795
822 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
823} 797}
824 798
825############################################################################# 799#############################################################################
826 800
827package CFPlus::UI::Bin; 801package DC::UI::Bin;
828 802
829our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
830 804
831sub new { 805sub new {
832 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
833 807
834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
835 809
836 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
837} 811}
838 812
839sub add { 813sub add {
840 my ($self, $child) = @_; 814 my ($self, $child) = @_;
841 815
842 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
843 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
844} 818}
845 819
846sub remove { 820sub remove {
847 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
848 822
849 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
850 824
851 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
852 unless @{$self->{children}}; 826 unless @{$self->{children}};
853} 827}
854 828
855sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
856 830
865 839
866 1 840 1
867} 841}
868 842
869############################################################################# 843#############################################################################
870
871# back-buffered drawing area 844# back-buffered drawing area
872 845
873package CFPlus::UI::Window; 846package DC::UI::Window;
874 847
875our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
876 849
877use CFPlus::OpenGL; 850use DC::OpenGL;
878 851
879sub new { 852sub new {
880 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
881 854
882 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
904} 877}
905 878
906sub render_child { 879sub render_child {
907 my ($self) = @_; 880 my ($self) = @_;
908 881
909 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
910 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
911 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
912 885
913 { 886 {
914 package CFPlus::UI::Base; 887 package DC::UI::Base;
915 888
916 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
917 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
918 891
919 $self->_render; 892 $self->_render;
936 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
937} 910}
938 911
939############################################################################# 912#############################################################################
940 913
941package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
942 915
916use List::Util qw(min max);
917
943our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
944 919
945sub new { 920sub new {
946 my $class = shift; 921 my $class = shift;
947 922
948 $class->SUPER::new ( 923 $class->SUPER::new (
955sub size_request { 930sub size_request {
956 my ($self) = @_; 931 my ($self) = @_;
957 932
958 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
959 934
960 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
961 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
962 937
963 ($w, $h) 938 ($w, $h)
964} 939}
965 940
966sub invoke_size_allocate { 941sub invoke_size_allocate {
978} 953}
979 954
980sub set_offset { 955sub set_offset {
981 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
982 957
958 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
959 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
960
961 if ($x != $self->{view_x} or $y != $self->{view_y}) {
983 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
984 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
985 964
965 $self->emit (changed => $x, $y);
986 $self->update; 966 $self->update;
967 }
968}
969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
987} 986}
988 987
989# hmm, this does not work for topleft of $self... but we should not ask for that 988# hmm, this does not work for topleft of $self... but we should not ask for that
990sub coord2local { 989sub coord2local {
991 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
1006 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1007 1006
1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1010 ) { 1009 ) {
1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1012 } else { 1011 } else {
1013 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1014 } 1013 }
1015} 1014}
1016 1015
1017sub _render { 1016sub _render {
1018 my ($self) = @_; 1017 my ($self) = @_;
1019 1018
1020 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1019 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1021 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1022 1021
1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1024 1023
1025 $self->SUPER::_render; 1024 $self->SUPER::_render;
1026} 1025}
1027 1026
1028############################################################################# 1027#############################################################################
1029 1028
1030package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1031 1030
1032our @ISA = CFPlus::UI::HBox::; 1031our @ISA = DC::UI::Table::;
1033 1032
1034sub new { 1033sub new {
1035 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1036 1035
1037 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1038 1037
1039 my $self; 1038 my $self;
1040 1039
1041 my $slider = new CFPlus::UI::Slider 1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1043 vertical => 0,
1044 range => [0, 0, 1, 0.01], # HACK fix
1045 on_changed => sub {
1046 $self->{hpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 },
1049 ;
1050
1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
1042 vertical => 1, 1054 vertical => 1,
1043 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1044 on_changed => sub { 1056 on_changed => sub {
1045 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046 }, 1059 },
1047 ; 1060 ;
1048 1061
1049 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
1050 vp => (new CFPlus::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1051 can_events => 1, 1065 can_events => 1,
1052 slider => $slider, 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
1053 %arg, 1070 %arg,
1054 ); 1071 );
1055 1072
1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1092 ;
1093
1056 $self->SUPER::add ($self->{vp}, $self->{slider}); 1094 $self->SUPER::add ($self->{vp});
1095
1057 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1058 1097
1059 $self 1098 $self
1060} 1099}
1061
1062#TODO# update range on size_allocate depending on child
1063 1100
1064sub add { 1101sub add {
1065 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1066 1103
1067 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1068} 1105}
1069 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1111sub update_slider {
1112 my ($self) = @_;
1113
1114 my $child = ($self->{vp} or return)->child;
1115
1116 if ($self->{scroll_x}) {
1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1119
1120 my $visible = $w1 > $w2;
1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1126 }
1127
1128 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1070sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1072 1161
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev); 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1076 1164
1077 1 1165 1
1078} 1166}
1079 1167
1080sub update_slider { 1168sub invoke_button_down {
1081 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1082 1170
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1171 if ($ev->{button} == 2) {
1084} 1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1085 1175
1086sub update { 1176 0
1087 my ($self) = @_; 1177}
1088 1178
1089 $self->SUPER::update; 1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1090 1181
1091 $self->update_slider; 1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1092} 1198}
1093 1199
1094sub invoke_size_allocate { 1200sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1096 1202
1097 $self->update_slider; 1203 $self->update_slider;
1098
1099 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1100} 1205}
1101 1206
1102############################################################################# 1207#############################################################################
1103 1208
1104package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1105 1210
1106our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1107 1212
1108use CFPlus::OpenGL; 1213use DC::OpenGL;
1109 1214
1110sub new { 1215sub new {
1111 my $class = shift; 1216 my $class = shift;
1112 1217
1113 $class->SUPER::new ( 1218 $class->SUPER::new (
1123 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1124 1229
1125 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1126 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1127 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1128
1129 glBegin GL_QUADS;
1130 glVertex 0 , 0;
1131 glVertex 0 , $h;
1132 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1133 glVertex $w, 0;
1134 glEnd;
1135
1136 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1137 } 1235 }
1138 1236
1139 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1140} 1238}
1141 1239
1142############################################################################# 1240#############################################################################
1143 1241
1144package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1145 1243
1146our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1147 1245
1148use CFPlus::OpenGL; 1246use DC::OpenGL;
1149 1247
1150sub new { 1248sub new {
1151 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1152 1250
1153 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1154 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1155 align => 1, 1253 align => 1,
1156 valign => 0, 1254 valign => 0.5,
1157 text => $arg{label}, 1255 text => $arg{label},
1158 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1159 } 1257 }
1160 1258
1161 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
1171 1269
1172sub add { 1270sub add {
1173 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1174 1272
1175 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1176 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1177} 1275}
1178 1276
1179sub border { 1277sub border {
1180 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1181} 1279}
1239 } 1337 }
1240} 1338}
1241 1339
1242############################################################################# 1340#############################################################################
1243 1341
1244package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1245 1343
1246our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1247 1345
1248use CFPlus::OpenGL; 1346use DC::OpenGL;
1249 1347
1250my $bg = 1348my $bg =
1251 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1252 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1253 1351
1254my @border = 1352my @border =
1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355
1356my @icon =
1357 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1257 1359
1258sub new { 1360sub new {
1259 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1260 1362
1261 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1266 min_w => 64, 1368 min_w => 64,
1267 min_h => 32, 1369 min_h => 32,
1268 %arg, 1370 %arg,
1269 ); 1371 );
1270 1372
1271 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1272 align => 0, 1374 align => 0.5,
1273 valign => 1, 1375 valign => 1,
1274 text => $self->{title}, 1376 text => $self->{title},
1275 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1276 if exists $self->{title}; 1378 if exists $self->{title};
1277 1379
1278 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1279 $self->{close_button} = 1381 $self->{close_button} =
1280 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1281 path => 'x1_close.png', 1383 path => 'x1_close.png',
1282 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1283 1385
1284 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1285 } 1387 }
1286 1388
1287 $self 1389 $self
1288} 1390}
1289 1391
1290sub add { 1392sub add {
1291 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1292 1394
1293 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1296} 1398}
1297 1399
1298sub border { 1400sub border {
1299 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1300} 1411}
1301 1412
1302sub size_request { 1413sub size_request {
1303 my ($self) = @_; 1414 my ($self) = @_;
1304 1415
1430 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1431 1542
1432 my $border = $self->border; 1543 my $border = $self->border;
1433 1544
1434 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1435 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1436 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1437 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1438 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550
1551 # move
1552 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557
1558 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1439 1564
1440 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1441 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1442 1567
1443 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
1462 if $self->{close_button}; 1587 if $self->{close_button};
1463} 1588}
1464 1589
1465############################################################################# 1590#############################################################################
1466 1591
1467package CFPlus::UI::Table; 1592package DC::UI::Table;
1468 1593
1469our @ISA = CFPlus::UI::Base::; 1594our @ISA = DC::UI::Container::;
1470 1595
1471use List::Util qw(max sum); 1596use List::Util qw(max sum);
1472 1597
1473use CFPlus::OpenGL; 1598use DC::OpenGL;
1474 1599
1475sub new { 1600sub new {
1476 my $class = shift; 1601 my $class = shift;
1477 1602
1478 $class->SUPER::new ( 1603 $class->SUPER::new (
1479 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
1480 @_, 1606 @_,
1481 ) 1607 )
1482} 1608}
1483 1609
1484sub children {
1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486}
1487
1488sub add { 1610sub add {
1611 my ($self, @widgets) = @_;
1612
1613 for my $child (@widgets) {
1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1617
1618 $self->SUPER::add (@widgets);
1619}
1620
1621sub add_at {
1489 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1490 1625
1491 while (@_) { 1626 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1493 $child->set_parent ($self);
1494 $self->{children}[$y][$x] = $child;
1495 }
1496 1628
1497 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1498 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1499 $self->realloc;
1500}
1501 1631
1502sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1503 my ($self, $child) = @_; 1639 my ($self) = @_;
1504 1640
1505 # TODO: not yet implemented 1641 my (@w, @h);
1506}
1507
1508# TODO: move to container class maybe? send children a signal on removal?
1509sub clear {
1510 my ($self) = @_;
1511 1642
1512 my @children = $self->children; 1643 my @children = $self->children;
1513 delete $self->{children}; 1644
1645 # first pass, columns
1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1648
1649 my $sw = sum @w[$c .. $c + $cs - 1];
1650
1651 if ($w > $sw) {
1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1653 }
1514 1654 }
1515 for (@children) {
1516 delete $_->{parent};
1517 $_->hide;
1518 }
1519 1655
1520 $self->realloc; 1656 # second pass, rows
1521} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1522
1523sub get_wh {
1524 my ($self) = @_;
1525
1526 my (@w, @h);
1527
1528 for my $y (0 .. $#{$self->{children}}) {
1529 my $row = $self->{children}[$y]
1530 or next;
1531
1532 for my $x (0 .. $#$row) {
1533 my $widget = $row->[$x]
1534 or next;
1535 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1536 1659
1537 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1538 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1539 } 1664 }
1540 } 1665 }
1541 1666
1542 (\@w, \@h) 1667 (\@w, \@h)
1543} 1668}
1559 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1560 1685
1561 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1562 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1563 1688
1564 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
1565 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1566 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1567 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1568 1693
1569 # linearly scale sizes
1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572 1695
1573 CFPlus::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1697
1698 my @row_expand = @{$self->{row_expand}};
1699 @row_expand = (1) x @$ws unless @row_expand;
1700 my $row_expand = (sum @row_expand) || 1;
1701
1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1703
1574 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1575 1705
1576 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1577 1708
1578 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1579 my $row = $self->{children}[$r] 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1580 or next;
1581 1711
1582 my $x = 0; 1712 $widget->configure (
1583 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1584 1715 );
1585 for my $c (0 .. $#$row) { 1716 }
1586 my $col_w = $ws->[$c];
1587 1717
1588 if (my $widget = $row->[$c]) { 1718 1
1589 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1590 }
1591 1720
1592 $x += $col_w; 1721#############################################################################
1722
1723package DC::UI::Fixed;
1724
1725use List::Util qw(min max);
1726
1727our @ISA = DC::UI::Container::;
1728
1729sub _scale($$$) {
1730 my ($rel, $val, $max) = @_;
1731
1732 $rel ? $val * $max : $val
1733}
1734
1735sub size_request {
1736 my ($self) = @_;
1737
1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1739
1740 # determine overall size by querying abs widgets
1741 for my $child ($self->visible_children) {
1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1745
1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1593 } 1748 }
1749 }
1594 1750
1595 $y += $row_h; 1751 my $W = $x2 - $x1;
1752 my $H = $y2 - $y1;
1753
1754 # now layout remaining widgets
1755 for my $child ($self->visible_children) {
1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 ($W, $H)
1769}
1770
1771sub invoke_size_allocate {
1772 my ($self, $W, $H) = @_;
1773
1774 for my $child ($self->visible_children) {
1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1777
1778 $x += $child->{c_halign} * $child->{req_w};
1779 $y += $child->{c_valign} * $child->{req_h};
1780
1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1596 } 1782 }
1597 1783
1598 1 1784 1
1599} 1785}
1600 1786
1601sub find_widget {
1602 my ($self, $x, $y) = @_;
1603
1604 $x -= $self->{x};
1605 $y -= $self->{y};
1606
1607 my $res;
1608
1609 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1610 $res = $_->find_widget ($x, $y)
1611 and return $res;
1612 }
1613
1614 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1615}
1616
1617sub _draw {
1618 my ($self) = @_;
1619
1620 for (grep $_, @{$self->{children}}) {
1621 $_->draw for grep $_, @$_;
1622 }
1623}
1624
1625############################################################################# 1787#############################################################################
1626 1788
1627package CFPlus::UI::Box; 1789package DC::UI::Box;
1628 1790
1629our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1630 1792
1631sub size_request { 1793sub size_request {
1632 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1633 1797
1634 $self->{vertical} 1798 $self->{vertical}
1635 ? ( 1799 ? (
1636 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1637 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1638 ) 1802 )
1639 : ( 1803 : (
1640 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1641 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1642 ) 1806 )
1643} 1807}
1644 1808
1645sub invoke_size_allocate { 1809sub invoke_size_allocate {
1646 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
1667 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1668 for 0 .. $#children; 1832 for 0 .. $#children;
1669 } 1833 }
1670 } 1834 }
1671 1835
1672 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1673 1837
1674 my $pos = 0; 1838 my $pos = 0;
1675 for (0 .. $#children) { 1839 for (0 .. $#children) {
1676 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1677 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1682 1 1846 1
1683} 1847}
1684 1848
1685############################################################################# 1849#############################################################################
1686 1850
1687package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1688 1852
1689our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1690 1854
1691sub new { 1855sub new {
1692 my $class = shift; 1856 my $class = shift;
1693 1857
1694 $class->SUPER::new ( 1858 $class->SUPER::new (
1697 ) 1861 )
1698} 1862}
1699 1863
1700############################################################################# 1864#############################################################################
1701 1865
1702package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1703 1867
1704our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1705 1869
1706sub new { 1870sub new {
1707 my $class = shift; 1871 my $class = shift;
1708 1872
1709 $class->SUPER::new ( 1873 $class->SUPER::new (
1712 ) 1876 )
1713} 1877}
1714 1878
1715############################################################################# 1879#############################################################################
1716 1880
1717package CFPlus::UI::Label; 1881package DC::UI::Label;
1718 1882
1719our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1720 1884
1721use CFPlus::OpenGL; 1885use DC::OpenGL;
1722 1886
1723sub new { 1887sub new {
1724 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1725 1889
1726 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
1731 #text => initial text 1895 #text => initial text
1732 #markup => initial narkup 1896 #markup => initial narkup
1733 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1734 #style => 0, # render flags 1898 #style => 0, # render flags
1735 ellipsise => 3, # end 1899 ellipsise => 3, # end
1736 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1737 fontsize => 1, 1901 fontsize => 1,
1738 align => -1, 1902 align => 0.5,
1739 valign => -1, 1903 valign => 0.5,
1740 padding_x => 2, 1904 padding_x => 4,
1741 padding_y => 2, 1905 padding_y => 2,
1742 can_events => 0, 1906 can_events => 0,
1743 %arg 1907 %arg
1744 ); 1908 );
1745 1909
1746 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1747 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1748 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1749 $self->{template} = $layout; 1913 $self->{template} = $layout;
1750 } 1914 }
1751 1915
1752 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
1770 1934
1771 delete $self->{ox}; 1935 delete $self->{ox};
1772 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1773} 1937}
1774 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1775sub set_text { 1945sub set_text {
1776 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1777 1947
1778 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1779 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1802 1972
1803sub size_request { 1973sub size_request {
1804 my ($self) = @_; 1974 my ($self) = @_;
1805 1975
1806 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1807 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1808 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1809 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1810 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1811 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1812 1984
1813 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1814 1986
1815 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1816 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1817 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1818 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1819 1991
1820 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1821 1993
1822 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
1878 2050
1879 [$self->{layout}->size] 2051 [$self->{layout}->size]
1880 }; 2052 };
1881 2053
1882 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1883 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1884 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1885 : ($self->{w} - $size->[0]) * 0.5);
1886 2057
1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1889 : ($self->{h} - $size->[1]) * 0.5);
1890 }; 2059 };
1891 2060
1892 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
1893 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
1894 2063# DC::OpenGL::glNewList $self->{list};
1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
2069
2070 $self->{layout}->draw;
1896} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
1897 2080
1898############################################################################# 2081#############################################################################
1899 2082
1900package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
1901 2084
1902our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
1903 2086
1904use CFPlus::OpenGL; 2087use DC::OpenGL;
1905 2088
1906sub new { 2089sub new {
1907 my $class = shift; 2090 my $class = shift;
1908 2091
1909 $class->SUPER::new ( 2092 $class->SUPER::new (
1910 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1911 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1912 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1913 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1914 can_hover => 1, 2099 can_hover => 1,
1915 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1916 valign => 0, 2102 valign => 0.5,
1917 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1918 #text => ... 2107 #text => ...
1919 #hidden => "*", 2108 #hidden => "*",
1920 @_ 2109 @_
1921 ) 2110 )
1922} 2111}
1967 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1969 2158
1970 my $text = $self->get_text; 2159 my $text = $self->get_text;
1971 2160
2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
1972 if ($uni == 8) { 2163 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2165 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2172 # what a hack
1981 $self->{cursor} = 0; 2173 $self->{cursor} =
2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2175 ? length $1
2176 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
2178 # uh, again
2179 $self->{cursor} =
2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2181 ? $self->{cursor} + length $1
2182 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2183 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2184 $text = "";
1986 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2187 $self->emit ('escape');
1989 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2192 } else {
1992 return 0; 2193 return 0;
1993 } 2194 }
1994 2195
1995 $self->_set_text ($text); 2196 $self->_set_text ($text);
1996 2197
1997 $self->realloc; 2198 $self->realloc;
2199 $self->update;
1998 2200
1999 1 2201 1
2000} 2202}
2001 2203
2002sub invoke_focus_in { 2204sub invoke_focus_in {
2044 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2045 } 2247 }
2046 2248
2047 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2048 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2049 glBegin GL_QUADS;
2050 glVertex 0 , 0;
2051 glVertex 0 , $self->{h};
2052 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2053 glVertex $self->{w}, 0;
2054 glEnd;
2055 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2056 2253
2057 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2058 2255
2059 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
2061 2258
2062 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2063 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2064 utf8::encode $text; 2261 utf8::encode $text;
2065 2262
2066 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2067 } 2264 }
2068 2265
2266 glColor_premultiply @{$self->{active_fg}};
2069 glBegin GL_LINES; 2267 glBegin GL_LINES;
2070 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072 glEnd; 2270 glEnd;
2073 }
2074}
2075 2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2285 }
2286}
2287
2288#############################################################################
2289
2076package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2077 2291
2078our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2079 2293
2080use CFPlus::OpenGL; 2294use DC::OpenGL;
2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
2081 2305
2082sub invoke_key_down { 2306sub invoke_key_down {
2083 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
2084 2308
2085 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
2086 2310
2087 if ($sym == 13) { 2311 if ($ev->{uni} == 0x0d || $sym == 13) {
2088 unshift @{$self->{history}}, 2312 unshift @{$self->{history}},
2089 my $txt = $self->get_text; 2313 my $txt = $self->get_text;
2090 2314
2091 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
2092 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
2093 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
2094 $self->update; 2318 $self->update;
2095 2319
2096 } elsif ($sym == CFPlus::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
2097 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
2098 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
2099 } 2323 }
2100 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
2101 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
2103 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
2104 } 2328 }
2105 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2106 } 2330 }
2107 2331
2108 } elsif ($sym == CFPlus::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
2109 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2111 2335
2112 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2113 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2114 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2115 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2116 } 2343 }
2117 2344
2118 } else { 2345 } else {
2119 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2120 } 2347 }
2122 1 2349 1
2123} 2350}
2124 2351
2125############################################################################# 2352#############################################################################
2126 2353
2127package CFPlus::UI::Button; 2354package DC::UI::TextEdit;
2128 2355
2129our @ISA = CFPlus::UI::Label::; 2356our @ISA = DC::UI::EntryBase::;
2130 2357
2131use CFPlus::OpenGL; 2358use DC::OpenGL;
2132
2133my @tex =
2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2135 qw(b1_button_active.png);
2136 2359
2137sub new { 2360sub new {
2138 my $class = shift; 2361 my $class = shift;
2139 2362
2140 $class->SUPER::new ( 2363 $class->SUPER::new (
2141 padding_x => 4,
2142 padding_y => 4, 2364 padding_y => 4,
2143 fg => [1, 1, 1], 2365
2144 active_fg => [0, 0, 1], 2366 @_
2367 )
2368}
2369
2370sub move_cursor_ver {
2371 my ($self, $dy) = @_;
2372
2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2374
2375 $line += $dy;
2376
2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2378 $self->{cursor} = $index;
2379 delete $self->{cur_h};
2380 $self->update;
2381 return;
2382 }
2383}
2384
2385sub invoke_key_down {
2386 my ($self, $ev) = @_;
2387
2388 my $sym = $ev->{sym};
2389
2390 if ($sym == DC::SDLK_UP) {
2391 $self->move_cursor_ver (-1);
2392 } elsif ($sym == DC::SDLK_DOWN) {
2393 $self->move_cursor_ver (+1);
2394 } else {
2395 return $self->SUPER::invoke_key_down ($ev)
2396 }
2397
2398 1
2399}
2400
2401#############################################################################
2402
2403package DC::UI::ButtonBin;
2404
2405our @ISA = DC::UI::Bin::;
2406
2407use DC::OpenGL;
2408
2409my @tex =
2410 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2411 qw(b1_button_inactive.png b1_button_active.png);
2412
2413sub new {
2414 my $class = shift;
2415
2416 $class->SUPER::new (
2145 can_hover => 1, 2417 can_hover => 1,
2146 align => 0, 2418 align => 0.5,
2147 valign => 0, 2419 valign => 0.5,
2148 can_events => 1, 2420 can_events => 1,
2149 @_ 2421 @_
2150 ) 2422 )
2151} 2423}
2152 2424
2161} 2433}
2162 2434
2163sub _draw { 2435sub _draw {
2164 my ($self) = @_; 2436 my ($self) = @_;
2165 2437
2166 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2167
2168 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
2171 2441
2442 my $tex = $tex[$GRAB == $self];
2172 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2173 2444
2174 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2175 2446
2176 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
2177} 2448}
2178 2449
2179############################################################################# 2450#############################################################################
2180 2451
2181package CFPlus::UI::CheckBox; 2452package DC::UI::Button;
2182 2453
2183our @ISA = CFPlus::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
2184 2457
2185my @tex = 2458my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2459 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png);
2461
2462sub new {
2463 my $class = shift;
2464
2465 $class->SUPER::new (
2466 padding_x => 8,
2467 padding_y => 4,
2468 fg => [1.0, 1.0, 1.0],
2469 active_fg => [0.8, 0.8, 0.8],
2470 can_hover => 1,
2471 align => 0.5,
2472 valign => 0.5,
2473 can_events => 1,
2474 @_
2475 )
2476}
2477
2478sub invoke_button_up {
2479 my ($self, $ev, $x, $y) = @_;
2480
2481 $self->emit ("activate")
2482 if $x >= 0 && $x < $self->{w}
2483 && $y >= 0 && $y < $self->{h};
2484
2485 1
2486}
2487
2488sub _draw {
2489 my ($self) = @_;
2490
2491 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2492
2493 glEnable GL_TEXTURE_2D;
2494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2495 glColor 0, 0, 0, 1;
2496
2497 my $tex = $tex[$GRAB == $self];
2498 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499
2500 glDisable GL_TEXTURE_2D;
2501
2502 $self->SUPER::_draw;
2503}
2504
2505#############################################################################
2506
2507package DC::UI::CheckBox;
2508
2509our @ISA = DC::UI::DrawBG::;
2510
2511my @tex =
2512 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2187 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2188 2514
2189use CFPlus::OpenGL; 2515use DC::OpenGL;
2190 2516
2191sub new { 2517sub new {
2192 my $class = shift; 2518 my $class = shift;
2193 2519
2194 $class->SUPER::new ( 2520 $class->SUPER::new (
2234sub _draw { 2560sub _draw {
2235 my ($self) = @_; 2561 my ($self) = @_;
2236 2562
2237 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2238 2564
2239 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2240 2566
2241 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2242 2568
2243 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2244 2570
2251 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2252} 2578}
2253 2579
2254############################################################################# 2580#############################################################################
2255 2581
2256package CFPlus::UI::Image; 2582package DC::UI::Image;
2257 2583
2258our @ISA = CFPlus::UI::Base::; 2584our @ISA = DC::UI::Base::;
2259 2585
2260use CFPlus::OpenGL; 2586use DC::OpenGL;
2261 2587
2262our %texture_cache; 2588our %texture_cache;
2263 2589
2264sub new { 2590sub new {
2265 my $class = shift; 2591 my $class = shift;
2266 2592
2267 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2268 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2269 @_, 2596 @_,
2270 ); 2597 );
2271 2598
2272 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2273 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2274 2601
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2277 2604
2278 Scalar::Util::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2279 2606
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281 2608
2282 $self 2609 $self
2283} 2610}
2284 2611
2285sub STORABLE_freeze { 2612sub STORABLE_freeze {
2286 my ($self, $cloning) = @_; 2613 my ($self, $cloning) = @_;
2287 2614
2288 $self->{path} 2615 $self->{path}
2289 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2290 2617
2291 $self->{path} 2618 $self->{path}
2292} 2619}
2293 2620
2294sub STORABLE_attach { 2621sub STORABLE_attach {
2298} 2625}
2299 2626
2300sub size_request { 2627sub size_request {
2301 my ($self) = @_; 2628 my ($self) = @_;
2302 2629
2303 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2304} 2631}
2305 2632
2306sub _draw { 2633sub _draw {
2307 my ($self) = @_; 2634 my ($self) = @_;
2308 2635
2318 } 2645 }
2319 2646
2320 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2322 2649
2323 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
2324 2651
2325 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2326} 2653}
2327 2654
2328############################################################################# 2655#############################################################################
2329 2656
2330package CFPlus::UI::ImageButton; 2657package DC::UI::ImageButton;
2331 2658
2332our @ISA = CFPlus::UI::Image::; 2659our @ISA = DC::UI::Image::;
2333 2660
2334use CFPlus::OpenGL; 2661use DC::OpenGL;
2335 2662
2336my %textures; 2663my %textures;
2337 2664
2338sub new { 2665sub new {
2339 my $class = shift; 2666 my $class = shift;
2342 padding_x => 4, 2669 padding_x => 4,
2343 padding_y => 4, 2670 padding_y => 4,
2344 fg => [1, 1, 1], 2671 fg => [1, 1, 1],
2345 active_fg => [0, 0, 1], 2672 active_fg => [0, 0, 1],
2346 can_hover => 1, 2673 can_hover => 1,
2347 align => 0, 2674 align => 0.5,
2348 valign => 0, 2675 valign => 0.5,
2349 can_events => 1, 2676 can_events => 1,
2350 @_ 2677 @_
2351 ); 2678 );
2352} 2679}
2353 2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2354sub invoke_button_up { 2687sub invoke_button_up {
2355 my ($self, $ev, $x, $y) = @_; 2688 my ($self, $ev, $x, $y) = @_;
2356 2689
2357 $self->emit ("activate") 2690 $self->emit ("activate")
2358 if $x >= 0 && $x < $self->{w} 2691 if $x >= 0 && $x < $self->{w}
2361 1 2694 1
2362} 2695}
2363 2696
2364############################################################################# 2697#############################################################################
2365 2698
2366package CFPlus::UI::VGauge; 2699package DC::UI::VGauge;
2367 2700
2368our @ISA = CFPlus::UI::Base::; 2701our @ISA = DC::UI::Base::;
2369 2702
2370use List::Util qw(min max); 2703use List::Util qw(min max);
2371 2704
2372use CFPlus::OpenGL; 2705use DC::OpenGL;
2373 2706
2374my %tex = ( 2707my %tex = (
2375 food => [ 2708 food => [
2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2709 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2378 ], 2711 ],
2379 grace => [ 2712 grace => [
2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2713 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2381 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2382 ], 2715 ],
2383 hp => [ 2716 hp => [
2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2386 ], 2719 ],
2387 mana => [ 2720 mana => [
2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2389 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2390 ], 2723 ],
2391); 2724);
2392 2725
2393# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
2496 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2497} 2830}
2498 2831
2499############################################################################# 2832#############################################################################
2500 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
2501package CFPlus::UI::Gauge; 2972package DC::UI::Gauge;
2502 2973
2503our @ISA = CFPlus::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2504 2975
2505sub new { 2976sub new {
2506 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2507 2978
2508 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2510 can_hover => 1, 2981 can_hover => 1,
2511 can_events => 1, 2982 can_events => 1,
2512 %arg, 2983 %arg,
2513 ); 2984 );
2514 2985
2515 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2516 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2517 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2518 2989
2519 $self 2990 $self
2520} 2991}
2521 2992
2522sub set_fontsize { 2993sub set_fontsize {
2543 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2544} 3015}
2545 3016
2546############################################################################# 3017#############################################################################
2547 3018
2548package CFPlus::UI::Slider; 3019package DC::UI::Slider;
2549 3020
2550use strict; 3021use strict;
2551 3022
2552use CFPlus::OpenGL; 3023use DC::OpenGL;
2553 3024
2554our @ISA = CFPlus::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2555 3026
2556my @tex = 3027my @tex =
2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3028 map { new_from_file DC::Texture DC::find_rcfile $_ }
2558 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2559 3030
2560sub new { 3031sub new {
2561 my $class = shift; 3032 my $class = shift;
2562 3033
2630 3101
2631 $self->SUPER::invoke_button_down ($ev, $x, $y); 3102 $self->SUPER::invoke_button_down ($ev, $x, $y);
2632 3103
2633 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3104 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2634 3105
2635 $self->invoke_mouse_motion ($ev, $x, $y) 3106 $self->invoke_mouse_motion ($ev, $x, $y);
3107
3108 1
2636} 3109}
2637 3110
2638sub invoke_mouse_motion { 3111sub invoke_mouse_motion {
2639 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2640 3113
2656sub invoke_mouse_wheel { 3129sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_; 3130 my ($self, $ev) = @_;
2658 3131
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3132 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660 3133
3134 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3135
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3136 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662 3137
2663 ! ! $delta 3138 1
2664} 3139}
2665 3140
2666sub update { 3141sub update {
2667 my ($self) = @_; 3142 my ($self) = @_;
2668 3143
2717 glDisable GL_TEXTURE_2D; 3192 glDisable GL_TEXTURE_2D;
2718} 3193}
2719 3194
2720############################################################################# 3195#############################################################################
2721 3196
2722package CFPlus::UI::ValSlider; 3197package DC::UI::ValSlider;
2723 3198
2724our @ISA = CFPlus::UI::HBox::; 3199our @ISA = DC::UI::HBox::;
2725 3200
2726sub new { 3201sub new {
2727 my ($class, %arg) = @_; 3202 my ($class, %arg) = @_;
2728 3203
2729 my $range = delete $arg{range}; 3204 my $range = delete $arg{range};
2730 3205
2731 my $self = $class->SUPER::new ( 3206 my $self = $class->SUPER::new (
2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3207 slider => (new DC::UI::Slider expand => 1, range => $range),
2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3208 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2734 to_value => sub { shift }, 3209 to_value => sub { shift },
2735 from_value => sub { shift }, 3210 from_value => sub { shift },
2736 %arg, 3211 %arg,
2737 ); 3212 );
2738 3213
2758sub set_range { shift->{slider}->set_range (@_) } 3233sub set_range { shift->{slider}->set_range (@_) }
2759sub set_value { shift->{slider}->set_value (@_) } 3234sub set_value { shift->{slider}->set_value (@_) }
2760 3235
2761############################################################################# 3236#############################################################################
2762 3237
2763package CFPlus::UI::TextScroller; 3238package DC::UI::TextScroller;
2764 3239
2765our @ISA = CFPlus::UI::HBox::; 3240our @ISA = DC::UI::HBox::;
2766 3241
2767use CFPlus::OpenGL; 3242use DC::OpenGL;
2768 3243
2769sub new { 3244sub new {
2770 my $class = shift; 3245 my $class = shift;
2771 3246
2772 my $self = $class->SUPER::new ( 3247 my $self = $class->SUPER::new (
2774 can_events => 1, 3249 can_events => 1,
2775 indent => 0, 3250 indent => 0,
2776 #font => default_font 3251 #font => default_font
2777 @_, 3252 @_,
2778 3253
2779 layout => (new CFPlus::Layout), 3254 layout => (new DC::Layout),
2780 par => [], 3255 par => [],
3256 max_par => 0,
2781 height => 0, 3257 height => 0,
2782 children => [ 3258 children => [
2783 (new CFPlus::UI::Empty expand => 1), 3259 (new DC::UI::Empty expand => 1),
2784 (new CFPlus::UI::Slider vertical => 1), 3260 (new DC::UI::Slider vertical => 1),
2785 ], 3261 ],
2786 ); 3262 );
2787 3263
2788 $self->{children}[1]->connect (changed => sub { $self->update }); 3264 $self->{children}[1]->connect (changed => sub { $self->update });
2789 3265
2798} 3274}
2799 3275
2800sub size_request { 3276sub size_request {
2801 my ($self) = @_; 3277 my ($self) = @_;
2802 3278
2803 my ($empty, $slider) = @{ $self->{children} }; 3279 my ($empty, $slider) = $self->visible_children;
2804 3280
2805 local $self->{children} = [$empty, $slider]; 3281 local $self->{children} = [$empty, $slider];
2806 $self->SUPER::size_request 3282 $self->SUPER::size_request
2807} 3283}
2808 3284
2845 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3321 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2846 $layout->set_markup ($para->{markup}); 3322 $layout->set_markup ($para->{markup});
2847 3323
2848 $layout->set_shapes ( 3324 $layout->set_shapes (
2849 map 3325 map
2850 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3326 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2851 @{$para->{widget}} 3327 @{$para->{widget}}
2852 ); 3328 );
2853 3329
2854 $layout 3330 $layout
2855} 3331}
2910 3386
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3387 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para; 3388 push @{$self->{par}}, $para;
2913 } 3389 }
2914 3390
3391 if (my $max = $self->{max_par}) {
3392 shift @{$self->{par}} while @{$self->{par}} > $max;
3393 }
3394
2915 $self->{need_reflow}++; 3395 $self->{need_reflow}++;
2916 $self->update; 3396 $self->update;
2917} 3397}
2918 3398
2919sub scroll_to_bottom { 3399sub scroll_to_bottom {
2968 $ROOT->on_post_alloc ($self => sub { 3448 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate; 3449 $self->force_uptodate;
2970 3450
2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2972 3452
2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3453 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2974 glClearColor 0, 0, 0, 0; 3454 glClearColor 0, 0, 0, 0;
2975 glClear GL_COLOR_BUFFER_BIT; 3455 glClear GL_COLOR_BUFFER_BIT;
2976 3456
2977 package CFPlus::UI::Base; 3457 package DC::UI::Base;
2978 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3458 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2979 (0, 0, $self->{w}, $self->{h}); 3459 (0, 0, $self->{w}, $self->{h});
2980 3460
2981 my $top = int $self->{children}[1]{range}[0]; 3461 my $top = int $self->{children}[1]{range}[0];
2982 3462
2993 3473
2994 if ($y0 < $y + $h && $y < $y1) { 3474 if ($y0 < $y + $h && $y < $y1) {
2995 my $layout = $self->get_layout ($para); 3475 my $layout = $self->get_layout ($para);
2996 3476
2997 $layout->render ($para->{indent}, $y - $y0); 3477 $layout->render ($para->{indent}, $y - $y0);
3478 $layout->draw;
2998 3479
2999 if (my @w = @{ $para->{widget} }) { 3480 if (my @w = @{ $para->{widget} }) {
3000 my @s = $layout->get_shapes; 3481 my @s = $layout->get_shapes;
3001 3482
3002 for (@w) { 3483 for (@w) {
3040 $self->{children}[1]->draw; 3521 $self->{children}[1]->draw;
3041} 3522}
3042 3523
3043############################################################################# 3524#############################################################################
3044 3525
3045package CFPlus::UI::Animator; 3526package DC::UI::Animator;
3046 3527
3047use CFPlus::OpenGL; 3528use DC::OpenGL;
3048 3529
3049our @ISA = CFPlus::UI::Bin::; 3530our @ISA = DC::UI::Bin::;
3050 3531
3051sub moveto { 3532sub moveto {
3052 my ($self, $x, $y) = @_; 3533 my ($self, $x, $y) = @_;
3053 3534
3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3535 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3082 glPopMatrix; 3563 glPopMatrix;
3083} 3564}
3084 3565
3085############################################################################# 3566#############################################################################
3086 3567
3087package CFPlus::UI::Flopper; 3568package DC::UI::Flopper;
3088 3569
3089our @ISA = CFPlus::UI::Button::; 3570our @ISA = DC::UI::Button::;
3090 3571
3091sub new { 3572sub new {
3092 my $class = shift; 3573 my $class = shift;
3093 3574
3094 my $self = $class->SUPER::new ( 3575 my $self = $class->SUPER::new (
3106 $self->{other}->toggle_visibility; 3587 $self->{other}->toggle_visibility;
3107} 3588}
3108 3589
3109############################################################################# 3590#############################################################################
3110 3591
3111package CFPlus::UI::Tooltip; 3592package DC::UI::Tooltip;
3112 3593
3113our @ISA = CFPlus::UI::Bin::; 3594our @ISA = DC::UI::Bin::;
3114 3595
3115use CFPlus::OpenGL; 3596use DC::OpenGL;
3116 3597
3117sub new { 3598sub new {
3118 my $class = shift; 3599 my $class = shift;
3119 3600
3120 $class->SUPER::new ( 3601 $class->SUPER::new (
3124} 3605}
3125 3606
3126sub set_tooltip_from { 3607sub set_tooltip_from {
3127 my ($self, $widget) = @_; 3608 my ($self, $widget) = @_;
3128 3609
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
3131
3132 my $tooltip = $widget->{tooltip}; 3610 my $tip = $widget->{tooltip};
3611 $tip = $tip->($widget) if "CODE" eq ref $tip;
3612
3613 $tip = DC::Pod::section_label tooltip => $1
3614 if $tip =~ /^#(.*)$/;
3133 3615
3134 if ($ENV{CFPLUS_DEBUG} & 2) { 3616 if ($ENV{CFPLUS_DEBUG} & 2) {
3135 $tooltip .= "\n\n" . (ref $widget) . "\n" 3617 $tip .= "\n\n" . (ref $widget) . "\n"
3136 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3618 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3137 . "req $widget->{req_w} $widget->{req_h}\n" 3619 . "req $widget->{req_w} $widget->{req_h}\n"
3138 . "visible $widget->{visible}"; 3620 . "visible $widget->{visible}";
3139 } 3621 }
3140 3622
3141 $tooltip =~ s/^\n+//; 3623 $tip =~ s/^\n+//;
3142 $tooltip =~ s/\n+$//; 3624 $tip =~ s/\n+$//;
3143 3625
3144 $self->add (new CFPlus::UI::Label 3626 $self->add (new DC::UI::Label
3145 markup => $tooltip, 3627 markup => $tip,
3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3628 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3629 align => 0,
3147 fontsize => 0.8, 3630 fontsize => 0.8,
3148 style => 1, # FLAG_INVERSE 3631 style => 1, # FLAG_INVERSE
3149 ellipsise => 0, 3632 ellipsise => 0,
3150 font => ($widget->{tooltip_font} || $::FONT_PROP), 3633 font => ($widget->{tooltip_font} || $::FONT_PROP),
3151 ); 3634 );
3188} 3671}
3189 3672
3190sub _draw { 3673sub _draw {
3191 my ($self) = @_; 3674 my ($self) = @_;
3192 3675
3193 glTranslate 0.375, 0.375;
3194
3195 my ($w, $h) = @$self{qw(w h)}; 3676 my ($w, $h) = @$self{qw(w h)};
3196 3677
3197 glColor 1, 0.8, 0.4; 3678 glColor 1, 0.8, 0.4;
3198 glBegin GL_QUADS; 3679 glRect 0, 0, $w, $h;
3199 glVertex 0 , 0;
3200 glVertex 0 , $h;
3201 glVertex $w, $h;
3202 glVertex $w, 0;
3203 glEnd;
3204 3680
3205 glColor 0, 0, 0; 3681 glColor 0, 0, 0;
3206 glBegin GL_LINE_LOOP; 3682 glRect_lineloop .5, .5, $w + .5, $h + .5;
3207 glVertex 0 , 0;
3208 glVertex 0 , $h;
3209 glVertex $w, $h;
3210 glVertex $w, 0;
3211 glEnd;
3212 3683
3213 glTranslate 2 - 0.375, 2 - 0.375; 3684 glTranslate 2, 2;
3214 3685
3215 $self->SUPER::_draw; 3686 $self->SUPER::_draw;
3216} 3687}
3217 3688
3218############################################################################# 3689#############################################################################
3219 3690
3220package CFPlus::UI::Face; 3691package DC::UI::Face;
3221 3692
3222our @ISA = CFPlus::UI::DrawBG::; 3693our @ISA = DC::UI::DrawBG::;
3223 3694
3224use CFPlus::OpenGL; 3695use DC::OpenGL;
3225 3696
3226sub new { 3697sub new {
3227 my $class = shift; 3698 my $class = shift;
3228 3699
3229 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3701 size_w => 32,
3702 size_h => 8,
3230 aspect => 1, 3703 aspect => 1,
3231 can_events => 0, 3704 can_events => 0,
3232 @_, 3705 @_,
3233 ); 3706 );
3234 3707
3235 if ($self->{anim} && $self->{animspeed}) { 3708 if ($self->{anim} && $self->{animspeed}) {
3236 Scalar::Util::weaken (my $widget = $self); 3709 DC::weaken (my $widget = $self);
3237 3710
3238 $self->{timer} = Event->timer ( 3711 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3239 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3712 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3240 hard => 1, 3713 return unless $::CONN;
3241 interval => $self->{animspeed}, 3714
3242 cb => sub { 3715 my $w = $widget
3716 or return;
3717
3243 ++$widget->{frame}; 3718 ++$w->{frame};
3719 $w->update_face;
3720
3721 # somehow, $widget can go away
3244 $widget->update; 3722 $w->update;
3245 }, 3723 $w->update_timer;
3246 ); 3724 };
3725
3726 $self->update_face;
3727 $self->update_timer;
3247 } 3728 }
3248 3729
3249 $self 3730 $self
3250} 3731}
3251 3732
3733sub update_timer {
3734 my ($self) = @_;
3735
3736 return unless $self->{timer};
3737
3738 if ($self->{visible}) {
3739 $self->{timer}->start;
3740 } else {
3741 $self->{timer}->stop;
3742 }
3743}
3744
3745sub update_face {
3746 my ($self) = @_;
3747
3748 if ($::CONN) {
3749 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3750 if ($anim && @$anim) {
3751 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3752 delete $self->{face_change_cb};
3753
3754 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3755 unless ($tex->{name} || $tex->{loading}) {
3756 $tex->upload (sub { $self->reconfigure });
3757 }
3758 }
3759 }
3760 }
3761 }
3762}
3763
3252sub size_request { 3764sub size_request {
3253 (32, 8) 3765 my ($self) = @_;
3766
3767 if ($::CONN) {
3768 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3769 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3770 if ($tex->{name}) {
3771 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3772 } elsif (!$tex->{loading}) {
3773 $tex->upload (sub { $self->reconfigure });
3774 }
3775 }
3776
3777 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3778 }
3779 }
3780
3781 ($self->{size_w} || 8, $self->{size_h} || 8)
3254} 3782}
3255 3783
3256sub update { 3784sub update {
3257 my ($self) = @_; 3785 my ($self) = @_;
3258 3786
3259 return unless $self->{visible}; 3787 return unless $self->{visible};
3260 3788
3261 $self->SUPER::update; 3789 $self->SUPER::update;
3262} 3790}
3263 3791
3792sub invoke_visibility_change {
3793 my ($self) = @_;
3794
3795 $self->update_timer;
3796
3797 0
3798}
3799
3264sub _draw { 3800sub _draw {
3265 my ($self) = @_; 3801 my ($self) = @_;
3266 3802
3267 return unless $::CONN;
3268
3269 $self->SUPER::_draw; 3803 $self->SUPER::_draw;
3270 3804
3271 my $face; 3805 if (my $tex = $self->{tex}) {
3272
3273 if ($self->{frame}) {
3274 my $anim = $::CONN->{anim}[$self->{anim}];
3275
3276 $face = $anim->[ $self->{frame} % @$anim ]
3277 if $anim && @$anim;
3278 }
3279
3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3281
3282 if ($tex) {
3283 glEnable GL_TEXTURE_2D; 3806 glEnable GL_TEXTURE_2D;
3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3807 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285 glColor 0, 0, 0, 1; 3808 glColor 0, 0, 0, 1;
3286 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3809 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3287 glDisable GL_TEXTURE_2D; 3810 glDisable GL_TEXTURE_2D;
3289} 3812}
3290 3813
3291sub destroy { 3814sub destroy {
3292 my ($self) = @_; 3815 my ($self) = @_;
3293 3816
3294 $self->{timer}->cancel 3817 (delete $self->{timer})->cancel
3295 if $self->{timer}; 3818 if $self->{timer};
3296 3819
3297 $self->SUPER::destroy; 3820 $self->SUPER::destroy;
3298} 3821}
3299 3822
3300############################################################################# 3823#############################################################################
3301 3824
3302package CFPlus::UI::Buttonbar; 3825package DC::UI::Buttonbar;
3303 3826
3304our @ISA = CFPlus::UI::HBox::; 3827our @ISA = DC::UI::HBox::;
3305 3828
3306# TODO: should actually wrap buttons and other goodies. 3829# TODO: should actually wrap buttons and other goodies.
3307 3830
3308############################################################################# 3831#############################################################################
3309 3832
3310package CFPlus::UI::Menu; 3833package DC::UI::Menu;
3311 3834
3312our @ISA = CFPlus::UI::Toplevel::; 3835our @ISA = DC::UI::Toplevel::;
3313 3836
3314use CFPlus::OpenGL; 3837use DC::OpenGL;
3315 3838
3316sub new { 3839sub new {
3317 my $class = shift; 3840 my $class = shift;
3318 3841
3319 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3320 items => [], 3843 items => [],
3321 z => 100, 3844 z => 100,
3322 @_, 3845 @_,
3323 ); 3846 );
3324 3847
3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3848 $self->add ($self->{vbox} = new DC::UI::VBox);
3326 3849
3327 for my $item (@{ $self->{items} }) { 3850 for my $item (@{ $self->{items} }) {
3328 my ($widget, $cb, $tooltip) = @$item; 3851 my ($widget, $cb, $tooltip) = @$item;
3329 3852
3330 # handle various types of items, only text for now 3853 # handle various types of items, only text for now
3331 if (!ref $widget) { 3854 if (!ref $widget) {
3332 if ($widget =~ /\t/) { 3855 if ($widget =~ /\t/) {
3333 my ($left, $right) = split /\t/, $widget, 2; 3856 my ($left, $right) = split /\t/, $widget, 2;
3334 3857
3335 $widget = new CFPlus::UI::HBox 3858 $widget = new DC::UI::HBox
3336 can_hover => 1, 3859 can_hover => 1,
3337 can_events => 1, 3860 can_events => 1,
3338 tooltip => $tooltip, 3861 tooltip => $tooltip,
3339 children => [ 3862 children => [
3340 (new CFPlus::UI::Label markup => $left, expand => 1), 3863 (new DC::UI::Label markup => $left, expand => 1),
3341 (new CFPlus::UI::Label markup => $right, align => +1), 3864 (new DC::UI::Label markup => $right, align => 1),
3342 ], 3865 ],
3343 ; 3866 ;
3344 3867
3345 } else { 3868 } else {
3346 $widget = new CFPlus::UI::Label 3869 $widget = new DC::UI::Label
3347 can_hover => 1, 3870 can_hover => 1,
3348 can_events => 1, 3871 can_events => 1,
3872 align => 0,
3349 markup => $widget, 3873 markup => $widget,
3350 tooltip => $tooltip; 3874 tooltip => $tooltip;
3351 } 3875 }
3352 } 3876 }
3353 3877
3399 1 3923 1
3400} 3924}
3401 3925
3402############################################################################# 3926#############################################################################
3403 3927
3404package CFPlus::UI::Multiplexer; 3928package DC::UI::Multiplexer;
3405 3929
3406our @ISA = CFPlus::UI::Container::; 3930our @ISA = DC::UI::Container::;
3407 3931
3408sub new { 3932sub new {
3409 my $class = shift; 3933 my $class = shift;
3410 3934
3411 my $self = $class->SUPER::new ( 3935 my $self = $class->SUPER::new (
3472 $self->{current}->draw; 3996 $self->{current}->draw;
3473} 3997}
3474 3998
3475############################################################################# 3999#############################################################################
3476 4000
3477package CFPlus::UI::Notebook; 4001package DC::UI::Notebook;
3478 4002
4003use DC::OpenGL;
4004
3479our @ISA = CFPlus::UI::VBox::; 4005our @ISA = DC::UI::VBox::;
3480 4006
3481sub new { 4007sub new {
3482 my $class = shift; 4008 my $class = shift;
3483 4009
3484 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3485 buttonbar => (new CFPlus::UI::Buttonbar), 4011 buttonbar => (new DC::UI::Buttonbar),
3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4012 multiplexer => (new DC::UI::Multiplexer expand => 1),
4013 active_outline => [.7, .7, 0.2],
3487 # filter => # will be put between multiplexer and $self 4014 # filter => # will be put between multiplexer and $self
3488 @_, 4015 @_,
3489 ); 4016 );
3490 4017
3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4018 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3492 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4019 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3493 4020
4021 {
4022 Scalar::Util::weaken (my $wself = $self);
4023
4024 $self->{multiplexer}->connect (c_add => sub {
4025 my ($mplex, $widgets) = @_;
4026
4027 for my $child (@$widgets) {
4028 Scalar::Util::weaken $child;
4029 $child->{c_tab_} ||= do {
4030 my $tab =
4031 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4032 ? $child->{c_tab}
4033 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4034
4035 $tab->connect (activate => sub {
4036 $wself->set_current_page ($child);
4037 });
4038
4039 $tab
4040 };
4041
4042 $self->{buttonbar}->add ($child->{c_tab_});
4043 }
4044 });
4045
4046 $self->{multiplexer}->connect (c_remove => sub {
4047 my ($mplex, $widgets) = @_;
4048
4049 for my $child (@$widgets) {
4050 $wself->{buttonbar}->remove ($child->{c_tab_});
4051 }
4052 });
4053 }
4054
3494 $self 4055 $self
3495} 4056}
3496 4057
3497sub add { 4058sub add {
4059 my ($self, @widgets) = @_;
4060
4061 $self->{multiplexer}->add (@widgets)
4062}
4063
4064sub remove {
4065 my ($self, @widgets) = @_;
4066
4067 $self->{multiplexer}->remove (@widgets)
4068}
4069
4070sub pages {
4071 my ($self) = @_;
4072 $self->{multiplexer}->children
4073}
4074
4075sub page_index {
4076 my ($self, $widget) = @_;
4077
4078 my $i = 0;
4079 for ($self->pages) {
4080 if ($_ eq $widget) { return $i };
4081 $i++;
4082 }
4083
4084 undef
4085}
4086
4087sub add_tab {
3498 my ($self, $title, $widget, $tooltip) = @_; 4088 my ($self, $title, $widget, $tooltip) = @_;
3499 4089
3500 Scalar::Util::weaken $self; 4090 $title = [$title, $tooltip] unless ref $title;
4091 $widget->{c_tab} = $title;
3501 4092
3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3503 markup => $title,
3504 tooltip => $tooltip,
3505 on_activate => sub { $self->set_current_page ($widget) },
3506 );
3507
3508 $self->{multiplexer}->add ($widget); 4093 $self->add ($widget);
3509} 4094}
3510 4095
3511sub get_current_page { 4096sub get_current_page {
3512 my ($self) = @_; 4097 my ($self) = @_;
3513 4098
3519 4104
3520 $self->{multiplexer}->set_current_page ($page); 4105 $self->{multiplexer}->set_current_page ($page);
3521 $self->emit (page_changed => $self->{multiplexer}{current}); 4106 $self->emit (page_changed => $self->{multiplexer}{current});
3522} 4107}
3523 4108
4109sub _draw {
4110 my ($self) = @_;
4111
4112 $self->SUPER::_draw ();
4113
4114 if (my $cur = $self->{multiplexer}{current}) {
4115 if ($cur = $cur->{c_tab_}) {
4116 glTranslate $self->{buttonbar}{x} + $cur->{x},
4117 $self->{buttonbar}{y} + $cur->{y};
4118 glLineWidth 3;
4119 #glEnable GL_BLEND;
4120 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4121 glColor @{$self->{active_outline}};
4122 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4123 glLineWidth 1;
4124 #glDisable GL_BLEND;
4125 }
4126 }
4127}
4128
3524############################################################################# 4129#############################################################################
3525 4130
3526package CFPlus::UI::Selector; 4131package DC::UI::Selector;
3527 4132
3528use utf8; 4133use utf8;
3529 4134
3530our @ISA = CFPlus::UI::Button::; 4135our @ISA = DC::UI::Button::;
3531 4136
3532sub new { 4137sub new {
3533 my $class = shift; 4138 my $class = shift;
3534 4139
3535 my $self = $class->SUPER::new ( 4140 my $self = $class->SUPER::new (
3552 my ($value, $title, $tooltip) = @$_; 4157 my ($value, $title, $tooltip) = @$_;
3553 4158
3554 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4159 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3555 } 4160 }
3556 4161
3557 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4162 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3558} 4163}
3559 4164
3560sub _set_value { 4165sub _set_value {
3561 my ($self, $value) = @_; 4166 my ($self, $value) = @_;
3562 4167
3563 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4168 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4169 $item ||= $self->{options}[0]
3564 or return; 4170 or return;
3565 4171
3566 $self->{value} = $item->[0]; 4172 $self->{value} = $item->[0];
3567 $self->set_markup ("$item->[1] ⇓"); 4173 $self->set_markup ("$item->[1] ⇓");
3568 $self->set_tooltip ($item->[2]); 4174# $self->set_tooltip ($item->[2]);
3569} 4175}
3570 4176
3571sub set_value { 4177sub set_value {
3572 my ($self, $value) = @_; 4178 my ($self, $value) = @_;
3573 4179
3575 4181
3576 $self->_set_value ($value); 4182 $self->_set_value ($value);
3577 $self->emit (changed => $value); 4183 $self->emit (changed => $value);
3578} 4184}
3579 4185
4186sub set_options {
4187 my ($self, $options) = @_;
4188
4189 $self->{options} = $options;
4190 $self->_set_value ($self->{value});
4191}
4192
3580############################################################################# 4193#############################################################################
3581 4194
3582package CFPlus::UI::Statusbox; 4195package DC::UI::Statusbox;
3583 4196
3584our @ISA = CFPlus::UI::VBox::; 4197our @ISA = DC::UI::VBox::;
3585 4198
3586sub new { 4199sub new {
3587 my $class = shift; 4200 my $class = shift;
3588 4201
3589 my $self = $class->SUPER::new ( 4202 my $self = $class->SUPER::new (
3590 fontsize => 0.8, 4203 fontsize => 0.8,
3591 @_, 4204 @_,
3592 ); 4205 );
3593 4206
3594 Scalar::Util::weaken (my $this = $self); 4207 DC::weaken (my $this = $self);
3595 4208
3596 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4209 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3597 4210
3598 $self 4211 $self
3599} 4212}
3600 4213
3601sub reorder { 4214sub reorder {
3602 my ($self) = @_; 4215 my ($self) = @_;
3603 my $NOW = Time::HiRes::time; 4216 my $NOW = Time::HiRes::time;
3604 4217
3605 # freeze display when hovering over any label 4218 # freeze display when hovering over any label
3606 return if $CFPlus::UI::TOOLTIP->{owner} 4219 return if $DC::UI::TOOLTIP->{owner}
3607 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4220 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3608 values %{ $self->{item} }; 4221 values %{ $self->{item} };
3609 4222
3610 while (my ($k, $v) = each %{ $self->{item} }) { 4223 while (my ($k, $v) = each %{ $self->{item} }) {
3611 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4224 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3612 } 4225 }
4226
4227 $self->{timer}->set (1, 1);
3613 4228
3614 my @widgets; 4229 my @widgets;
3615 4230
3616 my @items = sort { 4231 my @items = sort {
3617 $a->{pri} <=> $b->{pri} 4232 $a->{pri} <=> $b->{pri}
3618 or $b->{id} <=> $a->{id} 4233 or $b->{id} <=> $a->{id}
3619 } values %{ $self->{item} }; 4234 } values %{ $self->{item} };
3620
3621 $self->{timer}->interval (1);
3622 4235
3623 my $count = 10 + 1; 4236 my $count = 10 + 1;
3624 for my $item (@items) { 4237 for my $item (@items) {
3625 last unless --$count; 4238 last unless --$count;
3626 4239
3633 for ($short) { 4246 for ($short) {
3634 s/^\s+//; 4247 s/^\s+//;
3635 s/\s+/ /g; 4248 s/\s+/ /g;
3636 } 4249 }
3637 4250
3638 new CFPlus::UI::Label 4251 new DC::UI::Label
3639 markup => $short, 4252 markup => $short,
3640 tooltip => $item->{tooltip}, 4253 tooltip => $item->{tooltip},
3641 tooltip_font => $::FONT_PROP, 4254 tooltip_font => $::FONT_PROP,
3642 tooltip_width => 0.67, 4255 tooltip_width => 0.67,
3643 fontsize => $item->{fontsize} || $self->{fontsize}, 4256 fontsize => $item->{fontsize} || $self->{fontsize},
3644 max_w => $::WIDTH * 0.44, 4257 max_w => $::WIDTH * 0.44,
4258 align => 0,
3645 fg => [@{ $item->{fg} }], 4259 fg => [@{ $item->{fg} }],
3646 can_events => 1, 4260 can_events => 1,
3647 can_hover => 1 4261 can_hover => 1
3648 }; 4262 };
3649 4263
3650 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4264 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3651 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4265 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3652 $label->update; 4266 $label->update;
3653 $label->set_max_size (undef, $label->{req_h} * $diff) 4267 $label->set_max_size (undef, $label->{req_h} * $diff)
3654 if $diff < 1; 4268 if $diff < 1;
3655 $self->{timer}->interval (1/30); 4269 $self->{timer}->set (1/30, 1/30);
3656 } else { 4270 } else {
3657 $label->{fg}[3] = $item->{fg}[3] || 1; 4271 $label->{fg}[3] = $item->{fg}[3] || 1;
3658 } 4272 }
3659 4273
3660 push @widgets, $label; 4274 push @widgets, $label;
3722 $self->SUPER::destroy; 4336 $self->SUPER::destroy;
3723} 4337}
3724 4338
3725############################################################################# 4339#############################################################################
3726 4340
3727package CFPlus::UI::Inventory;
3728
3729our @ISA = CFPlus::UI::Table::;
3730
3731sub new {
3732 my $class = shift;
3733
3734 my $self = $class->SUPER::new (
3735 col_expand => [0, 1, 0],
3736 items => [],
3737 @_,
3738 );
3739
3740 $self->set_sort_order (undef);
3741
3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3778}
3779
3780sub set_items {
3781 my ($self, $items) = @_;
3782
3783 $self->{items} = [$items ? values %$items : ()];
3784 $self->update_items;
3785}
3786
3787#############################################################################
3788
3789package CFPlus::UI::SpellList;
3790
3791our @ISA = CFPlus::UI::Table::;
3792
3793sub new {
3794 my $class = shift;
3795
3796 my $self = $class->SUPER::new (
3797 binding => [],
3798 commands => [],
3799 @_,
3800 )
3801}
3802
3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816sub rebuild_spell_list {
3817 my ($self) = @_;
3818
3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3820 $self->clear;
3821
3822 return unless $::CONN;
3823
3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830 my $row = 0;
3831
3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833 my $spell = $self->{spell}{$_};
3834
3835 $row++;
3836
3837 my $spell_cb = sub {
3838 my ($widget, $ev) = @_;
3839
3840 if ($ev->{button} == 1) {
3841 $::CONN->user_send ("cast $spell->{name}");
3842 } elsif ($ev->{button} == 2) {
3843 $::CONN->user_send ("invoke $spell->{name}");
3844 } elsif ($ev->{button} == 3) {
3845 (new CFPlus::UI::Menu
3846 items => [
3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849 ],
3850 )->popup ($ev);
3851 } else {
3852 return 0;
3853 }
3854
3855 1
3856 };
3857
3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860 #TODO: add path info to tooltip
3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863 $self->add (0, $row, new CFPlus::UI::Face
3864 face => $spell->{face},
3865 can_hover => 1,
3866 can_events => 1,
3867 tooltip => $tooltip,
3868 on_button_down => $spell_cb,
3869 );
3870
3871 $self->add (1, $row, new CFPlus::UI::Label
3872 expand => 1,
3873 text => $spell->{name},
3874 can_hover => 1,
3875 can_events => 1,
3876 tooltip => $tooltip,
3877 on_button_down => $spell_cb,
3878 );
3879
3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884 }
3885 });
3886}
3887
3888sub add_spell {
3889 my ($self, $spell) = @_;
3890
3891 $self->{spell}->{$spell->{name}} = $spell;
3892 $self->rebuild_spell_list;
3893}
3894
3895sub remove_spell {
3896 my ($self, $spell) = @_;
3897
3898 delete $self->{spell}->{$spell->{name}};
3899 $self->rebuild_spell_list;
3900}
3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3909#############################################################################
3910
3911package CFPlus::UI::Root; 4341package DC::UI::Root;
3912 4342
3913our @ISA = CFPlus::UI::Container::; 4343our @ISA = DC::UI::Container::;
3914 4344
3915use List::Util qw(min max); 4345use List::Util qw(min max);
3916 4346
3917use CFPlus::OpenGL; 4347use DC::OpenGL;
3918 4348
3919sub new { 4349sub new {
3920 my $class = shift; 4350 my $class = shift;
3921 4351
3922 my $self = $class->SUPER::new ( 4352 my $self = $class->SUPER::new (
3923 visible => 1, 4353 visible => 1,
3924 @_, 4354 @_,
3925 ); 4355 );
3926 4356
3927 Scalar::Util::weaken ($self->{root} = $self); 4357 DC::weaken ($self->{root} = $self);
3928 4358
3929 $self 4359 $self
3930} 4360}
3931 4361
3932sub size_request { 4362sub size_request {
3980} 4410}
3981 4411
3982sub update { 4412sub update {
3983 my ($self) = @_; 4413 my ($self) = @_;
3984 4414
3985 $::WANT_REFRESH++; 4415 $::WANT_REFRESH = 1;
3986} 4416}
3987 4417
3988sub add { 4418sub add {
3989 my ($self, @children) = @_; 4419 my ($self, @children) = @_;
3990 4420
4027 while ($self->{refresh_hook}) { 4457 while ($self->{refresh_hook}) {
4028 $_->() 4458 $_->()
4029 for values %{delete $self->{refresh_hook}}; 4459 for values %{delete $self->{refresh_hook}};
4030 } 4460 }
4031 4461
4032 if ($self->{realloc}) { 4462 while ($self->{realloc}) {
4033 my %queue; 4463 my %queue;
4034 my @queue; 4464 my @queue;
4035 my $widget; 4465 my $widget;
4036 4466
4037 outer: 4467 outer:
4057 4487
4058 delete $queue{$widget+0}; 4488 delete $queue{$widget+0};
4059 4489
4060 my ($w, $h) = $widget->size_request; 4490 my ($w, $h) = $widget->size_request;
4061 4491
4062 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4492 $w += $widget->{padding_x} * 2;
4063 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4493 $h += $widget->{padding_y} * 2;
4494
4495 $w = max $widget->{min_w}, $w;
4496 $h = max $widget->{min_h}, $h;
4064 4497
4065 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4498 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4066 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4499 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4067 4500
4068 $w = $widget->{force_w} if exists $widget->{force_w}; 4501 $w = $widget->{force_w} if exists $widget->{force_w};
4084 } 4517 }
4085 } 4518 }
4086 4519
4087 delete $self->{realloc}{$widget+0}; 4520 delete $self->{realloc}{$widget+0};
4088 } 4521 }
4089 }
4090 4522
4091 while (my $size_alloc = delete $self->{size_alloc}) { 4523 while (my $size_alloc = delete $self->{size_alloc}) {
4092 my @queue = sort { $b->{visible} <=> $a->{visible} } 4524 my @queue = sort { $a->{visible} <=> $b->{visible} }
4093 values %$size_alloc; 4525 values %$size_alloc;
4094 4526
4095 while () { 4527 while () {
4096 my $widget = pop @queue || last; 4528 my $widget = pop @queue || last;
4097 4529
4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4530 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4099 4531
4100 $w = 0 if $w < 0;
4101 $h = 0 if $h < 0;
4102
4103 $w = max $widget->{min_w}, $w; 4532 $w = max $widget->{min_w}, $w;
4104 $h = max $widget->{min_h}, $h; 4533 $h = max $widget->{min_h}, $h;
4105 4534
4106# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4535# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4536# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108 4537
4109 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4538 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4539 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111 4540
4112 $w = int $w + 0.5; 4541 $w = int $w + 0.5;
4113 $h = int $h + 0.5; 4542 $h = int $h + 0.5;
4114 4543
4115 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4544 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4116 $widget->{old_w} = $widget->{w}; 4545 $widget->{old_w} = $widget->{w};
4117 $widget->{old_h} = $widget->{h}; 4546 $widget->{old_h} = $widget->{h};
4118 4547
4119 $widget->{w} = $w; 4548 $widget->{w} = $w;
4120 $widget->{h} = $h; 4549 $widget->{h} = $h;
4121 4550
4122 $widget->emit (size_allocate => $w, $h); 4551 $widget->emit (size_allocate => $w, $h);
4552 }
4123 } 4553 }
4124 } 4554 }
4125 } 4555 }
4126 4556
4127 while ($self->{post_alloc_hook}) { 4557 while ($self->{post_alloc_hook}) {
4128 $_->() 4558 $_->()
4129 for values %{delete $self->{post_alloc_hook}}; 4559 for values %{delete $self->{post_alloc_hook}};
4130 } 4560 }
4131
4132 4561
4133 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4562 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4134 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4563 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4135 glClear GL_COLOR_BUFFER_BIT; 4564 glClear GL_COLOR_BUFFER_BIT;
4136 4565
4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4568 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4140 glMatrixMode GL_MODELVIEW; 4569 glMatrixMode GL_MODELVIEW;
4141 glLoadIdentity; 4570 glLoadIdentity;
4142 4571
4143 { 4572 {
4144 package CFPlus::UI::Base; 4573 package DC::UI::Base;
4145 4574
4146 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4575 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4147 (0, 0, $self->{w}, $self->{h}); 4576 (0, 0, $self->{w}, $self->{h});
4148 4577
4149 $self->_draw; 4578 $self->_draw;
4150 } 4579 }
4151} 4580}
4152 4581
4153############################################################################# 4582#############################################################################
4154 4583
4155package CFPlus::UI; 4584package DC::UI;
4156 4585
4157$ROOT = new CFPlus::UI::Root; 4586$ROOT = new DC::UI::Root;
4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4587$TOOLTIP = new DC::UI::Tooltip z => 900;
4159 4588
41601 45891
4161 4590

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines