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.351 by root, Sun Oct 1 12:08:58 2006 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFPlus; 8use DC;
11use CFPlus::Pod; 9use DC::Pod;
12use CFPlus::Texture; 10use DC::Texture;
13 11
14our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
15 13
16our $LAYOUT; 14our $LAYOUT;
17our $ROOT; 15our $ROOT;
18our $TOOLTIP; 16our $TOOLTIP;
19our $BUTTON_STATE; 17our $BUTTON_STATE;
20 18
21our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
22 20
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
24 if (!$GRAB) { 24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 29 $TOOLTIP->hide;
29 30
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 33
32 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
33 35
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 37 $TOOLTIP->show;
40 } 38 }
41 39
42 return; 40 return;
43 } 41 }
44 } 42 }
45 } 43 }
46 44
47 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
49}); 48};
50 49
51sub get_layout { 50sub get_layout {
52 my $layout; 51 my $layout;
53 52
54 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
89 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
90 89
91 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
93 92
94 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
95 } 94 }
96} 95}
97 96
98sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
99 my ($ev) = @_; 98 my ($ev) = @_;
… …
105 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
106 105
107 $GRAB = $widget; 106 $GRAB = $widget;
108 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
109 108
110 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
111 } 110 }
112 111
113 if ($GRAB) { 112 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 114 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
118 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
119 } else { 122 } else {
120 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
121 } 124 }
122 } 125 }
… …
136 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
137 $grab->update if $grab; 140 $grab->update if $grab;
138 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
139 142
140 check_hover $widget; 143 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
142 } 145 }
143} 146}
144 147
145sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
146 my ($ev) = @_; 149 my ($ev) = @_;
… …
208 reconfigure_widgets; 211 reconfigure_widgets;
209} 212}
210 213
211############################################################################# 214#############################################################################
212 215
213package CFPlus::UI::Event; 216package DC::UI::Event;
214 217
215sub xy { 218sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217} 220}
218 221
219############################################################################# 222#############################################################################
220 223
221package CFPlus::UI::Base; 224package DC::UI::Base;
222 225
223use strict; 226use strict;
224 227
225use CFPlus::OpenGL; 228use DC::OpenGL;
226 229
227sub new { 230sub new {
228 my $class = shift; 231 my $class = shift;
229 232
230 my $self = bless { 233 my $self = bless {
… …
235 h => undef, 238 h => undef,
236 can_events => 1, 239 can_events => 1,
237 @_ 240 @_
238 }, $class; 241 }, $class;
239 242
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
241 244
242 for (keys %$self) { 245 for (keys %$self) {
243 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
245 } 248 }
246 } 249 }
247 250
248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
253 256
254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
256 259
257 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
262 265
263sub destroy { 266sub destroy {
264 my ($self) = @_; 267 my ($self) = @_;
265 268
266 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
267 %$self = (); 271 %$self = ();
268} 272}
269 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
270sub show { 278sub show {
271 my ($self) = @_; 279 my ($self) = @_;
272 280
273 return if $self->{parent}; 281 return if $self->{parent};
274 282
275 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
276} 284}
277 285
278sub set_visible { 286sub set_visible {
279 my ($self) = @_; 287 my ($self) = @_;
280 288
… …
301 delete $self->{root}; 309 delete $self->{root};
302 310
303 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
304 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
305 313
306 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
307 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
308 316
309 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
310 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
311} 319}
… …
313sub set_visibility { 321sub set_visibility {
314 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
315 323
316 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
317 325
318 $visible ? $self->hide 326 $visible ? $self->show
319 : $self->show; 327 : $self->hide;
320} 328}
321 329
322sub toggle_visibility { 330sub toggle_visibility {
323 my ($self) = @_; 331 my ($self) = @_;
324 332
… …
330sub hide { 338sub hide {
331 my ($self) = @_; 339 my ($self) = @_;
332 340
333 $self->set_invisible; 341 $self->set_invisible;
334 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
335 $self->{parent}->remove ($self) 346 $parent->remove ($self);
336 if $self->{parent}; 347 }
337} 348}
338 349
339sub move_abs { 350sub move_abs {
340 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
341 352
… …
353 $self->{force_h} = $h; 364 $self->{force_h} = $h;
354 365
355 $self->realloc; 366 $self->realloc;
356} 367}
357 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 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,
… …
514); 549);
515 550
516sub emit { 551sub emit {
517 my ($self, $signal, @args) = @_; 552 my ($self, $signal, @args) = @_;
518 553
519 # I do not really like this solution, but I dislike duplication 554 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 555 # and needlessly verbose code, either.
521 my @append 556 my @append
522 = $has_coords{$signal} 557 = $has_coords{$signal}
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 #d##TODO# stop propagating at first true, do not use sum 563 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 564 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 565 ($self->can ("invoke_$signal") || sub { 1 }), # closure
566 ) {
567 return $cb->($self, @args, @append) || next;
568 }
569
570 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 572}
533 573
534sub find_widget { 574#sub find_widget {
535 my ($self, $x, $y) = @_; 575# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 576
546sub set_parent { 577sub set_parent {
547 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
548 579
549 Scalar::Util::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
551} 582}
552 583
553sub realloc { 584sub realloc {
554 my ($self) = @_; 585 my ($self) = @_;
… …
580 611
581# 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
582# functions seems pointless. 613# functions seems pointless.
583our ($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
584 615
585sub draw { 616#sub draw {
586 my ($self) = @_; 617#CFPlus.xs
587
588 return unless $self->{h} && $self->{w};
589
590 # update screen rectangle
591 local $draw_x = $draw_x + $self->{x};
592 local $draw_y = $draw_y + $self->{y};
593
594 # skip widgets that are entirely outside the drawing area
595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598 glPushMatrix;
599 glTranslate $self->{x}, $self->{y}, 0;
600
601 if ($self == $HOVER && $self->{can_hover}) {
602 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603 glEnable GL_BLEND;
604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glBegin GL_QUADS;
606 glVertex 0 , 0;
607 glVertex $self->{w}, 0;
608 glVertex $self->{w}, $self->{h};
609 glVertex 0 , $self->{h};
610 glEnd;
611 glDisable GL_BLEND;
612 }
613
614 if ($ENV{CFPLUS_DEBUG} & 1) {
615 glPushMatrix;
616 glColor 1, 1, 0, 1;
617 glTranslate 0.375, 0.375;
618 glBegin GL_LINE_LOOP;
619 glVertex 0 , 0;
620 glVertex $self->{w} - 1, 0;
621 glVertex $self->{w} - 1, $self->{h} - 1;
622 glVertex 0 , $self->{h} - 1;
623 glEnd;
624 glPopMatrix;
625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626 }
627
628 $self->_draw;
629 glPopMatrix;
630}
631 618
632sub _draw { 619sub _draw {
633 my ($self) = @_; 620 my ($self) = @_;
634 621
635 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
636} 623}
637 624
638sub DESTROY { 625sub DESTROY {
639 my ($self) = @_; 626 my ($self) = @_;
640 627
641 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
642 629
643 delete $WIDGET{$self+0}; 630 local $@;
644
645 eval { $self->destroy }; 631 eval { $self->destroy };
646 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};
647} 635}
648 636
649############################################################################# 637#############################################################################
650 638
651package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
652 640
653our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
654 642
655use strict; 643use strict;
656use CFPlus::OpenGL; 644use DC::OpenGL;
657 645
658sub new { 646sub new {
659 my $class = shift; 647 my $class = shift;
660
661 # range [value, low, high, page]
662 648
663 $class->SUPER::new ( 649 $class->SUPER::new (
664 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
665 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
666 @_ 652 @_
… …
678 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
679 665
680 glEnable GL_BLEND; 666 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 668 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 670 glDisable GL_BLEND;
692 } 671 }
693} 672}
694 673
695############################################################################# 674#############################################################################
696 675
697package CFPlus::UI::Empty; 676package DC::UI::Empty;
698 677
699our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
700 679
701sub new { 680sub new {
702 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
703 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
704} 683}
… …
711 690
712sub draw { } 691sub draw { }
713 692
714############################################################################# 693#############################################################################
715 694
716package CFPlus::UI::Container; 695package DC::UI::Container;
717 696
718our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
719 698
720sub new { 699sub new {
721 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
722 701
723 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
727 can_events => 0, 706 can_events => 0,
728 %arg, 707 %arg,
729 ); 708 );
730 709
731 $self->add (@$children) 710 $self->add (@$children)
732 if $children; 711 if $children && @$children;
733 712
734 $self 713 $self
735} 714}
736 715
737sub realloc { 716sub realloc {
… …
746 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
747 726
748 $_->set_parent ($self) 727 $_->set_parent ($self)
749 for @widgets; 728 for @widgets;
750 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 731 use sort 'stable';
752 732
753 $self->{children} = [ 733 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
756 ]; 736 ];
757 737
758 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
759} 743}
760 744
761sub children { 745sub children {
762 @{ $_[0]{children} } 746 @{ $_[0]{children} }
763} 747}
764 748
765sub remove { 749sub remove {
766 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
767 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
768 delete $child->{parent}; 755 delete $child->{parent};
769 $child->hide; 756 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
772 759
773 $self->realloc; 760 $self->realloc;
774} 761}
775 762
776sub clear { 763sub clear {
777 my ($self) = @_; 764 my ($self) = @_;
778 765
779 my $children = delete $self->{children}; 766 my $children = $self->{children};
780 $self->{children} = []; 767 $self->{children} = [];
781 768
782 for (@$children) { 769 for (@$children) {
783 delete $_->{parent}; 770 delete $_->{parent};
784 $_->hide; 771 $_->hide;
… …
804} 791}
805 792
806sub _draw { 793sub _draw {
807 my ($self) = @_; 794 my ($self) = @_;
808 795
809 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
810} 797}
811 798
812############################################################################# 799#############################################################################
813 800
814package CFPlus::UI::Bin; 801package DC::UI::Bin;
815 802
816our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
817 804
818sub new { 805sub new {
819 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
820 807
821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
822 809
823 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
824} 811}
825 812
826sub add { 813sub add {
827 my ($self, $child) = @_; 814 my ($self, $child) = @_;
828 815
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
830 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
831} 818}
832 819
833sub remove { 820sub remove {
834 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
835 822
836 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
837 824
838 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
839 unless @{$self->{children}}; 826 unless @{$self->{children}};
840} 827}
841 828
842sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
843 830
… …
852 839
853 1 840 1
854} 841}
855 842
856############################################################################# 843#############################################################################
857
858# back-buffered drawing area 844# back-buffered drawing area
859 845
860package CFPlus::UI::Window; 846package DC::UI::Window;
861 847
862our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
863 849
864use CFPlus::OpenGL; 850use DC::OpenGL;
865 851
866sub new { 852sub new {
867 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
868 854
869 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
891} 877}
892 878
893sub render_child { 879sub render_child {
894 my ($self) = @_; 880 my ($self) = @_;
895 881
896 $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 {
897 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
898 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
899 885
900 { 886 {
901 package CFPlus::UI::Base; 887 package DC::UI::Base;
902 888
903 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
891
892 $self->_render;
905 } 893 }
906
907 $self->_render;
908 }; 894 };
909} 895}
910 896
911sub _draw { 897sub _draw {
912 my ($self) = @_; 898 my ($self) = @_;
… …
923 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
924} 910}
925 911
926############################################################################# 912#############################################################################
927 913
928package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
929 915
916use List::Util qw(min max);
917
930our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
931 919
932sub new { 920sub new {
933 my $class = shift; 921 my $class = shift;
934 922
935 $class->SUPER::new ( 923 $class->SUPER::new (
… …
942sub size_request { 930sub size_request {
943 my ($self) = @_; 931 my ($self) = @_;
944 932
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 934
947 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
949 937
950 ($w, $h) 938 ($w, $h)
951} 939}
952 940
953sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
965} 953}
966 954
967sub set_offset { 955sub set_offset {
968 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
969 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}) {
970 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
972 964
965 $self->emit (changed => $x, $y);
973 $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 }
974} 986}
975 987
976# 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
977sub coord2local { 989sub coord2local {
978 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
994 1006
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1009 ) {
998 $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})
999 } else { 1011 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1001 } 1013 }
1002} 1014}
1003 1015
1004sub _render { 1016sub _render {
1005 my ($self) = @_; 1017 my ($self) = @_;
1006 1018
1007 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};
1008 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};
1009 1021
1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1011 1023
1012 $self->SUPER::_render; 1024 $self->SUPER::_render;
1013} 1025}
1014 1026
1015############################################################################# 1027#############################################################################
1016 1028
1017package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1018 1030
1019our @ISA = CFPlus::UI::HBox::; 1031our @ISA = DC::UI::Table::;
1020 1032
1021sub new { 1033sub new {
1022 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1023 1035
1024 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1025 1037
1026 my $self; 1038 my $self;
1027 1039
1028 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,
1029 vertical => 1, 1054 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1056 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1059 },
1034 ; 1060 ;
1035 1061
1036 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1038 can_events => 1, 1065 can_events => 1,
1039 slider => $slider, 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
1040 %arg, 1070 %arg,
1041 ); 1071 );
1042 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
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1094 $self->SUPER::add ($self->{vp});
1095
1044 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1045 1097
1046 $self 1098 $self
1047} 1099}
1048
1049#TODO# update range on size_allocate depending on child
1050 1100
1051sub add { 1101sub add {
1052 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1053 1103
1054 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1055} 1105}
1056 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
1057sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1059 1161
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $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};
1063 1164
1064 1 1165 1
1065} 1166}
1066 1167
1067sub update_slider { 1168sub invoke_button_down {
1068 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1069 1170
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1171 if ($ev->{button} == 2) {
1071} 1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1072 1175
1073sub update { 1176 0
1074 my ($self) = @_; 1177}
1075 1178
1076 $self->SUPER::update; 1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1077 1181
1078 $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
1079} 1198}
1080 1199
1081sub invoke_size_allocate { 1200sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1083 1202
1084 $self->update_slider; 1203 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1205}
1088 1206
1089############################################################################# 1207#############################################################################
1090 1208
1091package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1092 1210
1093our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1094 1212
1095use CFPlus::OpenGL; 1213use DC::OpenGL;
1096 1214
1097sub new { 1215sub new {
1098 my $class = shift; 1216 my $class = shift;
1099 1217
1100 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1110 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1111 1229
1112 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1124 } 1235 }
1125 1236
1126 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1127} 1238}
1128 1239
1129############################################################################# 1240#############################################################################
1130 1241
1131package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1132 1243
1133our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1134 1245
1135use CFPlus::OpenGL; 1246use DC::OpenGL;
1136 1247
1137sub new { 1248sub new {
1138 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1139 1250
1140 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1142 align => 1, 1253 align => 1,
1143 valign => 0, 1254 valign => 0.5,
1144 text => $arg{label}, 1255 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1146 } 1257 }
1147 1258
1148 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
… …
1158 1269
1159sub add { 1270sub add {
1160 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1161 1272
1162 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1164} 1275}
1165 1276
1166sub border { 1277sub border {
1167 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1168} 1279}
… …
1226 } 1337 }
1227} 1338}
1228 1339
1229############################################################################# 1340#############################################################################
1230 1341
1231package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1232 1343
1233our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1234 1345
1235use CFPlus::OpenGL; 1346use DC::OpenGL;
1236 1347
1237my $bg = 1348my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1239 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1240 1351
1241my @border = 1352my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1243 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);
1244 1359
1245sub new { 1360sub new {
1246 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1247 1362
1248 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
… …
1253 min_w => 64, 1368 min_w => 64,
1254 min_h => 32, 1369 min_h => 32,
1255 %arg, 1370 %arg,
1256 ); 1371 );
1257 1372
1258 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1259 align => 0, 1374 align => 0.5,
1260 valign => 1, 1375 valign => 1,
1261 text => $self->{title}, 1376 text => $self->{title},
1262 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1263 if exists $self->{title}; 1378 if exists $self->{title};
1264 1379
1265 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1266 $self->{close_button} = 1381 $self->{close_button} =
1267 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1268 path => 'x1_close.png', 1383 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1270 1385
1271 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1272 } 1387 }
1273 1388
1274 $self 1389 $self
1275} 1390}
1276 1391
1277sub add { 1392sub add {
1278 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1279 1394
1280 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1281 $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};
1282 $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};
1283} 1398}
1284 1399
1285sub border { 1400sub border {
1286 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
1287} 1411}
1288 1412
1289sub size_request { 1413sub size_request {
1290 my ($self) = @_; 1414 my ($self) = @_;
1291 1415
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1542
1419 my $border = $self->border; 1543 my $border = $self->border;
1420 1544
1421 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $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);
1426 1564
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1429 1567
1430 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1449 if $self->{close_button}; 1587 if $self->{close_button};
1450} 1588}
1451 1589
1452############################################################################# 1590#############################################################################
1453 1591
1454package CFPlus::UI::Table; 1592package DC::UI::Table;
1455 1593
1456our @ISA = CFPlus::UI::Base::; 1594our @ISA = DC::UI::Container::;
1457 1595
1458use List::Util qw(max sum); 1596use List::Util qw(max sum);
1459 1597
1460use CFPlus::OpenGL; 1598use DC::OpenGL;
1461 1599
1462sub new { 1600sub new {
1463 my $class = shift; 1601 my $class = shift;
1464 1602
1465 $class->SUPER::new ( 1603 $class->SUPER::new (
1466 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
1467 @_, 1606 @_,
1468 ) 1607 )
1469} 1608}
1470 1609
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub 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 {
1476 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1477 1625
1478 while (@_) { 1626 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1628
1484 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1485 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1486 $self->realloc;
1487}
1488 1631
1489sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1490 my ($self, $child) = @_; 1639 my ($self) = @_;
1491 1640
1492 # TODO: not yet implemented 1641 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1642
1499 my @children = $self->children; 1643 my @children = $self->children;
1500 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 }
1501 1654 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1655
1507 $self->realloc; 1656 # second pass, rows
1508} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1509
1510sub get_wh {
1511 my ($self) = @_;
1512
1513 my (@w, @h);
1514
1515 for my $y (0 .. $#{$self->{children}}) {
1516 my $row = $self->{children}[$y]
1517 or next;
1518
1519 for my $x (0 .. $#$row) {
1520 my $widget = $row->[$x]
1521 or next;
1522 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1523 1659
1524 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1664 }
1527 } 1665 }
1528 1666
1529 (\@w, \@h) 1667 (\@w, \@h)
1530} 1668}
… …
1546 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1547 1685
1548 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1550 1688
1551 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1555 1693
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1695
1560 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
1561 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1562 1705
1563 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1708
1565 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1566 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)};
1567 or next;
1568 1711
1569 my $x = 0; 1712 $widget->configure (
1570 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1715 );
1572 for my $c (0 .. $#$row) { 1716 }
1573 my $col_w = $ws->[$c];
1574 1717
1575 if (my $widget = $row->[$c]) { 1718 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1577 }
1578 1720
1579 $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};
1580 } 1748 }
1749 }
1581 1750
1582 $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});
1583 } 1782 }
1584 1783
1585 1 1784 1
1586} 1785}
1587 1786
1588sub find_widget {
1589 my ($self, $x, $y) = @_;
1590
1591 $x -= $self->{x};
1592 $y -= $self->{y};
1593
1594 my $res;
1595
1596 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597 $res = $_->find_widget ($x, $y)
1598 and return $res;
1599 }
1600
1601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602}
1603
1604sub _draw {
1605 my ($self) = @_;
1606
1607 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_;
1609 }
1610}
1611
1612############################################################################# 1787#############################################################################
1613 1788
1614package CFPlus::UI::Box; 1789package DC::UI::Box;
1615 1790
1616our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1617 1792
1618sub size_request { 1793sub size_request {
1619 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1620 1797
1621 $self->{vertical} 1798 $self->{vertical}
1622 ? ( 1799 ? (
1623 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1624 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1625 ) 1802 )
1626 : ( 1803 : (
1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1628 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1629 ) 1806 )
1630} 1807}
1631 1808
1632sub invoke_size_allocate { 1809sub invoke_size_allocate {
1633 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1654 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1655 for 0 .. $#children; 1832 for 0 .. $#children;
1656 } 1833 }
1657 } 1834 }
1658 1835
1659 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1660 1837
1661 my $pos = 0; 1838 my $pos = 0;
1662 for (0 .. $#children) { 1839 for (0 .. $#children) {
1663 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1664 $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));
… …
1669 1 1846 1
1670} 1847}
1671 1848
1672############################################################################# 1849#############################################################################
1673 1850
1674package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1675 1852
1676our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1677 1854
1678sub new { 1855sub new {
1679 my $class = shift; 1856 my $class = shift;
1680 1857
1681 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1684 ) 1861 )
1685} 1862}
1686 1863
1687############################################################################# 1864#############################################################################
1688 1865
1689package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1690 1867
1691our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1692 1869
1693sub new { 1870sub new {
1694 my $class = shift; 1871 my $class = shift;
1695 1872
1696 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1699 ) 1876 )
1700} 1877}
1701 1878
1702############################################################################# 1879#############################################################################
1703 1880
1704package CFPlus::UI::Label; 1881package DC::UI::Label;
1705 1882
1706our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1707 1884
1708use CFPlus::OpenGL; 1885use DC::OpenGL;
1709 1886
1710sub new { 1887sub new {
1711 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1712 1889
1713 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1718 #text => initial text 1895 #text => initial text
1719 #markup => initial narkup 1896 #markup => initial narkup
1720 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1721 #style => 0, # render flags 1898 #style => 0, # render flags
1722 ellipsise => 3, # end 1899 ellipsise => 3, # end
1723 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1724 fontsize => 1, 1901 fontsize => 1,
1725 align => -1, 1902 align => 0.5,
1726 valign => -1, 1903 valign => 0.5,
1727 padding_x => 2, 1904 padding_x => 4,
1728 padding_y => 2, 1905 padding_y => 2,
1729 can_events => 0, 1906 can_events => 0,
1730 %arg 1907 %arg
1731 ); 1908 );
1732 1909
1733 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1734 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1735 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1736 $self->{template} = $layout; 1913 $self->{template} = $layout;
1737 } 1914 }
1738 1915
1739 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1757 1934
1758 delete $self->{ox}; 1935 delete $self->{ox};
1759 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1760} 1937}
1761 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1762sub set_text { 1945sub set_text {
1763 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1764 1947
1765 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1766 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
… …
1789 1972
1790sub size_request { 1973sub size_request {
1791 my ($self) = @_; 1974 my ($self) = @_;
1792 1975
1793 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1794 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1795 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1796 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1799 1984
1800 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1801 1986
1802 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1803 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1806 1991
1807 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1808 1993
1809 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1865 2050
1866 [$self->{layout}->size] 2051 [$self->{layout}->size]
1867 }; 2052 };
1868 2053
1869 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1870 $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);
1871 : $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);
1872 : ($self->{w} - $size->[0]) * 0.5);
1873 2057
1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876 : ($self->{h} - $size->[1]) * 0.5);
1877 }; 2059 };
1878 2060
1879 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
1880 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
1881 2063# DC::OpenGL::glNewList $self->{list};
1882 $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;
1883} 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#}
1884 2080
1885############################################################################# 2081#############################################################################
1886 2082
1887package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
1888 2084
1889our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
1890 2086
1891use CFPlus::OpenGL; 2087use DC::OpenGL;
1892 2088
1893sub new { 2089sub new {
1894 my $class = shift; 2090 my $class = shift;
1895 2091
1896 $class->SUPER::new ( 2092 $class->SUPER::new (
1897 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1898 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1899 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1900 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1901 can_hover => 1, 2099 can_hover => 1,
1902 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1903 valign => 0, 2102 valign => 0.5,
1904 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1905 #text => ... 2107 #text => ...
1906 #hidden => "*", 2108 #hidden => "*",
1907 @_ 2109 @_
1908 ) 2110 )
1909} 2111}
… …
1954 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1956 2158
1957 my $text = $self->get_text; 2159 my $text = $self->get_text;
1958 2160
2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
1959 if ($uni == 8) { 2163 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2165 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2172 # what a hack
1968 $self->{cursor} = 0; 2173 $self->{cursor} =
2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2175 ? length $1
2176 : 0;
1969 } 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/
1970 $self->{cursor} = length $text; 2181 ? $self->{cursor} + length $1
2182 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2183 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2184 $text = "";
1973 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2187 $self->emit ('escape');
1976 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2192 } else {
1979 return 0; 2193 return 0;
1980 } 2194 }
1981 2195
1982 $self->_set_text ($text); 2196 $self->_set_text ($text);
1983 2197
1984 $self->realloc; 2198 $self->realloc;
2199 $self->update;
1985 2200
1986 1 2201 1
1987} 2202}
1988 2203
1989sub invoke_focus_in { 2204sub invoke_focus_in {
… …
2031 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2032 } 2247 }
2033 2248
2034 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2035 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2036 glBegin GL_QUADS;
2037 glVertex 0 , 0;
2038 glVertex 0 , $self->{h};
2039 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2040 glVertex $self->{w}, 0;
2041 glEnd;
2042 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2043 2253
2044 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2045 2255
2046 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
2048 2258
2049 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2050 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2051 utf8::encode $text; 2261 utf8::encode $text;
2052 2262
2053 @$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);
2054 } 2264 }
2055 2265
2266 glColor_premultiply @{$self->{active_fg}};
2056 glBegin GL_LINES; 2267 glBegin GL_LINES;
2057 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};
2058 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};
2059 glEnd; 2270 glEnd;
2060 }
2061}
2062 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
2063package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2064 2291
2065our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2066 2293
2067use CFPlus::OpenGL; 2294use DC::OpenGL;
2068 2295
2069sub invoke_key_down { 2296sub invoke_key_down {
2070 my ($self, $ev) = @_; 2297 my ($self, $ev) = @_;
2071 2298
2072 my $sym = $ev->{sym}; 2299 my $sym = $ev->{sym};
2073 2300
2074 if ($sym == 13) { 2301 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2302 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2303 my $txt = $self->get_text;
2077 2304
2078 $self->{history_pointer} = -1; 2305 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2306 $self->{history_saveback} = '';
2080 $self->emit (activate => $txt); 2307 $self->emit (activate => $txt);
2081 $self->update; 2308 $self->update;
2082 2309
2083 } elsif ($sym == CFPlus::SDLK_UP) { 2310 } elsif ($sym == DC::SDLK_UP) {
2084 if ($self->{history_pointer} < 0) { 2311 if ($self->{history_pointer} < 0) {
2085 $self->{history_saveback} = $self->get_text; 2312 $self->{history_saveback} = $self->get_text;
2086 } 2313 }
2087 if (@{$self->{history} || []} > 0) { 2314 if (@{$self->{history} || []} > 0) {
2088 $self->{history_pointer}++; 2315 $self->{history_pointer}++;
… …
2090 $self->{history_pointer} = @{$self->{history} || []} - 1; 2317 $self->{history_pointer} = @{$self->{history} || []} - 1;
2091 } 2318 }
2092 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2093 } 2320 }
2094 2321
2095 } elsif ($sym == CFPlus::SDLK_DOWN) { 2322 } elsif ($sym == DC::SDLK_DOWN) {
2096 $self->{history_pointer}--; 2323 $self->{history_pointer}--;
2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2098 2325
2099 if ($self->{history_pointer} >= 0) { 2326 if ($self->{history_pointer} >= 0) {
2100 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2327 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2109 1 2336 1
2110} 2337}
2111 2338
2112############################################################################# 2339#############################################################################
2113 2340
2114package CFPlus::UI::Button; 2341package DC::UI::TextEdit;
2115 2342
2116our @ISA = CFPlus::UI::Label::; 2343our @ISA = DC::UI::EntryBase::;
2117 2344
2118use CFPlus::OpenGL; 2345use DC::OpenGL;
2119
2120my @tex =
2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122 qw(b1_button_active.png);
2123 2346
2124sub new { 2347sub new {
2125 my $class = shift; 2348 my $class = shift;
2126 2349
2127 $class->SUPER::new ( 2350 $class->SUPER::new (
2128 padding_x => 4,
2129 padding_y => 4, 2351 padding_y => 4,
2130 fg => [1, 1, 1], 2352
2131 active_fg => [0, 0, 1], 2353 @_
2354 )
2355}
2356
2357sub move_cursor_ver {
2358 my ($self, $dy) = @_;
2359
2360 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2361
2362 $line += $dy;
2363
2364 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2365 $self->{cursor} = $index;
2366 delete $self->{cur_h};
2367 $self->update;
2368 return;
2369 }
2370}
2371
2372sub invoke_key_down {
2373 my ($self, $ev) = @_;
2374
2375 my $sym = $ev->{sym};
2376
2377 if ($sym == DC::SDLK_UP) {
2378 $self->move_cursor_ver (-1);
2379 } elsif ($sym == DC::SDLK_DOWN) {
2380 $self->move_cursor_ver (+1);
2381 } else {
2382 return $self->SUPER::invoke_key_down ($ev)
2383 }
2384
2385 1
2386}
2387
2388#############################################################################
2389
2390package DC::UI::ButtonBin;
2391
2392our @ISA = DC::UI::Bin::;
2393
2394use DC::OpenGL;
2395
2396my @tex =
2397 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2398 qw(b1_button_inactive.png b1_button_active.png);
2399
2400sub new {
2401 my $class = shift;
2402
2403 $class->SUPER::new (
2132 can_hover => 1, 2404 can_hover => 1,
2133 align => 0, 2405 align => 0.5,
2134 valign => 0, 2406 valign => 0.5,
2135 can_events => 1, 2407 can_events => 1,
2136 @_ 2408 @_
2137 ) 2409 )
2138} 2410}
2139 2411
… …
2148} 2420}
2149 2421
2150sub _draw { 2422sub _draw {
2151 my ($self) = @_; 2423 my ($self) = @_;
2152 2424
2153 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2154
2155 glEnable GL_TEXTURE_2D; 2425 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2426 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 glColor 0, 0, 0, 1; 2427 glColor 0, 0, 0, 1;
2158 2428
2429 my $tex = $tex[$GRAB == $self];
2159 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2430 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160 2431
2161 glDisable GL_TEXTURE_2D; 2432 glDisable GL_TEXTURE_2D;
2162 2433
2163 $self->SUPER::_draw; 2434 $self->SUPER::_draw;
2164} 2435}
2165 2436
2166############################################################################# 2437#############################################################################
2167 2438
2168package CFPlus::UI::CheckBox; 2439package DC::UI::Button;
2169 2440
2170our @ISA = CFPlus::UI::DrawBG::; 2441our @ISA = DC::UI::Label::;
2442
2443use DC::OpenGL;
2171 2444
2172my @tex = 2445my @tex =
2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2446 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2447 qw(b1_button_inactive.png b1_button_active.png);
2448
2449sub new {
2450 my $class = shift;
2451
2452 $class->SUPER::new (
2453 padding_x => 8,
2454 padding_y => 4,
2455 fg => [1.0, 1.0, 1.0],
2456 active_fg => [0.8, 0.8, 0.8],
2457 can_hover => 1,
2458 align => 0.5,
2459 valign => 0.5,
2460 can_events => 1,
2461 @_
2462 )
2463}
2464
2465sub invoke_button_up {
2466 my ($self, $ev, $x, $y) = @_;
2467
2468 $self->emit ("activate")
2469 if $x >= 0 && $x < $self->{w}
2470 && $y >= 0 && $y < $self->{h};
2471
2472 1
2473}
2474
2475sub _draw {
2476 my ($self) = @_;
2477
2478 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2479
2480 glEnable GL_TEXTURE_2D;
2481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2482 glColor 0, 0, 0, 1;
2483
2484 my $tex = $tex[$GRAB == $self];
2485 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2486
2487 glDisable GL_TEXTURE_2D;
2488
2489 $self->SUPER::_draw;
2490}
2491
2492#############################################################################
2493
2494package DC::UI::CheckBox;
2495
2496our @ISA = DC::UI::DrawBG::;
2497
2498my @tex =
2499 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2174 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2500 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2175 2501
2176use CFPlus::OpenGL; 2502use DC::OpenGL;
2177 2503
2178sub new { 2504sub new {
2179 my $class = shift; 2505 my $class = shift;
2180 2506
2181 $class->SUPER::new ( 2507 $class->SUPER::new (
… …
2221sub _draw { 2547sub _draw {
2222 my ($self) = @_; 2548 my ($self) = @_;
2223 2549
2224 $self->SUPER::_draw; 2550 $self->SUPER::_draw;
2225 2551
2226 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2552 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2227 2553
2228 my ($w, $h) = @$self{qw(w h)}; 2554 my ($w, $h) = @$self{qw(w h)};
2229 2555
2230 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2556 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2231 2557
… …
2238 glDisable GL_TEXTURE_2D; 2564 glDisable GL_TEXTURE_2D;
2239} 2565}
2240 2566
2241############################################################################# 2567#############################################################################
2242 2568
2243package CFPlus::UI::Image; 2569package DC::UI::Image;
2244 2570
2245our @ISA = CFPlus::UI::Base::; 2571our @ISA = DC::UI::Base::;
2246 2572
2247use CFPlus::OpenGL; 2573use DC::OpenGL;
2248 2574
2249our %texture_cache; 2575our %texture_cache;
2250 2576
2251sub new { 2577sub new {
2252 my $class = shift; 2578 my $class = shift;
2253 2579
2254 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2255 can_events => 0, 2581 can_events => 0,
2582 scale => 1,
2256 @_, 2583 @_,
2257 ); 2584 );
2258 2585
2259 $self->{path} || $self->{tex} 2586 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required"; 2587 or Carp::croak "'path' or 'tex' attributes required";
2261 2588
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2589 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2590 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2264 2591
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2592 DC::weaken $texture_cache{$self->{path}};
2266 2593
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2594 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2595
2269 $self 2596 $self
2270} 2597}
2271 2598
2272sub STORABLE_freeze { 2599sub STORABLE_freeze {
2273 my ($self, $cloning) = @_; 2600 my ($self, $cloning) = @_;
2274 2601
2275 $self->{path} 2602 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2603 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2277 2604
2278 $self->{path} 2605 $self->{path}
2279} 2606}
2280 2607
2281sub STORABLE_attach { 2608sub STORABLE_attach {
… …
2285} 2612}
2286 2613
2287sub size_request { 2614sub size_request {
2288 my ($self) = @_; 2615 my ($self) = @_;
2289 2616
2290 ($self->{tex}{w}, $self->{tex}{h}) 2617 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2291} 2618}
2292 2619
2293sub _draw { 2620sub _draw {
2294 my ($self) = @_; 2621 my ($self) = @_;
2295 2622
… …
2305 } 2632 }
2306 2633
2307 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2309 2636
2310 $tex->draw_quad (0, 0, $w, $h); 2637 $tex->draw_quad_alpha (0, 0, $w, $h);
2311 2638
2312 glDisable GL_TEXTURE_2D; 2639 glDisable GL_TEXTURE_2D;
2313} 2640}
2314 2641
2315############################################################################# 2642#############################################################################
2316 2643
2317package CFPlus::UI::ImageButton; 2644package DC::UI::ImageButton;
2318 2645
2319our @ISA = CFPlus::UI::Image::; 2646our @ISA = DC::UI::Image::;
2320 2647
2321use CFPlus::OpenGL; 2648use DC::OpenGL;
2322 2649
2323my %textures; 2650my %textures;
2324 2651
2325sub new { 2652sub new {
2326 my $class = shift; 2653 my $class = shift;
… …
2329 padding_x => 4, 2656 padding_x => 4,
2330 padding_y => 4, 2657 padding_y => 4,
2331 fg => [1, 1, 1], 2658 fg => [1, 1, 1],
2332 active_fg => [0, 0, 1], 2659 active_fg => [0, 0, 1],
2333 can_hover => 1, 2660 can_hover => 1,
2334 align => 0, 2661 align => 0.5,
2335 valign => 0, 2662 valign => 0.5,
2336 can_events => 1, 2663 can_events => 1,
2337 @_ 2664 @_
2338 ); 2665 );
2339} 2666}
2340 2667
2668sub invoke_button_down {
2669 my ($self, $ev, $x, $y) = @_;
2670
2671 1
2672}
2673
2341sub invoke_button_up { 2674sub invoke_button_up {
2342 my ($self, $ev, $x, $y) = @_; 2675 my ($self, $ev, $x, $y) = @_;
2343 2676
2344 $self->emit ("activate") 2677 $self->emit ("activate")
2345 if $x >= 0 && $x < $self->{w} 2678 if $x >= 0 && $x < $self->{w}
… …
2348 1 2681 1
2349} 2682}
2350 2683
2351############################################################################# 2684#############################################################################
2352 2685
2353package CFPlus::UI::VGauge; 2686package DC::UI::VGauge;
2354 2687
2355our @ISA = CFPlus::UI::Base::; 2688our @ISA = DC::UI::Base::;
2356 2689
2357use List::Util qw(min max); 2690use List::Util qw(min max);
2358 2691
2359use CFPlus::OpenGL; 2692use DC::OpenGL;
2360 2693
2361my %tex = ( 2694my %tex = (
2362 food => [ 2695 food => [
2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2696 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2697 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2365 ], 2698 ],
2366 grace => [ 2699 grace => [
2367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2700 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2701 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2369 ], 2702 ],
2370 hp => [ 2703 hp => [
2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2704 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2705 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2373 ], 2706 ],
2374 mana => [ 2707 mana => [
2375 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2708 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2709 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2377 ], 2710 ],
2378); 2711);
2379 2712
2380# eg. VGauge->new (gauge => 'food'), default gauge: food 2713# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2483 glDisable GL_TEXTURE_2D; 2816 glDisable GL_TEXTURE_2D;
2484} 2817}
2485 2818
2486############################################################################# 2819#############################################################################
2487 2820
2821package DC::UI::Progress;
2822
2823our @ISA = DC::UI::Label::;
2824
2825use DC::OpenGL;
2826
2827sub new {
2828 my ($class, %arg) = @_;
2829
2830 my $self = $class->SUPER::new (
2831 fg => [1, 1, 1],
2832 bg => [0, 0, 1, 0.2],
2833 bar => [0.7, 0.5, 0.1, 0.8],
2834 outline => [0.4, 0.3, 0],
2835 fontsize => 0.9,
2836 valign => 0.5,
2837 align => 0.5,
2838 can_events => 1,
2839 ellipsise => 1,
2840 label => "%d%%",
2841 %arg,
2842 );
2843
2844 $self->set_value ($arg{value} || -1);
2845
2846 $self
2847}
2848
2849sub set_label {
2850 my ($self, $label) = @_;
2851
2852 return if $self->{label} eq $label;
2853 $self->{label} = $label;
2854
2855 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2856}
2857
2858sub set_value {
2859 my ($self, $value) = @_;
2860
2861 if ($self->{value} ne $value) {
2862 $self->{value} = $value;
2863
2864 if ($value < 0) {
2865 $self->set_text ("-");
2866 } else {
2867 $self->set_text (sprintf $self->{label}, $value * 100);
2868 }
2869
2870 $self->update;
2871 }
2872}
2873
2874sub _draw {
2875 my ($self) = @_;
2876
2877 glEnable GL_BLEND;
2878 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2879
2880 if ($self->{value} >= 0) {
2881 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2882
2883 glColor_premultiply @{$self->{bar}};
2884 glRect 2, 2, $s, $self->{h} - 2;
2885 glColor_premultiply @{$self->{bg}};
2886 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2887 }
2888
2889 glColor_premultiply @{$self->{outline}};
2890 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2891
2892 glDisable GL_BLEND;
2893
2894 {
2895 local $self->{bg}; # do not draw background
2896 $self->SUPER::_draw;
2897 }
2898}
2899
2900#############################################################################
2901
2902package DC::UI::ExperienceProgress;
2903
2904our @ISA = DC::UI::Progress::;
2905
2906sub new {
2907 my ($class, %arg) = @_;
2908
2909 my $self = $class->SUPER::new (
2910 tooltip => sub {
2911 my ($self) = @_;
2912
2913 sprintf "level %d\n%s points\n%s next level\n%s to go",
2914 $self->{lvl},
2915 ::formsep ($self->{exp}),
2916 ::formsep ($self->{nxt}),
2917 ::formsep ($self->{nxt} - $self->{exp}),
2918 },
2919 %arg
2920 );
2921
2922 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2923 if $::CONN;
2924
2925 $self
2926}
2927
2928sub DESTROY {
2929 my ($self) = @_;
2930
2931 delete $::CONN->{on_exp_update}{$self+0}
2932 if $::CONN;
2933
2934 $self->SUPER::DESTROY;
2935}
2936
2937sub set_value {
2938 my ($self, $lvl, $exp) = @_;
2939
2940 $self->{lvl} = $lvl;
2941 $self->{exp} = $exp;
2942
2943 my $v = -1;
2944
2945 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2946 my $l0 = $table->[$lvl - 1];
2947 my $l1 = $table->[$lvl];
2948
2949 $self->{nxt} = $l1;
2950
2951 $v = ($exp - $l0) / ($l1 - $l0);
2952 }
2953
2954 $self->SUPER::set_value ($v);
2955}
2956
2957#############################################################################
2958
2488package CFPlus::UI::Gauge; 2959package DC::UI::Gauge;
2489 2960
2490our @ISA = CFPlus::UI::VBox::; 2961our @ISA = DC::UI::VBox::;
2491 2962
2492sub new { 2963sub new {
2493 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2494 2965
2495 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
… …
2497 can_hover => 1, 2968 can_hover => 1,
2498 can_events => 1, 2969 can_events => 1,
2499 %arg, 2970 %arg,
2500 ); 2971 );
2501 2972
2502 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2973 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2503 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2974 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2975 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2505 2976
2506 $self 2977 $self
2507} 2978}
2508 2979
2509sub set_fontsize { 2980sub set_fontsize {
… …
2530 $self->{value}->set_text ($val); 3001 $self->{value}->set_text ($val);
2531} 3002}
2532 3003
2533############################################################################# 3004#############################################################################
2534 3005
2535package CFPlus::UI::Slider; 3006package DC::UI::Slider;
2536 3007
2537use strict; 3008use strict;
2538 3009
2539use CFPlus::OpenGL; 3010use DC::OpenGL;
2540 3011
2541our @ISA = CFPlus::UI::DrawBG::; 3012our @ISA = DC::UI::DrawBG::;
2542 3013
2543my @tex = 3014my @tex =
2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3015 map { new_from_file DC::Texture DC::find_rcfile $_ }
2545 qw(s1_slider.png s1_slider_bg.png); 3016 qw(s1_slider.png s1_slider_bg.png);
2546 3017
2547sub new { 3018sub new {
2548 my $class = shift; 3019 my $class = shift;
2549 3020
… …
2617 3088
2618 $self->SUPER::invoke_button_down ($ev, $x, $y); 3089 $self->SUPER::invoke_button_down ($ev, $x, $y);
2619 3090
2620 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3091 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2621 3092
2622 $self->invoke_mouse_motion ($ev, $x, $y) 3093 $self->invoke_mouse_motion ($ev, $x, $y);
3094
3095 1
2623} 3096}
2624 3097
2625sub invoke_mouse_motion { 3098sub invoke_mouse_motion {
2626 my ($self, $ev, $x, $y) = @_; 3099 my ($self, $ev, $x, $y) = @_;
2627 3100
… …
2643sub invoke_mouse_wheel { 3116sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 3117 my ($self, $ev) = @_;
2645 3118
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3119 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 3120
3121 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3122
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3123 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 3124
2650 ! ! $delta 3125 1
2651} 3126}
2652 3127
2653sub update { 3128sub update {
2654 my ($self) = @_; 3129 my ($self) = @_;
2655 3130
… …
2704 glDisable GL_TEXTURE_2D; 3179 glDisable GL_TEXTURE_2D;
2705} 3180}
2706 3181
2707############################################################################# 3182#############################################################################
2708 3183
2709package CFPlus::UI::ValSlider; 3184package DC::UI::ValSlider;
2710 3185
2711our @ISA = CFPlus::UI::HBox::; 3186our @ISA = DC::UI::HBox::;
2712 3187
2713sub new { 3188sub new {
2714 my ($class, %arg) = @_; 3189 my ($class, %arg) = @_;
2715 3190
2716 my $range = delete $arg{range}; 3191 my $range = delete $arg{range};
2717 3192
2718 my $self = $class->SUPER::new ( 3193 my $self = $class->SUPER::new (
2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3194 slider => (new DC::UI::Slider expand => 1, range => $range),
2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3195 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2721 to_value => sub { shift }, 3196 to_value => sub { shift },
2722 from_value => sub { shift }, 3197 from_value => sub { shift },
2723 %arg, 3198 %arg,
2724 ); 3199 );
2725 3200
… …
2745sub set_range { shift->{slider}->set_range (@_) } 3220sub set_range { shift->{slider}->set_range (@_) }
2746sub set_value { shift->{slider}->set_value (@_) } 3221sub set_value { shift->{slider}->set_value (@_) }
2747 3222
2748############################################################################# 3223#############################################################################
2749 3224
2750package CFPlus::UI::TextScroller; 3225package DC::UI::TextScroller;
2751 3226
2752our @ISA = CFPlus::UI::HBox::; 3227our @ISA = DC::UI::HBox::;
2753 3228
2754use CFPlus::OpenGL; 3229use DC::OpenGL;
2755 3230
2756sub new { 3231sub new {
2757 my $class = shift; 3232 my $class = shift;
2758 3233
2759 my $self = $class->SUPER::new ( 3234 my $self = $class->SUPER::new (
… …
2761 can_events => 1, 3236 can_events => 1,
2762 indent => 0, 3237 indent => 0,
2763 #font => default_font 3238 #font => default_font
2764 @_, 3239 @_,
2765 3240
2766 layout => (new CFPlus::Layout), 3241 layout => (new DC::Layout),
2767 par => [], 3242 par => [],
3243 max_par => 0,
2768 height => 0, 3244 height => 0,
2769 children => [ 3245 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3246 (new DC::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3247 (new DC::UI::Slider vertical => 1),
2772 ], 3248 ],
2773 ); 3249 );
2774 3250
2775 $self->{children}[1]->connect (changed => sub { $self->update }); 3251 $self->{children}[1]->connect (changed => sub { $self->update });
2776 3252
… …
2785} 3261}
2786 3262
2787sub size_request { 3263sub size_request {
2788 my ($self) = @_; 3264 my ($self) = @_;
2789 3265
2790 my ($empty, $slider) = @{ $self->{children} }; 3266 my ($empty, $slider) = $self->visible_children;
2791 3267
2792 local $self->{children} = [$empty, $slider]; 3268 local $self->{children} = [$empty, $slider];
2793 $self->SUPER::size_request 3269 $self->SUPER::size_request
2794} 3270}
2795 3271
… …
2832 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3308 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2833 $layout->set_markup ($para->{markup}); 3309 $layout->set_markup ($para->{markup});
2834 3310
2835 $layout->set_shapes ( 3311 $layout->set_shapes (
2836 map 3312 map
2837 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3313 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2838 @{$para->{widget}} 3314 @{$para->{widget}}
2839 ); 3315 );
2840 3316
2841 $layout 3317 $layout
2842} 3318}
… …
2897 3373
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3374 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3375 push @{$self->{par}}, $para;
2900 } 3376 }
2901 3377
3378 if (my $max = $self->{max_par}) {
3379 shift @{$self->{par}} while @{$self->{par}} > $max;
3380 }
3381
2902 $self->{need_reflow}++; 3382 $self->{need_reflow}++;
2903 $self->update; 3383 $self->update;
2904} 3384}
2905 3385
2906sub scroll_to_bottom { 3386sub scroll_to_bottom {
… …
2955 $ROOT->on_post_alloc ($self => sub { 3435 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate; 3436 $self->force_uptodate;
2957 3437
2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3438 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2959 3439
2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3440 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2961 glClearColor 0, 0, 0, 0; 3441 glClearColor 0, 0, 0, 0;
2962 glClear GL_COLOR_BUFFER_BIT; 3442 glClear GL_COLOR_BUFFER_BIT;
2963 3443
2964 {
2965 package CFPlus::UI::Base; 3444 package DC::UI::Base;
2966
2967 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3445 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2968 (0, 0, $self->{w}, $self->{h}); 3446 (0, 0, $self->{w}, $self->{h});
2969 }
2970 3447
2971 my $top = int $self->{children}[1]{range}[0]; 3448 my $top = int $self->{children}[1]{range}[0];
2972 3449
2973 my $paridx = 0; 3450 my $paridx = 0;
2974 my $top_paragraph; 3451 my $top_paragraph;
… …
2983 3460
2984 if ($y0 < $y + $h && $y < $y1) { 3461 if ($y0 < $y + $h && $y < $y1) {
2985 my $layout = $self->get_layout ($para); 3462 my $layout = $self->get_layout ($para);
2986 3463
2987 $layout->render ($para->{indent}, $y - $y0); 3464 $layout->render ($para->{indent}, $y - $y0);
3465 $layout->draw;
2988 3466
2989 if (my @w = @{ $para->{widget} }) { 3467 if (my @w = @{ $para->{widget} }) {
2990 my @s = $layout->get_shapes; 3468 my @s = $layout->get_shapes;
2991 3469
2992 for (@w) { 3470 for (@w) {
… …
3030 $self->{children}[1]->draw; 3508 $self->{children}[1]->draw;
3031} 3509}
3032 3510
3033############################################################################# 3511#############################################################################
3034 3512
3035package CFPlus::UI::Animator; 3513package DC::UI::Animator;
3036 3514
3037use CFPlus::OpenGL; 3515use DC::OpenGL;
3038 3516
3039our @ISA = CFPlus::UI::Bin::; 3517our @ISA = DC::UI::Bin::;
3040 3518
3041sub moveto { 3519sub moveto {
3042 my ($self, $x, $y) = @_; 3520 my ($self, $x, $y) = @_;
3043 3521
3044 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3522 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3072 glPopMatrix; 3550 glPopMatrix;
3073} 3551}
3074 3552
3075############################################################################# 3553#############################################################################
3076 3554
3077package CFPlus::UI::Flopper; 3555package DC::UI::Flopper;
3078 3556
3079our @ISA = CFPlus::UI::Button::; 3557our @ISA = DC::UI::Button::;
3080 3558
3081sub new { 3559sub new {
3082 my $class = shift; 3560 my $class = shift;
3083 3561
3084 my $self = $class->SUPER::new ( 3562 my $self = $class->SUPER::new (
… …
3096 $self->{other}->toggle_visibility; 3574 $self->{other}->toggle_visibility;
3097} 3575}
3098 3576
3099############################################################################# 3577#############################################################################
3100 3578
3101package CFPlus::UI::Tooltip; 3579package DC::UI::Tooltip;
3102 3580
3103our @ISA = CFPlus::UI::Bin::; 3581our @ISA = DC::UI::Bin::;
3104 3582
3105use CFPlus::OpenGL; 3583use DC::OpenGL;
3106 3584
3107sub new { 3585sub new {
3108 my $class = shift; 3586 my $class = shift;
3109 3587
3110 $class->SUPER::new ( 3588 $class->SUPER::new (
… …
3114} 3592}
3115 3593
3116sub set_tooltip_from { 3594sub set_tooltip_from {
3117 my ($self, $widget) = @_; 3595 my ($self, $widget) = @_;
3118 3596
3119 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3120 if $widget->{tooltip} =~ /^#(.*)$/;
3121
3122 my $tooltip = $widget->{tooltip}; 3597 my $tip = $widget->{tooltip};
3598 $tip = $tip->($widget) if "CODE" eq ref $tip;
3599
3600 $tip = DC::Pod::section_label tooltip => $1
3601 if $tip =~ /^#(.*)$/;
3123 3602
3124 if ($ENV{CFPLUS_DEBUG} & 2) { 3603 if ($ENV{CFPLUS_DEBUG} & 2) {
3125 $tooltip .= "\n\n" . (ref $widget) . "\n" 3604 $tip .= "\n\n" . (ref $widget) . "\n"
3126 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3605 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3127 . "req $widget->{req_w} $widget->{req_h}\n" 3606 . "req $widget->{req_w} $widget->{req_h}\n"
3128 . "visible $widget->{visible}"; 3607 . "visible $widget->{visible}";
3129 } 3608 }
3130 3609
3131 $tooltip =~ s/^\n+//; 3610 $tip =~ s/^\n+//;
3132 $tooltip =~ s/\n+$//; 3611 $tip =~ s/\n+$//;
3133 3612
3134 $self->add (new CFPlus::UI::Label 3613 $self->add (new DC::UI::Label
3135 markup => $tooltip, 3614 markup => $tip,
3136 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3615 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3616 align => 0,
3137 fontsize => 0.8, 3617 fontsize => 0.8,
3138 style => 1, # FLAG_INVERSE 3618 style => 1, # FLAG_INVERSE
3139 ellipsise => 0, 3619 ellipsise => 0,
3140 font => ($widget->{tooltip_font} || $::FONT_PROP), 3620 font => ($widget->{tooltip_font} || $::FONT_PROP),
3141 ); 3621 );
… …
3178} 3658}
3179 3659
3180sub _draw { 3660sub _draw {
3181 my ($self) = @_; 3661 my ($self) = @_;
3182 3662
3183 glTranslate 0.375, 0.375;
3184
3185 my ($w, $h) = @$self{qw(w h)}; 3663 my ($w, $h) = @$self{qw(w h)};
3186 3664
3187 glColor 1, 0.8, 0.4; 3665 glColor 1, 0.8, 0.4;
3188 glBegin GL_QUADS; 3666 glRect 0, 0, $w, $h;
3189 glVertex 0 , 0;
3190 glVertex 0 , $h;
3191 glVertex $w, $h;
3192 glVertex $w, 0;
3193 glEnd;
3194 3667
3195 glColor 0, 0, 0; 3668 glColor 0, 0, 0;
3196 glBegin GL_LINE_LOOP; 3669 glRect_lineloop .5, .5, $w + .5, $h + .5;
3197 glVertex 0 , 0;
3198 glVertex 0 , $h;
3199 glVertex $w, $h;
3200 glVertex $w, 0;
3201 glEnd;
3202 3670
3203 glTranslate 2 - 0.375, 2 - 0.375; 3671 glTranslate 2, 2;
3204 3672
3205 $self->SUPER::_draw; 3673 $self->SUPER::_draw;
3206} 3674}
3207 3675
3208############################################################################# 3676#############################################################################
3209 3677
3210package CFPlus::UI::Face; 3678package DC::UI::Face;
3211 3679
3212our @ISA = CFPlus::UI::DrawBG::; 3680our @ISA = DC::UI::DrawBG::;
3213 3681
3214use CFPlus::OpenGL; 3682use DC::OpenGL;
3215 3683
3216sub new { 3684sub new {
3217 my $class = shift; 3685 my $class = shift;
3218 3686
3219 my $self = $class->SUPER::new ( 3687 my $self = $class->SUPER::new (
3688 size_w => 32,
3689 size_h => 8,
3220 aspect => 1, 3690 aspect => 1,
3221 can_events => 0, 3691 can_events => 0,
3222 @_, 3692 @_,
3223 ); 3693 );
3224 3694
3225 if ($self->{anim} && $self->{animspeed}) { 3695 if ($self->{anim} && $self->{animspeed}) {
3226 Scalar::Util::weaken (my $widget = $self); 3696 DC::weaken (my $widget = $self);
3227 3697
3228 $self->{timer} = Event->timer ( 3698 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3229 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3699 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3230 hard => 1, 3700 return unless $::CONN;
3231 interval => $self->{animspeed}, 3701
3232 cb => sub { 3702 my $w = $widget
3703 or return;
3704
3233 ++$widget->{frame}; 3705 ++$w->{frame};
3706 $w->update_face;
3707
3708 # somehow, $widget can go away
3234 $widget->update; 3709 $w->update;
3235 }, 3710 $w->update_timer;
3236 ); 3711 };
3712
3713 $self->update_face;
3714 $self->update_timer;
3237 } 3715 }
3238 3716
3239 $self 3717 $self
3240} 3718}
3241 3719
3720sub update_timer {
3721 my ($self) = @_;
3722
3723 return unless $self->{timer};
3724
3725 if ($self->{visible}) {
3726 $self->{timer}->start;
3727 } else {
3728 $self->{timer}->stop;
3729 }
3730}
3731
3732sub update_face {
3733 my ($self) = @_;
3734
3735 if ($::CONN) {
3736 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3737 if ($anim && @$anim) {
3738 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3739 delete $self->{face_change_cb};
3740
3741 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3742 unless ($tex->{name} || $tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746 }
3747 }
3748 }
3749}
3750
3242sub size_request { 3751sub size_request {
3243 (32, 8) 3752 my ($self) = @_;
3753
3754 if ($::CONN) {
3755 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3756 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3757 if ($tex->{name}) {
3758 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3759 } elsif (!$tex->{loading}) {
3760 $tex->upload (sub { $self->reconfigure });
3761 }
3762 }
3763
3764 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3765 }
3766 }
3767
3768 ($self->{size_w} || 8, $self->{size_h} || 8)
3244} 3769}
3245 3770
3246sub update { 3771sub update {
3247 my ($self) = @_; 3772 my ($self) = @_;
3248 3773
3249 return unless $self->{visible}; 3774 return unless $self->{visible};
3250 3775
3251 $self->SUPER::update; 3776 $self->SUPER::update;
3252} 3777}
3253 3778
3779sub invoke_visibility_change {
3780 my ($self) = @_;
3781
3782 $self->update_timer;
3783
3784 0
3785}
3786
3254sub _draw { 3787sub _draw {
3255 my ($self) = @_; 3788 my ($self) = @_;
3256 3789
3257 return unless $::CONN;
3258
3259 $self->SUPER::_draw; 3790 $self->SUPER::_draw;
3260 3791
3261 my $face; 3792 if (my $tex = $self->{tex}) {
3262
3263 if ($self->{frame}) {
3264 my $anim = $::CONN->{anim}[$self->{anim}];
3265
3266 $face = $anim->[ $self->{frame} % @$anim ]
3267 if $anim && @$anim;
3268 }
3269
3270 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3271
3272 if ($tex) {
3273 glEnable GL_TEXTURE_2D; 3793 glEnable GL_TEXTURE_2D;
3274 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3275 glColor 0, 0, 0, 1; 3795 glColor 0, 0, 0, 1;
3276 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3796 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3277 glDisable GL_TEXTURE_2D; 3797 glDisable GL_TEXTURE_2D;
… …
3279} 3799}
3280 3800
3281sub destroy { 3801sub destroy {
3282 my ($self) = @_; 3802 my ($self) = @_;
3283 3803
3284 $self->{timer}->cancel 3804 (delete $self->{timer})->cancel
3285 if $self->{timer}; 3805 if $self->{timer};
3286 3806
3287 $self->SUPER::destroy; 3807 $self->SUPER::destroy;
3288} 3808}
3289 3809
3290############################################################################# 3810#############################################################################
3291 3811
3292package CFPlus::UI::Buttonbar; 3812package DC::UI::Buttonbar;
3293 3813
3294our @ISA = CFPlus::UI::HBox::; 3814our @ISA = DC::UI::HBox::;
3295 3815
3296# TODO: should actualyl wrap buttons and other goodies. 3816# TODO: should actually wrap buttons and other goodies.
3297 3817
3298############################################################################# 3818#############################################################################
3299 3819
3300package CFPlus::UI::Menu; 3820package DC::UI::Menu;
3301 3821
3302our @ISA = CFPlus::UI::Toplevel::; 3822our @ISA = DC::UI::Toplevel::;
3303 3823
3304use CFPlus::OpenGL; 3824use DC::OpenGL;
3305 3825
3306sub new { 3826sub new {
3307 my $class = shift; 3827 my $class = shift;
3308 3828
3309 my $self = $class->SUPER::new ( 3829 my $self = $class->SUPER::new (
3310 items => [], 3830 items => [],
3311 z => 100, 3831 z => 100,
3312 @_, 3832 @_,
3313 ); 3833 );
3314 3834
3315 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3835 $self->add ($self->{vbox} = new DC::UI::VBox);
3316 3836
3317 for my $item (@{ $self->{items} }) { 3837 for my $item (@{ $self->{items} }) {
3318 my ($widget, $cb, $tooltip) = @$item; 3838 my ($widget, $cb, $tooltip) = @$item;
3319 3839
3320 # handle various types of items, only text for now 3840 # handle various types of items, only text for now
3321 if (!ref $widget) { 3841 if (!ref $widget) {
3322 if ($widget =~ /\t/) { 3842 if ($widget =~ /\t/) {
3323 my ($left, $right) = split /\t/, $widget, 2; 3843 my ($left, $right) = split /\t/, $widget, 2;
3324 3844
3325 $widget = new CFPlus::UI::HBox 3845 $widget = new DC::UI::HBox
3326 can_hover => 1, 3846 can_hover => 1,
3327 can_events => 1, 3847 can_events => 1,
3328 tooltip => $tooltip, 3848 tooltip => $tooltip,
3329 children => [ 3849 children => [
3330 (new CFPlus::UI::Label markup => $left, expand => 1), 3850 (new DC::UI::Label markup => $left, expand => 1),
3331 (new CFPlus::UI::Label markup => $right, align => +1), 3851 (new DC::UI::Label markup => $right, align => 1),
3332 ], 3852 ],
3333 ; 3853 ;
3334 3854
3335 } else { 3855 } else {
3336 $widget = new CFPlus::UI::Label 3856 $widget = new DC::UI::Label
3337 can_hover => 1, 3857 can_hover => 1,
3338 can_events => 1, 3858 can_events => 1,
3859 align => 0,
3339 markup => $widget, 3860 markup => $widget,
3340 tooltip => $tooltip; 3861 tooltip => $tooltip;
3341 } 3862 }
3342 } 3863 }
3343 3864
… …
3389 1 3910 1
3390} 3911}
3391 3912
3392############################################################################# 3913#############################################################################
3393 3914
3394package CFPlus::UI::Multiplexer; 3915package DC::UI::Multiplexer;
3395 3916
3396our @ISA = CFPlus::UI::Container::; 3917our @ISA = DC::UI::Container::;
3397 3918
3398sub new { 3919sub new {
3399 my $class = shift; 3920 my $class = shift;
3400 3921
3401 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3462 $self->{current}->draw; 3983 $self->{current}->draw;
3463} 3984}
3464 3985
3465############################################################################# 3986#############################################################################
3466 3987
3467package CFPlus::UI::Notebook; 3988package DC::UI::Notebook;
3468 3989
3990use DC::OpenGL;
3991
3469our @ISA = CFPlus::UI::VBox::; 3992our @ISA = DC::UI::VBox::;
3470 3993
3471sub new { 3994sub new {
3472 my $class = shift; 3995 my $class = shift;
3473 3996
3474 my $self = $class->SUPER::new ( 3997 my $self = $class->SUPER::new (
3475 buttonbar => (new CFPlus::UI::Buttonbar), 3998 buttonbar => (new DC::UI::Buttonbar),
3476 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3999 multiplexer => (new DC::UI::Multiplexer expand => 1),
4000 active_outline => [.7, .7, 0.2],
3477 # filter => # will be put between multiplexer and $self 4001 # filter => # will be put between multiplexer and $self
3478 @_, 4002 @_,
3479 ); 4003 );
3480 4004
3481 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4005 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3482 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4006 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3483 4007
4008 {
4009 Scalar::Util::weaken (my $wself = $self);
4010
4011 $self->{multiplexer}->connect (c_add => sub {
4012 my ($mplex, $widgets) = @_;
4013
4014 for my $child (@$widgets) {
4015 Scalar::Util::weaken $child;
4016 $child->{c_tab_} ||= do {
4017 my $tab =
4018 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4019 ? $child->{c_tab}
4020 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4021
4022 $tab->connect (activate => sub {
4023 $wself->set_current_page ($child);
4024 });
4025
4026 $tab
4027 };
4028
4029 $self->{buttonbar}->add ($child->{c_tab_});
4030 }
4031 });
4032
4033 $self->{multiplexer}->connect (c_remove => sub {
4034 my ($mplex, $widgets) = @_;
4035
4036 for my $child (@$widgets) {
4037 $wself->{buttonbar}->remove ($child->{c_tab_});
4038 }
4039 });
4040 }
4041
3484 $self 4042 $self
3485} 4043}
3486 4044
3487sub add { 4045sub add {
4046 my ($self, @widgets) = @_;
4047
4048 $self->{multiplexer}->add (@widgets)
4049}
4050
4051sub remove {
4052 my ($self, @widgets) = @_;
4053
4054 $self->{multiplexer}->remove (@widgets)
4055}
4056
4057sub pages {
4058 my ($self) = @_;
4059 $self->{multiplexer}->children
4060}
4061
4062sub add_tab {
3488 my ($self, $title, $widget, $tooltip) = @_; 4063 my ($self, $title, $widget, $tooltip) = @_;
3489 4064
3490 Scalar::Util::weaken $self; 4065 $title = [$title, $tooltip] unless ref $title;
4066 $widget->{c_tab} = $title;
3491 4067
3492 $self->{buttonbar}->add (new CFPlus::UI::Button
3493 markup => $title,
3494 tooltip => $tooltip,
3495 on_activate => sub { $self->set_current_page ($widget) },
3496 );
3497
3498 $self->{multiplexer}->add ($widget); 4068 $self->add ($widget);
3499} 4069}
3500 4070
3501sub get_current_page { 4071sub get_current_page {
3502 my ($self) = @_; 4072 my ($self) = @_;
3503 4073
… …
3509 4079
3510 $self->{multiplexer}->set_current_page ($page); 4080 $self->{multiplexer}->set_current_page ($page);
3511 $self->emit (page_changed => $self->{multiplexer}{current}); 4081 $self->emit (page_changed => $self->{multiplexer}{current});
3512} 4082}
3513 4083
4084sub _draw {
4085 my ($self) = @_;
4086
4087 $self->SUPER::_draw ();
4088
4089 if (my $cur = $self->{multiplexer}{current}) {
4090 if ($cur = $cur->{c_tab_}) {
4091 glTranslate $self->{buttonbar}{x} + $cur->{x},
4092 $self->{buttonbar}{y} + $cur->{y};
4093 glLineWidth 3;
4094 #glEnable GL_BLEND;
4095 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4096 glColor @{$self->{active_outline}};
4097 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4098 glLineWidth 1;
4099 #glDisable GL_BLEND;
4100 }
4101 }
4102}
4103
3514############################################################################# 4104#############################################################################
3515 4105
3516package CFPlus::UI::Selector; 4106package DC::UI::Selector;
3517 4107
3518use utf8; 4108use utf8;
3519 4109
3520our @ISA = CFPlus::UI::Button::; 4110our @ISA = DC::UI::Button::;
3521 4111
3522sub new { 4112sub new {
3523 my $class = shift; 4113 my $class = shift;
3524 4114
3525 my $self = $class->SUPER::new ( 4115 my $self = $class->SUPER::new (
… …
3542 my ($value, $title, $tooltip) = @$_; 4132 my ($value, $title, $tooltip) = @$_;
3543 4133
3544 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4134 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3545 } 4135 }
3546 4136
3547 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4137 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3548} 4138}
3549 4139
3550sub _set_value { 4140sub _set_value {
3551 my ($self, $value) = @_; 4141 my ($self, $value) = @_;
3552 4142
3553 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4143 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4144 $item ||= $self->{options}[0]
3554 or return; 4145 or return;
3555 4146
3556 $self->{value} = $item->[0]; 4147 $self->{value} = $item->[0];
3557 $self->set_markup ("$item->[1] ⇓"); 4148 $self->set_markup ("$item->[1] ⇓");
3558 $self->set_tooltip ($item->[2]); 4149# $self->set_tooltip ($item->[2]);
3559} 4150}
3560 4151
3561sub set_value { 4152sub set_value {
3562 my ($self, $value) = @_; 4153 my ($self, $value) = @_;
3563 4154
… …
3565 4156
3566 $self->_set_value ($value); 4157 $self->_set_value ($value);
3567 $self->emit (changed => $value); 4158 $self->emit (changed => $value);
3568} 4159}
3569 4160
4161sub set_options {
4162 my ($self, $options) = @_;
4163
4164 $self->{options} = $options;
4165 $self->_set_value ($self->{value});
4166}
4167
3570############################################################################# 4168#############################################################################
3571 4169
3572package CFPlus::UI::Statusbox; 4170package DC::UI::Statusbox;
3573 4171
3574our @ISA = CFPlus::UI::VBox::; 4172our @ISA = DC::UI::VBox::;
3575 4173
3576sub new { 4174sub new {
3577 my $class = shift; 4175 my $class = shift;
3578 4176
3579 my $self = $class->SUPER::new ( 4177 my $self = $class->SUPER::new (
3580 fontsize => 0.8, 4178 fontsize => 0.8,
3581 @_, 4179 @_,
3582 ); 4180 );
3583 4181
3584 Scalar::Util::weaken (my $this = $self); 4182 DC::weaken (my $this = $self);
3585 4183
3586 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4184 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3587 4185
3588 $self 4186 $self
3589} 4187}
3590 4188
3591sub reorder { 4189sub reorder {
3592 my ($self) = @_; 4190 my ($self) = @_;
3593 my $NOW = Time::HiRes::time; 4191 my $NOW = Time::HiRes::time;
3594 4192
3595 # freeze display when hovering over any label 4193 # freeze display when hovering over any label
3596 return if $CFPlus::UI::TOOLTIP->{owner} 4194 return if $DC::UI::TOOLTIP->{owner}
3597 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4195 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3598 values %{ $self->{item} }; 4196 values %{ $self->{item} };
3599 4197
3600 while (my ($k, $v) = each %{ $self->{item} }) { 4198 while (my ($k, $v) = each %{ $self->{item} }) {
3601 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4199 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3602 } 4200 }
4201
4202 $self->{timer}->set (1, 1);
3603 4203
3604 my @widgets; 4204 my @widgets;
3605 4205
3606 my @items = sort { 4206 my @items = sort {
3607 $a->{pri} <=> $b->{pri} 4207 $a->{pri} <=> $b->{pri}
3608 or $b->{id} <=> $a->{id} 4208 or $b->{id} <=> $a->{id}
3609 } values %{ $self->{item} }; 4209 } values %{ $self->{item} };
3610
3611 $self->{timer}->interval (1);
3612 4210
3613 my $count = 10 + 1; 4211 my $count = 10 + 1;
3614 for my $item (@items) { 4212 for my $item (@items) {
3615 last unless --$count; 4213 last unless --$count;
3616 4214
… …
3623 for ($short) { 4221 for ($short) {
3624 s/^\s+//; 4222 s/^\s+//;
3625 s/\s+/ /g; 4223 s/\s+/ /g;
3626 } 4224 }
3627 4225
3628 new CFPlus::UI::Label 4226 new DC::UI::Label
3629 markup => $short, 4227 markup => $short,
3630 tooltip => $item->{tooltip}, 4228 tooltip => $item->{tooltip},
3631 tooltip_font => $::FONT_PROP, 4229 tooltip_font => $::FONT_PROP,
3632 tooltip_width => 0.67, 4230 tooltip_width => 0.67,
3633 fontsize => $item->{fontsize} || $self->{fontsize}, 4231 fontsize => $item->{fontsize} || $self->{fontsize},
3634 max_w => $::WIDTH * 0.44, 4232 max_w => $::WIDTH * 0.44,
4233 align => 0,
3635 fg => [@{ $item->{fg} }], 4234 fg => [@{ $item->{fg} }],
3636 can_events => 1, 4235 can_events => 1,
3637 can_hover => 1 4236 can_hover => 1
3638 }; 4237 };
3639 4238
3640 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4239 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3641 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4240 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3642 $label->update; 4241 $label->update;
3643 $label->set_max_size (undef, $label->{req_h} * $diff) 4242 $label->set_max_size (undef, $label->{req_h} * $diff)
3644 if $diff < 1; 4243 if $diff < 1;
3645 $self->{timer}->interval (1/30); 4244 $self->{timer}->set (1/30, 1/30);
3646 } else { 4245 } else {
3647 $label->{fg}[3] = $item->{fg}[3] || 1; 4246 $label->{fg}[3] = $item->{fg}[3] || 1;
3648 } 4247 }
3649 4248
3650 push @widgets, $label; 4249 push @widgets, $label;
… …
3712 $self->SUPER::destroy; 4311 $self->SUPER::destroy;
3713} 4312}
3714 4313
3715############################################################################# 4314#############################################################################
3716 4315
3717package CFPlus::UI::Inventory;
3718
3719our @ISA = CFPlus::UI::Table::;
3720
3721sub new {
3722 my $class = shift;
3723
3724 my $self = $class->SUPER::new (
3725 col_expand => [0, 1, 0],
3726 items => [],
3727 @_,
3728 );
3729
3730 $self->set_sort_order (undef);
3731
3732 $self
3733}
3734
3735sub update_items {
3736 my ($self) = @_;
3737
3738 $self->clear;
3739
3740 my @item = $self->{sort}->(@{ $self->{items} });
3741
3742 my @adds;
3743 my $row = 0;
3744 for my $item ($self->{sort}->(@{ $self->{items} })) {
3745 CFPlus::Item::update_widgets $item;
3746
3747 push @adds, 0, $row, $item->{face_widget};
3748 push @adds, 1, $row, $item->{desc_widget};
3749 push @adds, 2, $row, $item->{weight_widget};
3750
3751 $row++;
3752 }
3753
3754 $self->add (@adds);
3755}
3756
3757sub set_sort_order {
3758 my ($self, $order) = @_;
3759
3760 $self->{sort} = $order ||= sub {
3761 sort {
3762 $a->{type} <=> $b->{type}
3763 or $a->{name} cmp $b->{name}
3764 } @_
3765 };
3766
3767 $self->update_items;
3768}
3769
3770sub set_items {
3771 my ($self, $items) = @_;
3772
3773 $self->{items} = [$items ? values %$items : ()];
3774 $self->update_items;
3775}
3776
3777#############################################################################
3778
3779package CFPlus::UI::SpellList;
3780
3781our @ISA = CFPlus::UI::Table::;
3782
3783sub new {
3784 my $class = shift;
3785
3786 my $self = $class->SUPER::new (
3787 binding => [],
3788 commands => [],
3789 @_,
3790 )
3791}
3792
3793my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3794
3795my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3796 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3797my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3798 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3799my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3800 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3801my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3802 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3803my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3804 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3805
3806sub rebuild_spell_list {
3807 my ($self) = @_;
3808
3809 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3810 $self->clear;
3811
3812 return unless $::CONN;
3813
3814 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3815 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3816 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3817 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3818 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3819
3820 my $row = 0;
3821
3822 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3823 my $spell = $self->{spell}{$_};
3824
3825 $row++;
3826
3827 my $spell_cb = sub {
3828 my ($widget, $ev) = @_;
3829
3830 if ($ev->{button} == 1) {
3831 $::CONN->user_send ("cast $spell->{name}");
3832 } elsif ($ev->{button} == 2) {
3833 $::CONN->user_send ("invoke $spell->{name}");
3834 } elsif ($ev->{button} == 3) {
3835 (new CFPlus::UI::Menu
3836 items => [
3837 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3838 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3839 ],
3840 )->popup ($ev);
3841 } else {
3842 return 0;
3843 }
3844
3845 1
3846 };
3847
3848 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3849
3850 #TODO: add path info to tooltip
3851 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3852
3853 $self->add (0, $row, new CFPlus::UI::Face
3854 face => $spell->{face},
3855 can_hover => 1,
3856 can_events => 1,
3857 tooltip => $tooltip,
3858 on_button_down => $spell_cb,
3859 );
3860
3861 $self->add (1, $row, new CFPlus::UI::Label
3862 expand => 1,
3863 text => $spell->{name},
3864 can_hover => 1,
3865 can_events => 1,
3866 tooltip => $tooltip,
3867 on_button_down => $spell_cb,
3868 );
3869
3870 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3871 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3872 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3873 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3874 }
3875 });
3876}
3877
3878sub add_spell {
3879 my ($self, $spell) = @_;
3880
3881 $self->{spell}->{$spell->{name}} = $spell;
3882 $self->rebuild_spell_list;
3883}
3884
3885sub remove_spell {
3886 my ($self, $spell) = @_;
3887
3888 delete $self->{spell}->{$spell->{name}};
3889 $self->rebuild_spell_list;
3890}
3891
3892sub clear_spells {
3893 my ($self) = @_;
3894
3895 $self->{spell} = {};
3896 $self->rebuild_spell_list;
3897}
3898
3899#############################################################################
3900
3901package CFPlus::UI::Root; 4316package DC::UI::Root;
3902 4317
3903our @ISA = CFPlus::UI::Container::; 4318our @ISA = DC::UI::Container::;
3904 4319
3905use List::Util qw(min max); 4320use List::Util qw(min max);
3906 4321
3907use CFPlus::OpenGL; 4322use DC::OpenGL;
3908 4323
3909sub new { 4324sub new {
3910 my $class = shift; 4325 my $class = shift;
3911 4326
3912 my $self = $class->SUPER::new ( 4327 my $self = $class->SUPER::new (
3913 visible => 1, 4328 visible => 1,
3914 @_, 4329 @_,
3915 ); 4330 );
3916 4331
3917 Scalar::Util::weaken ($self->{root} = $self); 4332 DC::weaken ($self->{root} = $self);
3918 4333
3919 $self 4334 $self
3920} 4335}
3921 4336
3922sub size_request { 4337sub size_request {
… …
3970} 4385}
3971 4386
3972sub update { 4387sub update {
3973 my ($self) = @_; 4388 my ($self) = @_;
3974 4389
3975 $::WANT_REFRESH++; 4390 $::WANT_REFRESH = 1;
3976} 4391}
3977 4392
3978sub add { 4393sub add {
3979 my ($self, @children) = @_; 4394 my ($self, @children) = @_;
3980 4395
… …
4017 while ($self->{refresh_hook}) { 4432 while ($self->{refresh_hook}) {
4018 $_->() 4433 $_->()
4019 for values %{delete $self->{refresh_hook}}; 4434 for values %{delete $self->{refresh_hook}};
4020 } 4435 }
4021 4436
4022 if ($self->{realloc}) { 4437 while ($self->{realloc}) {
4023 my %queue; 4438 my %queue;
4024 my @queue; 4439 my @queue;
4025 my $widget; 4440 my $widget;
4026 4441
4027 outer: 4442 outer:
… …
4047 4462
4048 delete $queue{$widget+0}; 4463 delete $queue{$widget+0};
4049 4464
4050 my ($w, $h) = $widget->size_request; 4465 my ($w, $h) = $widget->size_request;
4051 4466
4052 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4467 $w += $widget->{padding_x} * 2;
4053 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4468 $h += $widget->{padding_y} * 2;
4469
4470 $w = max $widget->{min_w}, $w;
4471 $h = max $widget->{min_h}, $h;
4054 4472
4055 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4473 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4056 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4474 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4057 4475
4058 $w = $widget->{force_w} if exists $widget->{force_w}; 4476 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4074 } 4492 }
4075 } 4493 }
4076 4494
4077 delete $self->{realloc}{$widget+0}; 4495 delete $self->{realloc}{$widget+0};
4078 } 4496 }
4079 }
4080 4497
4081 while (my $size_alloc = delete $self->{size_alloc}) { 4498 while (my $size_alloc = delete $self->{size_alloc}) {
4082 my @queue = sort { $b->{visible} <=> $a->{visible} } 4499 my @queue = sort { $a->{visible} <=> $b->{visible} }
4083 values %$size_alloc; 4500 values %$size_alloc;
4084 4501
4085 while () { 4502 while () {
4086 my $widget = pop @queue || last; 4503 my $widget = pop @queue || last;
4087 4504
4088 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4505 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4089 4506
4090 $w = 0 if $w < 0;
4091 $h = 0 if $h < 0;
4092
4093 $w = max $widget->{min_w}, $w; 4507 $w = max $widget->{min_w}, $w;
4094 $h = max $widget->{min_h}, $h; 4508 $h = max $widget->{min_h}, $h;
4095 4509
4096# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4510# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4097# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4511# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4098 4512
4099 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4513 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4100 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4514 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4101 4515
4102 $w = int $w + 0.5; 4516 $w = int $w + 0.5;
4103 $h = int $h + 0.5; 4517 $h = int $h + 0.5;
4104 4518
4105 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4519 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4106 $widget->{old_w} = $widget->{w}; 4520 $widget->{old_w} = $widget->{w};
4107 $widget->{old_h} = $widget->{h}; 4521 $widget->{old_h} = $widget->{h};
4108 4522
4109 $widget->{w} = $w; 4523 $widget->{w} = $w;
4110 $widget->{h} = $h; 4524 $widget->{h} = $h;
4111 4525
4112 $widget->emit (size_allocate => $w, $h); 4526 $widget->emit (size_allocate => $w, $h);
4527 }
4113 } 4528 }
4114 } 4529 }
4115 } 4530 }
4116 4531
4117 while ($self->{post_alloc_hook}) { 4532 while ($self->{post_alloc_hook}) {
4118 $_->() 4533 $_->()
4119 for values %{delete $self->{post_alloc_hook}}; 4534 for values %{delete $self->{post_alloc_hook}};
4120 } 4535 }
4121
4122 4536
4123 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4537 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4124 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4538 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4125 glClear GL_COLOR_BUFFER_BIT; 4539 glClear GL_COLOR_BUFFER_BIT;
4126 4540
… …
4129 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4543 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4130 glMatrixMode GL_MODELVIEW; 4544 glMatrixMode GL_MODELVIEW;
4131 glLoadIdentity; 4545 glLoadIdentity;
4132 4546
4133 { 4547 {
4134 package CFPlus::UI::Base; 4548 package DC::UI::Base;
4135 4549
4136 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4550 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4137 (0, 0, $self->{w}, $self->{h}); 4551 (0, 0, $self->{w}, $self->{h});
4138 }
4139 4552
4140 $self->_draw; 4553 $self->_draw;
4554 }
4141} 4555}
4142 4556
4143############################################################################# 4557#############################################################################
4144 4558
4145package CFPlus::UI; 4559package DC::UI;
4146 4560
4147$ROOT = new CFPlus::UI::Root; 4561$ROOT = new DC::UI::Root;
4148$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4562$TOOLTIP = new DC::UI::Tooltip z => 900;
4149 4563
41501 45641
4151 4565

Diff Legend

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