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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use DC;
10use CFPlus::Pod; 9use DC::Pod;
11use CFPlus::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $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
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
… …
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
… …
210 reconfigure_widgets; 211 reconfigure_widgets;
211} 212}
212 213
213############################################################################# 214#############################################################################
214 215
215package CFPlus::UI::Event; 216package DC::UI::Event;
216 217
217sub xy { 218sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 220}
220 221
221############################################################################# 222#############################################################################
222 223
223package CFPlus::UI::Base; 224package DC::UI::Base;
224 225
225use strict; 226use strict;
226 227
227use CFPlus::OpenGL; 228use DC::OpenGL;
228 229
229sub new { 230sub new {
230 my $class = shift; 231 my $class = shift;
231 232
232 my $self = bless { 233 my $self = bless {
… …
237 h => undef, 238 h => undef,
238 can_events => 1, 239 can_events => 1,
239 @_ 240 @_
240 }, $class; 241 }, $class;
241 242
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 244
244 for (keys %$self) { 245 for (keys %$self) {
245 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
247 } 248 }
248 } 249 }
249 250
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $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};
252 $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};
253 $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};
254 $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};
255 256
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 259
259 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
268 $self->hide; 269 $self->hide;
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
273sub show { 278sub show {
274 my ($self) = @_; 279 my ($self) = @_;
275 280
276 return if $self->{parent}; 281 return if $self->{parent};
277 282
278 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
279} 284}
280 285
281sub set_visible { 286sub set_visible {
282 my ($self) = @_; 287 my ($self) = @_;
283 288
284 return if $self->{visible}; 289 return if $self->{visible};
290
291 $self->{parent} && $self->{parent}{root}#d#
292 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
285 293
286 $self->{root} = $self->{parent}{root}; 294 $self->{root} = $self->{parent}{root};
287 $self->{visible} = $self->{parent}{visible} + 1; 295 $self->{visible} = $self->{parent}{visible} + 1;
288 296
289 $self->emit (visibility_change => 1); 297 $self->emit (visibility_change => 1);
290 298
291 $self->realloc if !exists $self->{req_w}; 299 $self->realloc if !exists $self->{req_w};
292 300
293 $_->set_visible for $self->children; 301 $_->set_visible for $self->visible_children;
294} 302}
295 303
296sub set_invisible { 304sub set_invisible {
297 my ($self) = @_; 305 my ($self) = @_;
298 306
… …
304 delete $self->{root}; 312 delete $self->{root};
305 313
306 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
307 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
308 316
309 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 317 $DC::UI::TOOLTIP_WATCHER->invoke
310 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
311 319
312 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
313 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
314} 322}
… …
316sub set_visibility { 324sub set_visibility {
317 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
318 326
319 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
320 328
321 $visible ? $self->hide 329 $visible ? $self->show
322 : $self->show; 330 : $self->hide;
323} 331}
324 332
325sub toggle_visibility { 333sub toggle_visibility {
326 my ($self) = @_; 334 my ($self) = @_;
327 335
… …
333sub hide { 341sub hide {
334 my ($self) = @_; 342 my ($self) = @_;
335 343
336 $self->set_invisible; 344 $self->set_invisible;
337 345
346 # extra $parent copy for 5.8.8+ bug workaround
347 # (otherwise $_[0] in remove gets freed
348 if (my $parent = $self->{parent}) {
338 $self->{parent}->remove ($self) 349 $parent->remove ($self);
339 if $self->{parent}; 350 }
340} 351}
341 352
342sub move_abs { 353sub move_abs {
343 my ($self, $x, $y, $z) = @_; 354 my ($self, $x, $y, $z) = @_;
344 355
… …
356 $self->{force_h} = $h; 367 $self->{force_h} = $h;
357 368
358 $self->realloc; 369 $self->realloc;
359} 370}
360 371
372# traverse the widget chain up to find the maximum "physical" size constraints
373sub get_max_wh {
374 my ($self) = @_;
375
376 my ($w, $h) = @$self{qw(max_w max_h)};
377
378 if ($w <= 0 || $h <= 0) {
379 my ($mw, $mh) = $self->{parent}
380 ? $self->{parent}->get_max_wh
381 : ($::WIDTH, $::HEIGHT);
382
383 $w = $mw if $w <= 0;
384 $h = $mh if $h <= 0;
385 }
386
387 ($w, $h)
388}
389
361sub size_request { 390sub size_request {
362 require Carp; 391 require Carp;
363 Carp::confess "size_request is abstract"; 392 Carp::confess "size_request is abstract";
364} 393}
365 394
… …
371 my ($self, $x, $y, $w, $h) = @_; 400 my ($self, $x, $y, $w, $h) = @_;
372 401
373 if ($self->{aspect}) { 402 if ($self->{aspect}) {
374 my ($ow, $oh) = ($w, $h); 403 my ($ow, $oh) = ($w, $h);
375 404
376 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 405 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
377 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 406 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
378 407
379 # use alignment to adjust x, y 408 # use alignment to adjust x, y
380 409
381 $x += int 0.5 * ($ow - $w); 410 $x += int 0.5 * ($ow - $w);
382 $y += int 0.5 * ($oh - $h); 411 $y += int 0.5 * ($oh - $h);
… …
423 452
424 return if $self->{tooltip} eq $tooltip; 453 return if $self->{tooltip} eq $tooltip;
425 454
426 $self->{tooltip} = $tooltip; 455 $self->{tooltip} = $tooltip;
427 456
428 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 457 if ($DC::UI::TOOLTIP->{owner} == $self) {
429 delete $CFPlus::UI::TOOLTIP->{owner}; 458 delete $DC::UI::TOOLTIP->{owner};
430 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 459 $DC::UI::TOOLTIP_WATCHER->invoke;
431 } 460 }
432} 461}
433 462
434# translate global coordinates to local coordinate system 463# translate global coordinates to local coordinate system
435sub coord2local { 464sub coord2local {
436 my ($self, $x, $y) = @_; 465 my ($self, $x, $y) = @_;
437 466
438 Carp::confess unless $self->{parent};#d# 467 return (undef, undef) unless $self->{parent};
439 468
440 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 469 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
441} 470}
442 471
443# translate local coordinates to global coordinate system 472# translate local coordinates to global coordinate system
444sub coord2global { 473sub coord2global {
445 my ($self, $x, $y) = @_; 474 my ($self, $x, $y) = @_;
446 475
447 Carp::confess unless $self->{parent};#d# 476 return (undef, undef) unless $self->{parent};
448 477
449 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 478 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
450} 479}
451 480
452sub invoke_focus_in { 481sub invoke_focus_in {
… …
501sub connect { 530sub connect {
502 my ($self, $signal, $cb) = @_; 531 my ($self, $signal, $cb) = @_;
503 532
504 push @{ $self->{signal_cb}{$signal} }, $cb; 533 push @{ $self->{signal_cb}{$signal} }, $cb;
505 534
506 defined wantarray and CFPlus::guard { 535 defined wantarray and DC::guard {
507 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 536 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
508 @{ $self->{signal_cb}{$signal} }; 537 @{ $self->{signal_cb}{$signal} };
509 } 538 }
510} 539}
511 540
… …
543 572
544 # parent 573 # parent
545 $self->{parent} && $self->{parent}->emit ($signal, @args) 574 $self->{parent} && $self->{parent}->emit ($signal, @args)
546} 575}
547 576
548sub find_widget { 577#sub find_widget {
549 my ($self, $x, $y) = @_; 578# in .xs
550
551 return () unless $self->{can_events};
552
553 return $self
554 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557 ()
558}
559 579
560sub set_parent { 580sub set_parent {
561 my ($self, $parent) = @_; 581 my ($self, $parent) = @_;
562 582
563 CFPlus::weaken ($self->{parent} = $parent); 583 DC::weaken ($self->{parent} = $parent);
564 $self->set_visible if $parent->{visible}; 584 $self->set_visible if $parent->{visible};
565} 585}
566 586
567sub realloc { 587sub realloc {
568 my ($self) = @_; 588 my ($self) = @_;
… …
594 614
595# using global variables seems a bit hacky, but passing through all drawing 615# using global variables seems a bit hacky, but passing through all drawing
596# functions seems pointless. 616# functions seems pointless.
597our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 617our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
598 618
599sub draw { 619#sub draw {
600 my ($self) = @_; 620#CFPlus.xs
601
602 return unless $self->{h} && $self->{w};
603
604 # update screen rectangle
605 local $draw_x = $draw_x + $self->{x};
606 local $draw_y = $draw_y + $self->{y};
607
608 # skip widgets that are entirely outside the drawing area
609 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
610 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
611
612 glPushMatrix;
613 glTranslate $self->{x}, $self->{y}, 0;
614
615 if ($self == $HOVER && $self->{can_hover}) {
616 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
617 glEnable GL_BLEND;
618 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glBegin GL_QUADS;
620 glVertex 0 , 0;
621 glVertex $self->{w}, 0;
622 glVertex $self->{w}, $self->{h};
623 glVertex 0 , $self->{h};
624 glEnd;
625 glDisable GL_BLEND;
626 }
627
628 if ($ENV{CFPLUS_DEBUG} & 1) {
629 glPushMatrix;
630 glColor 1, 1, 0, 1;
631 glTranslate 0.375, 0.375;
632 glBegin GL_LINE_LOOP;
633 glVertex 0 , 0;
634 glVertex $self->{w} - 1, 0;
635 glVertex $self->{w} - 1, $self->{h} - 1;
636 glVertex 0 , $self->{h} - 1;
637 glEnd;
638 glPopMatrix;
639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
640 }
641
642 $self->_draw;
643 glPopMatrix;
644}
645 621
646sub _draw { 622sub _draw {
647 my ($self) = @_; 623 my ($self) = @_;
648 624
649 warn "no draw defined for $self\n"; 625 warn "no draw defined for $self\n";
650} 626}
651 627
652my $cntx;#d#
653sub DESTROY { 628sub DESTROY {
654 my ($self) = @_; 629 my ($self) = @_;
655 630
656 return if CFPlus::in_destruct; 631 return if DC::in_destruct;
657 632
633 local $@;
658 eval { $self->destroy }; 634 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 635 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660 636
661 delete $WIDGET{$self+0}; 637 delete $WIDGET{$self+0};
662} 638}
663 639
664############################################################################# 640#############################################################################
665 641
666package CFPlus::UI::DrawBG; 642package DC::UI::DrawBG;
667 643
668our @ISA = CFPlus::UI::Base::; 644our @ISA = DC::UI::Base::;
669 645
670use strict; 646use strict;
671use CFPlus::OpenGL; 647use DC::OpenGL;
672 648
673sub new { 649sub new {
674 my $class = shift; 650 my $class = shift;
675
676 # range [value, low, high, page]
677 651
678 $class->SUPER::new ( 652 $class->SUPER::new (
679 #bg => [0, 0, 0, 0.2], 653 #bg => [0, 0, 0, 0.2],
680 #active_bg => [1, 1, 1, 0.5], 654 #active_bg => [1, 1, 1, 0.5],
681 @_ 655 @_
… …
693 my ($w, $h) = @$self{qw(w h)}; 667 my ($w, $h) = @$self{qw(w h)};
694 668
695 glEnable GL_BLEND; 669 glEnable GL_BLEND;
696 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 670 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
697 glColor_premultiply @$color; 671 glColor_premultiply @$color;
698
699 glBegin GL_QUADS;
700 glVertex 0 , 0;
701 glVertex 0 , $h;
702 glVertex $w, $h; 672 glRect 0, 0, $w, $h;
703 glVertex $w, 0;
704 glEnd;
705
706 glDisable GL_BLEND; 673 glDisable GL_BLEND;
707 } 674 }
708} 675}
709 676
710############################################################################# 677#############################################################################
711 678
712package CFPlus::UI::Empty; 679package DC::UI::Empty;
713 680
714our @ISA = CFPlus::UI::Base::; 681our @ISA = DC::UI::Base::;
715 682
716sub new { 683sub new {
717 my ($class, %arg) = @_; 684 my ($class, %arg) = @_;
718 $class->SUPER::new (can_events => 0, %arg); 685 $class->SUPER::new (can_events => 0, %arg);
719} 686}
… …
726 693
727sub draw { } 694sub draw { }
728 695
729############################################################################# 696#############################################################################
730 697
731package CFPlus::UI::Container; 698package DC::UI::Container;
732 699
733our @ISA = CFPlus::UI::Base::; 700our @ISA = DC::UI::Base::;
734 701
735sub new { 702sub new {
736 my ($class, %arg) = @_; 703 my ($class, %arg) = @_;
737 704
738 my $children = delete $arg{children}; 705 my $children = delete $arg{children};
… …
742 can_events => 0, 709 can_events => 0,
743 %arg, 710 %arg,
744 ); 711 );
745 712
746 $self->add (@$children) 713 $self->add (@$children)
747 if $children; 714 if $children && @$children;
748 715
749 $self 716 $self
750} 717}
751 718
752sub realloc { 719sub realloc {
… …
761 my ($self, @widgets) = @_; 728 my ($self, @widgets) = @_;
762 729
763 $_->set_parent ($self) 730 $_->set_parent ($self)
764 for @widgets; 731 for @widgets;
765 732
733 # TODO: only do this in widgets that need it, e.g. root, fixed
766 use sort 'stable'; 734 use sort 'stable';
767 735
768 $self->{children} = [ 736 $self->{children} = [
769 sort { $a->{z} <=> $b->{z} } 737 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 738 @{$self->{children}}, @widgets
771 ]; 739 ];
772 740
773 $self->realloc; 741 $self->realloc;
742
743 $self->emit (c_add => \@widgets);
744
745 map $_+0, @widgets
774} 746}
775 747
776sub children { 748sub children {
777 @{ $_[0]{children} } 749 @{ $_[0]{children} }
778} 750}
779 751
780sub remove { 752sub remove {
781 my ($self, $child) = @_; 753 my ($self, @widgets) = @_;
782 754
755 $self->emit (c_remove => \@widgets);
756
757 for my $child (@widgets) {
783 delete $child->{parent}; 758 delete $child->{parent};
784 $child->hide; 759 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 760 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
761 }
787 762
788 $self->realloc; 763 $self->realloc;
789} 764}
790 765
791sub clear { 766sub clear {
792 my ($self) = @_; 767 my ($self) = @_;
793 768
794 my $children = delete $self->{children}; 769 my $children = $self->{children};
795 $self->{children} = []; 770 $self->{children} = [];
796 771
797 for (@$children) { 772 for (@$children) {
798 delete $_->{parent}; 773 delete $_->{parent};
799 $_->hide; 774 $_->hide;
… …
819} 794}
820 795
821sub _draw { 796sub _draw {
822 my ($self) = @_; 797 my ($self) = @_;
823 798
824 $_->draw for @{$self->{children}}; 799 $_->draw for $self->visible_children;
825} 800}
826 801
827############################################################################# 802#############################################################################
828 803
829package CFPlus::UI::Bin; 804package DC::UI::Bin;
830 805
831our @ISA = CFPlus::UI::Container::; 806our @ISA = DC::UI::Container::;
832 807
833sub new { 808sub new {
834 my ($class, %arg) = @_; 809 my ($class, %arg) = @_;
835 810
836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 811 my $child = (delete $arg{child}) || new DC::UI::Empty::;
837 812
838 $class->SUPER::new (children => [$child], %arg) 813 $class->SUPER::new (children => [$child], %arg)
839} 814}
840 815
841sub add { 816sub add {
842 my ($self, $child) = @_; 817 my ($self, $child) = @_;
843 818
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 819 $self->clear;
845 $self->SUPER::add ($child); 820 $self->SUPER::add ($child);
846} 821}
847 822
848sub remove { 823sub remove {
849 my ($self, $widget) = @_; 824 my ($self, $widget) = @_;
850 825
851 $self->SUPER::remove ($widget); 826 $self->SUPER::remove ($widget);
852 827
853 $self->{children} = [new CFPlus::UI::Empty] 828 $self->{children} = [new DC::UI::Empty]
854 unless @{$self->{children}}; 829 unless @{$self->{children}};
855} 830}
856 831
857sub child { $_[0]->{children}[0] } 832sub child { $_[0]->{children}[0] }
858 833
… …
867 842
868 1 843 1
869} 844}
870 845
871############################################################################# 846#############################################################################
872
873# back-buffered drawing area 847# back-buffered drawing area
874 848
875package CFPlus::UI::Window; 849package DC::UI::Window;
876 850
877our @ISA = CFPlus::UI::Bin::; 851our @ISA = DC::UI::Bin::;
878 852
879use CFPlus::OpenGL; 853use DC::OpenGL;
880 854
881sub new { 855sub new {
882 my ($class, %arg) = @_; 856 my ($class, %arg) = @_;
883 857
884 my $self = $class->SUPER::new (%arg); 858 my $self = $class->SUPER::new (%arg);
… …
906} 880}
907 881
908sub render_child { 882sub render_child {
909 my ($self) = @_; 883 my ($self) = @_;
910 884
911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 885 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
912 glClearColor 0, 0, 0, 0; 886 glClearColor 0, 0, 0, 0;
913 glClear GL_COLOR_BUFFER_BIT; 887 glClear GL_COLOR_BUFFER_BIT;
914 888
915 { 889 {
916 package CFPlus::UI::Base; 890 package DC::UI::Base;
917 891
918 local ($draw_x, $draw_y, $draw_w, $draw_h) = 892 local ($draw_x, $draw_y, $draw_w, $draw_h) =
919 (0, 0, $self->{w}, $self->{h}); 893 (0, 0, $self->{w}, $self->{h});
920 894
921 $self->_render; 895 $self->_render;
… …
938 glDisable GL_TEXTURE_2D; 912 glDisable GL_TEXTURE_2D;
939} 913}
940 914
941############################################################################# 915#############################################################################
942 916
943package CFPlus::UI::ViewPort; 917package DC::UI::ViewPort;
944 918
919use List::Util qw(min max);
920
945our @ISA = CFPlus::UI::Window::; 921our @ISA = DC::UI::Window::;
946 922
947sub new { 923sub new {
948 my $class = shift; 924 my $class = shift;
949 925
950 $class->SUPER::new ( 926 $class->SUPER::new (
… …
957sub size_request { 933sub size_request {
958 my ($self) = @_; 934 my ($self) = @_;
959 935
960 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 936 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961 937
962 $w = 10 if $self->{scroll_x}; 938 $w = 1 if $self->{scroll_x};
963 $h = 10 if $self->{scroll_y}; 939 $h = 1 if $self->{scroll_y};
964 940
965 ($w, $h) 941 ($w, $h)
966} 942}
967 943
968sub invoke_size_allocate { 944sub invoke_size_allocate {
… …
980} 956}
981 957
982sub set_offset { 958sub set_offset {
983 my ($self, $x, $y) = @_; 959 my ($self, $x, $y) = @_;
984 960
961 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
962 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
963
964 if ($x != $self->{view_x} or $y != $self->{view_y}) {
985 $self->{view_x} = int $x; 965 $self->{view_x} = $x;
986 $self->{view_y} = int $y; 966 $self->{view_y} = $y;
987 967
968 $self->emit (changed => $x, $y);
988 $self->update; 969 $self->update;
970 }
971}
972
973sub set_center {
974 my ($self, $x, $y) = @_;
975
976 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
977}
978
979sub make_visible {
980 my ($self, $x, $y, $border) = @_;
981
982 if ( $x < $self->{view_x} + $self->{w} * $border
983 || $x > $self->{view_x} + $self->{w} * (1 - $border)
984 || $y < $self->{view_y} + $self->{h} * $border
985 || $y > $self->{view_y} + $self->{h} * (1 - $border)
986 ) {
987 $self->set_center ($x, $y);
988 }
989} 989}
990 990
991# hmm, this does not work for topleft of $self... but we should not ask for that 991# hmm, this does not work for topleft of $self... but we should not ask for that
992sub coord2local { 992sub coord2local {
993 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
… …
1008 my ($self, $x, $y) = @_; 1008 my ($self, $x, $y) = @_;
1009 1009
1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012 ) { 1012 ) {
1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1014 } else { 1014 } else {
1015 $self->CFPlus::UI::Base::find_widget ($x, $y) 1015 $self->DC::UI::Base::find_widget ($x, $y)
1016 } 1016 }
1017} 1017}
1018 1018
1019sub _render { 1019sub _render {
1020 my ($self) = @_; 1020 my ($self) = @_;
1021 1021
1022 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1022 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1023 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1023 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1024 1024
1025 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1025 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1026 1026
1027 $self->SUPER::_render; 1027 $self->SUPER::_render;
1028} 1028}
1029 1029
1030############################################################################# 1030#############################################################################
1031 1031
1032package CFPlus::UI::ScrolledWindow; 1032package DC::UI::ScrolledWindow;
1033 1033
1034our @ISA = CFPlus::UI::HBox::; 1034our @ISA = DC::UI::Table::;
1035 1035
1036sub new { 1036sub new {
1037 my ($class, %arg) = @_; 1037 my ($class, %arg) = @_;
1038 1038
1039 my $child = delete $arg{child}; 1039 my $child = delete $arg{child};
1040 1040
1041 my $self; 1041 my $self;
1042 1042
1043 my $slider = new CFPlus::UI::Slider 1043 my $hslider = new DC::UI::Slider
1044 c_col => 0,
1045 c_row => 1,
1046 vertical => 0,
1047 range => [0, 0, 1, 0.01], # HACK fix
1048 on_changed => sub {
1049 $self->{hpos} = $_[1];
1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1051 },
1052 ;
1053
1054 my $vslider = new DC::UI::Slider
1055 c_col => 1,
1056 c_row => 0,
1044 vertical => 1, 1057 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1059 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1062 },
1049 ; 1063 ;
1050 1064
1051 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1053 can_events => 1, 1068 can_events => 1,
1054 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1055 %arg, 1073 %arg,
1056 ); 1074 );
1057 1075
1076 $self->{vp} = new DC::UI::ViewPort
1077 c_col => 0,
1078 c_row => 0,
1079 expand => 1,
1080 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y},
1082 on_changed => sub {
1083 my ($vp, $x, $y) = @_;
1084
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 on_size_allocate => sub {
1091 my ($vp, $w, $h) = @_;
1092 $vp->{parent}->update_slider;
1093 0
1094 },
1095 ;
1096
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1097 $self->SUPER::add ($self->{vp});
1098
1059 $self->add ($child) if $child; 1099 $self->add ($child) if $child;
1060 1100
1061 $self 1101 $self
1062} 1102}
1063
1064#TODO# update range on size_allocate depending on child
1065 1103
1066sub add { 1104sub add {
1067 my ($self, $widget) = @_; 1105 my ($self, $widget) = @_;
1068 1106
1069 $self->{vp}->add ($self->{child} = $widget); 1107 $self->{vp}->add ($self->{child} = $widget);
1070} 1108}
1071 1109
1110sub set_offset { shift->{vp}->set_offset (@_) }
1111sub set_center { shift->{vp}->set_center (@_) }
1112sub make_visible { shift->{vp}->make_visible (@_) }
1113
1114sub update_slider {
1115 my ($self) = @_;
1116
1117 my $child = ($self->{vp} or return)->child;
1118
1119 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129 }
1130
1131 if ($self->{scroll_y}) {
1132 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1133 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1134
1135 my $visible = $h1 > $h2;
1136 if ($visible != $self->{vslider_visible}) {
1137 $self->{vslider_visible} = $visible;
1138 $visible ? $self->SUPER::add ($self->{vslider})
1139 : $self->SUPER::remove ($self->{vslider});
1140 }
1141 }
1142}
1143
1144sub start_dragging {
1145 my ($self, $ev) = @_;
1146
1147 $self->grab_focus;
1148
1149 my $ox = $self->{vp}{view_x};
1150 my $oy = $self->{vp}{view_y};
1151
1152 $self->{motion} = sub {
1153 my ($ev, $x, $y) = @_;
1154
1155 $ox -= $ev->{xrel};
1156 $oy -= $ev->{yrel};
1157
1158 $self->{vp}->set_offset ($ox, $oy);
1159 };
1160}
1161
1072sub invoke_mouse_wheel { 1162sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1163 my ($self, $ev) = @_;
1074 1164
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev); 1165 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1166 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1078 1167
1079 1 1168 1
1080} 1169}
1081 1170
1082sub update_slider { 1171sub invoke_button_down {
1083 my ($self) = @_; 1172 my ($self, $ev, $x, $y) = @_;
1084 1173
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1174 if ($ev->{button} == 2) {
1086} 1175 $self->start_dragging ($ev);
1176 return 1;
1177 }
1087 1178
1088sub update { 1179 0
1089 my ($self) = @_; 1180}
1090 1181
1091 $self->SUPER::update; 1182sub invoke_button_up {
1183 my ($self, $ev, $x, $y) = @_;
1092 1184
1093 $self->update_slider; 1185 if (delete $self->{motion}) {
1186 return 1;
1187 }
1188
1189 0
1190}
1191
1192sub invoke_mouse_motion {
1193 my ($self, $ev, $x, $y) = @_;
1194
1195 if ($self->{motion}) {
1196 $self->{motion}->($ev, $x, $y);
1197 return 1;
1198 }
1199
1200 0
1094} 1201}
1095 1202
1096sub invoke_size_allocate { 1203sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1098 1205
1099 $self->update_slider; 1206 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1208}
1103 1209
1104############################################################################# 1210#############################################################################
1105 1211
1106package CFPlus::UI::Frame; 1212package DC::UI::Frame;
1107 1213
1108our @ISA = CFPlus::UI::Bin::; 1214our @ISA = DC::UI::Bin::;
1109 1215
1110use CFPlus::OpenGL; 1216use DC::OpenGL;
1111 1217
1112sub new { 1218sub new {
1113 my $class = shift; 1219 my $class = shift;
1114 1220
1115 $class->SUPER::new ( 1221 $class->SUPER::new (
… …
1125 my ($w, $h) = @$self{qw(w h)}; 1231 my ($w, $h) = @$self{qw(w h)};
1126 1232
1127 glEnable GL_BLEND; 1233 glEnable GL_BLEND;
1128 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1129 glColor_premultiply @{ $self->{bg} }; 1235 glColor_premultiply @{ $self->{bg} };
1130
1131 glBegin GL_QUADS;
1132 glVertex 0 , 0;
1133 glVertex 0 , $h;
1134 glVertex $w, $h; 1236 glRect 0, 0, $w, $h;
1135 glVertex $w, 0;
1136 glEnd;
1137
1138 glDisable GL_BLEND; 1237 glDisable GL_BLEND;
1139 } 1238 }
1140 1239
1141 $self->SUPER::_draw; 1240 $self->SUPER::_draw;
1142} 1241}
1143 1242
1144############################################################################# 1243#############################################################################
1145 1244
1146package CFPlus::UI::FancyFrame; 1245package DC::UI::FancyFrame;
1147 1246
1148our @ISA = CFPlus::UI::Bin::; 1247our @ISA = DC::UI::Bin::;
1149 1248
1150use CFPlus::OpenGL; 1249use DC::OpenGL;
1151 1250
1152sub new { 1251sub new {
1153 my ($class, %arg) = @_; 1252 my ($class, %arg) = @_;
1154 1253
1155 if ((exists $arg{label}) && !ref $arg{label}) { 1254 if ((exists $arg{label}) && !ref $arg{label}) {
1156 $arg{label} = new CFPlus::UI::Label 1255 $arg{label} = new DC::UI::Label
1157 align => 1, 1256 align => 1,
1158 valign => 0, 1257 valign => 0.5,
1159 text => $arg{label}, 1258 text => $arg{label},
1160 fontsize => ($arg{border} || 0.8) * 0.75; 1259 fontsize => ($arg{border} || 0.8) * 0.75;
1161 } 1260 }
1162 1261
1163 my $self = $class->SUPER::new ( 1262 my $self = $class->SUPER::new (
1164 # label => "", 1263 # label => "",
1165 fg => [0.6, 0.3, 0.1], 1264 fg => undef,
1166 border => 0.8, 1265 border => 0.8,
1167 style => 'single', 1266 style => 'single',
1168 %arg, 1267 %arg,
1169 ); 1268 );
1170 1269
… …
1173 1272
1174sub add { 1273sub add {
1175 my ($self, @widgets) = @_; 1274 my ($self, @widgets) = @_;
1176 1275
1177 $self->SUPER::add (@widgets); 1276 $self->SUPER::add (@widgets);
1178 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1277 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1179} 1278}
1180 1279
1181sub border { 1280sub border {
1182 int $_[0]{border} * $::FONTSIZE 1281 int $_[0]{border} * $::FONTSIZE
1183} 1282}
… …
1223 my $border = $self->border; 1322 my $border = $self->border;
1224 my ($w, $h) = ($self->{w}, $self->{h}); 1323 my ($w, $h) = ($self->{w}, $self->{h});
1225 1324
1226 $child->draw; 1325 $child->draw;
1227 1326
1228 glColor @{$self->{fg}}; 1327 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1229 glBegin GL_LINE_STRIP; 1328 glBegin GL_LINE_STRIP;
1230 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1329 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1231 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1330 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1331 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1233 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1332 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1241 } 1340 }
1242} 1341}
1243 1342
1244############################################################################# 1343#############################################################################
1245 1344
1246package CFPlus::UI::Toplevel; 1345package DC::UI::Toplevel;
1247 1346
1248our @ISA = CFPlus::UI::Bin::; 1347our @ISA = DC::UI::Bin::;
1249 1348
1250use CFPlus::OpenGL; 1349use DC::OpenGL;
1251 1350
1252my $bg = 1351my $bg =
1253 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1352 new_from_resource DC::Texture "d1_bg.png",
1254 mipmap => 1, wrap => 1; 1353 mipmap => 1, wrap => 1;
1255 1354
1256my @border = 1355my @border =
1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1356 map { new_from_resource DC::Texture $_, mipmap => 1 }
1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1357 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1358
1359my @icon =
1360 map { new_from_resource DC::Texture $_, mipmap => 1 }
1361 qw(x1_move.png x1_resize.png);
1259 1362
1260sub new { 1363sub new {
1261 my ($class, %arg) = @_; 1364 my ($class, %arg) = @_;
1262 1365
1263 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
1264 bg => [1, 1, 1, 1], 1367 bg => [1, 1, 1, 1],
1265 border_bg => [1, 1, 1, 1], 1368 border_bg => [1, 1, 1, 1],
1266 border => 0.6, 1369 border => 0.8,
1267 can_events => 1, 1370 can_events => 1,
1268 min_w => 64, 1371 min_w => 64,
1269 min_h => 32, 1372 min_h => 32,
1270 %arg, 1373 %arg,
1271 ); 1374 );
1272 1375
1273 $self->{title_widget} = new CFPlus::UI::Label 1376 $self->{title_widget} = new DC::UI::Label
1274 align => 0, 1377 align => 0.5,
1275 valign => 1, 1378 valign => 1,
1276 text => $self->{title}, 1379 text => $self->{title},
1277 fontsize => $self->{border}, 1380 fontsize => $self->{border},
1278 if exists $self->{title}; 1381 if exists $self->{title};
1279 1382
1280 if ($self->{has_close_button}) { 1383 if ($self->{has_close_button}) {
1281 $self->{close_button} = 1384 $self->{close_button} =
1282 new CFPlus::UI::ImageButton 1385 new DC::UI::ImageButton
1283 path => 'x1_close.png', 1386 path => 'x1_close.png',
1284 on_activate => sub { $self->emit ("delete") }; 1387 on_activate => sub { $self->emit ("delete") };
1285 1388
1286 $self->CFPlus::UI::Container::add ($self->{close_button}); 1389 $self->DC::UI::Container::add ($self->{close_button});
1287 } 1390 }
1288 1391
1289 $self 1392 $self
1290} 1393}
1291 1394
1292sub add { 1395sub add {
1293 my ($self, @widgets) = @_; 1396 my ($self, @widgets) = @_;
1294 1397
1295 $self->SUPER::add (@widgets); 1398 $self->SUPER::add (@widgets);
1296 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1399 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1297 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1400 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1298} 1401}
1299 1402
1300sub border { 1403sub border {
1301 int $_[0]{border} * $::FONTSIZE 1404 int $_[0]{border} * $::FONTSIZE
1405}
1406
1407sub get_max_wh {
1408 my ($self) = @_;
1409
1410 return ($self->{w}, $self->{h})
1411 if $self->{visible} && $self->{w};
1412
1413 $self->SUPER::get_max_wh
1302} 1414}
1303 1415
1304sub size_request { 1416sub size_request {
1305 my ($self) = @_; 1417 my ($self) = @_;
1306 1418
… …
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433 1545
1434 my $border = $self->border; 1546 my $border = $self->border;
1435 1547
1436 glColor @{ $self->{border_bg} }; 1548 glColor @{ $self->{border_bg} };
1437 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1549 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1550 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1551 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1552 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1553
1554 # move
1555 my $w2 = ($w - $border) * .5;
1556 my $h2 = ($h - $border) * .5;
1557 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1558 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1559 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1560
1561 # resize
1562 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1564 unless $self->{has_close_button};
1565 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1441 1567
1442 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1568 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1443 glColor @{ $self->{bg} }; 1569 glColor @{ $self->{bg} };
1444 1570
1445 # TODO: repeat texture not scale 1571 # TODO: repeat texture not scale
… …
1464 if $self->{close_button}; 1590 if $self->{close_button};
1465} 1591}
1466 1592
1467############################################################################# 1593#############################################################################
1468 1594
1469package CFPlus::UI::Table; 1595package DC::UI::Table;
1470 1596
1471our @ISA = CFPlus::UI::Base::; 1597our @ISA = DC::UI::Container::;
1472 1598
1473use List::Util qw(max sum); 1599use List::Util qw(max sum);
1474 1600
1475use CFPlus::OpenGL; 1601use DC::OpenGL;
1476 1602
1477sub new { 1603sub new {
1478 my $class = shift; 1604 my $class = shift;
1479 1605
1480 $class->SUPER::new ( 1606 $class->SUPER::new (
1481 col_expand => [], 1607 col_expand => [],
1608 row_expand => [],
1482 @_, 1609 @_,
1483 ) 1610 )
1484} 1611}
1485 1612
1486sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488}
1489
1490sub add { 1613sub add {
1614 my ($self, @widgets) = @_;
1615
1616 for my $child (@widgets) {
1617 $child->{c_rowspan} ||= 1;
1618 $child->{c_colspan} ||= 1;
1619 }
1620
1621 $self->SUPER::add (@widgets);
1622}
1623
1624sub add_at {
1491 my ($self) = shift; 1625 my $self = shift;
1626
1627 my @widgets;
1492 1628
1493 while (@_) { 1629 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1630 my ($col, $row, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child;
1497 }
1498 1631
1499 $self->{force_realloc} = 1; 1632 $child->{c_row} = $row;
1500 $self->{force_size_alloc} = 1; 1633 $child->{c_col} = $col;
1501 $self->realloc;
1502}
1503 1634
1504sub remove { 1635 push @widgets, $child;
1636 }
1637
1638 $self->add (@widgets);
1639}
1640
1641sub get_wh {
1505 my ($self, $child) = @_; 1642 my ($self) = @_;
1506 1643
1507 # TODO: not yet implemented 1644 my (@w, @h);
1508}
1509
1510# TODO: move to container class maybe? send children a signal on removal?
1511sub clear {
1512 my ($self) = @_;
1513 1645
1514 my @children = $self->children; 1646 my @children = $self->children;
1515 delete $self->{children}; 1647
1648 # first pass, columns
1649 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1650 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1651
1652 my $sw = sum @w[$c .. $c + $cs - 1];
1653
1654 if ($w > $sw) {
1655 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1656 }
1516 1657 }
1517 for (@children) {
1518 delete $_->{parent};
1519 $_->hide;
1520 }
1521 1658
1522 $self->realloc; 1659 # second pass, rows
1523} 1660 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1524
1525sub get_wh {
1526 my ($self) = @_;
1527
1528 my (@w, @h);
1529
1530 for my $y (0 .. $#{$self->{children}}) {
1531 my $row = $self->{children}[$y]
1532 or next;
1533
1534 for my $x (0 .. $#$row) {
1535 my $widget = $row->[$x]
1536 or next;
1537 my ($w, $h) = @$widget{qw(req_w req_h)}; 1661 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1538 1662
1539 $w[$x] = max $w[$x], $w; 1663 my $sh = sum @h[$r .. $r + $rs - 1];
1540 $h[$y] = max $h[$y], $h; 1664
1665 if ($h > $sh) {
1666 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541 } 1667 }
1542 } 1668 }
1543 1669
1544 (\@w, \@h) 1670 (\@w, \@h)
1545} 1671}
… …
1561 my ($ws, $hs) = $self->get_wh; 1687 my ($ws, $hs) = $self->get_wh;
1562 1688
1563 my $req_w = (sum @$ws) || 1; 1689 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1690 my $req_h = (sum @$hs) || 1;
1565 1691
1566 # TODO: nicer code && do row_expand 1692 # now linearly scale the rows/columns to the allocated size
1567 my @col_expand = @{$self->{col_expand}}; 1693 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1694 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1695 my $col_expand = (sum @col_expand) || 1;
1570 1696
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1697 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1698
1575 CFPlus::UI::harmonize $ws; 1699 DC::UI::harmonize $ws;
1700
1701 my @row_expand = @{$self->{row_expand}};
1702 @row_expand = (1) x @$ws unless @row_expand;
1703 my $row_expand = (sum @row_expand) || 1;
1704
1705 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1706
1576 CFPlus::UI::harmonize $hs; 1707 DC::UI::harmonize $hs;
1577 1708
1578 my $y; 1709 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1710 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579 1711
1580 for my $r (0 .. $#{$self->{children}}) { 1712 for my $widget ($self->children) {
1581 my $row = $self->{children}[$r] 1713 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1582 or next;
1583 1714
1584 my $x = 0; 1715 $widget->configure (
1585 my $row_h = $hs->[$r]; 1716 $x[$c], $y[$r],
1717 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586 1718 );
1587 for my $c (0 .. $#$row) { 1719 }
1588 my $col_w = $ws->[$c];
1589 1720
1590 if (my $widget = $row->[$c]) { 1721 1
1591 $widget->configure ($x, $y, $col_w, $row_h); 1722}
1592 }
1593 1723
1594 $x += $col_w; 1724#############################################################################
1725
1726package DC::UI::Fixed;
1727
1728use List::Util qw(min max);
1729
1730our @ISA = DC::UI::Container::;
1731
1732sub _scale($$$) {
1733 my ($rel, $val, $max) = @_;
1734
1735 $rel ? $val * $max : $val
1736}
1737
1738sub size_request {
1739 my ($self) = @_;
1740
1741 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1742
1743 # determine overall size by querying abs widgets
1744 for my $child ($self->visible_children) {
1745 unless ($child->{c_rel}) {
1746 my $x = $child->{c_x};
1747 my $y = $child->{c_y};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1595 } 1751 }
1752 }
1596 1753
1597 $y += $row_h; 1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 # now layout remaining widgets
1758 for my $child ($self->visible_children) {
1759 if ($child->{c_rel}) {
1760 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1761 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 }
1766 }
1767
1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 ($W, $H)
1772}
1773
1774sub invoke_size_allocate {
1775 my ($self, $W, $H) = @_;
1776
1777 for my $child ($self->visible_children) {
1778 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1779 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1780
1781 $x += $child->{c_halign} * $child->{req_w};
1782 $y += $child->{c_valign} * $child->{req_h};
1783
1784 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1598 } 1785 }
1599 1786
1600 1 1787 1
1601} 1788}
1602 1789
1603sub find_widget {
1604 my ($self, $x, $y) = @_;
1605
1606 $x -= $self->{x};
1607 $y -= $self->{y};
1608
1609 my $res;
1610
1611 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612 $res = $_->find_widget ($x, $y)
1613 and return $res;
1614 }
1615
1616 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617}
1618
1619sub _draw {
1620 my ($self) = @_;
1621
1622 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_;
1624 }
1625}
1626
1627############################################################################# 1790#############################################################################
1628 1791
1629package CFPlus::UI::Box; 1792package DC::UI::Box;
1630 1793
1631our @ISA = CFPlus::UI::Container::; 1794our @ISA = DC::UI::Container::;
1632 1795
1633sub size_request { 1796sub size_request {
1634 my ($self) = @_; 1797 my ($self) = @_;
1798
1799 my @children = $self->visible_children;
1635 1800
1636 $self->{vertical} 1801 $self->{vertical}
1637 ? ( 1802 ? (
1638 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1803 (List::Util::max map $_->{req_w}, @children),
1639 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_h}, @children),
1640 ) 1805 )
1641 : ( 1806 : (
1642 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1807 (List::Util::sum map $_->{req_w}, @children),
1643 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1808 (List::Util::max map $_->{req_h}, @children),
1644 ) 1809 )
1645} 1810}
1646 1811
1647sub invoke_size_allocate { 1812sub invoke_size_allocate {
1648 my ($self, $w, $h) = @_; 1813 my ($self, $w, $h) = @_;
… …
1669 $req[$_] += $space * $children[$_]{expand} 1834 $req[$_] += $space * $children[$_]{expand}
1670 for 0 .. $#children; 1835 for 0 .. $#children;
1671 } 1836 }
1672 } 1837 }
1673 1838
1674 CFPlus::UI::harmonize \@req; 1839 DC::UI::harmonize \@req;
1675 1840
1676 my $pos = 0; 1841 my $pos = 0;
1677 for (0 .. $#children) { 1842 for (0 .. $#children) {
1678 my $alloc = $req[$_]; 1843 my $alloc = $req[$_];
1679 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1844 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1684 1 1849 1
1685} 1850}
1686 1851
1687############################################################################# 1852#############################################################################
1688 1853
1689package CFPlus::UI::HBox; 1854package DC::UI::HBox;
1690 1855
1691our @ISA = CFPlus::UI::Box::; 1856our @ISA = DC::UI::Box::;
1692 1857
1693sub new { 1858sub new {
1694 my $class = shift; 1859 my $class = shift;
1695 1860
1696 $class->SUPER::new ( 1861 $class->SUPER::new (
… …
1699 ) 1864 )
1700} 1865}
1701 1866
1702############################################################################# 1867#############################################################################
1703 1868
1704package CFPlus::UI::VBox; 1869package DC::UI::VBox;
1705 1870
1706our @ISA = CFPlus::UI::Box::; 1871our @ISA = DC::UI::Box::;
1707 1872
1708sub new { 1873sub new {
1709 my $class = shift; 1874 my $class = shift;
1710 1875
1711 $class->SUPER::new ( 1876 $class->SUPER::new (
… …
1714 ) 1879 )
1715} 1880}
1716 1881
1717############################################################################# 1882#############################################################################
1718 1883
1719package CFPlus::UI::Label; 1884package DC::UI::Label;
1720 1885
1721our @ISA = CFPlus::UI::DrawBG::; 1886our @ISA = DC::UI::DrawBG::;
1722 1887
1723use CFPlus::OpenGL; 1888use DC::OpenGL;
1724 1889
1725sub new { 1890sub new {
1726 my ($class, %arg) = @_; 1891 my ($class, %arg) = @_;
1727 1892
1728 my $self = $class->SUPER::new ( 1893 my $self = $class->SUPER::new (
… …
1733 #text => initial text 1898 #text => initial text
1734 #markup => initial narkup 1899 #markup => initial narkup
1735 #max_w => maximum pixel width 1900 #max_w => maximum pixel width
1736 #style => 0, # render flags 1901 #style => 0, # render flags
1737 ellipsise => 3, # end 1902 ellipsise => 3, # end
1738 layout => (new CFPlus::Layout), 1903 layout => (new DC::Layout),
1739 fontsize => 1, 1904 fontsize => 1,
1740 align => -1, 1905 align => 0.5,
1741 valign => -1, 1906 valign => 0.5,
1742 padding_x => 2, 1907 padding_x => 4,
1743 padding_y => 2, 1908 padding_y => 2,
1744 can_events => 0, 1909 can_events => 0,
1745 %arg 1910 %arg
1746 ); 1911 );
1747 1912
1748 if (exists $self->{template}) { 1913 if (exists $self->{template}) {
1749 my $layout = new CFPlus::Layout; 1914 my $layout = new DC::Layout;
1750 $layout->set_text (delete $self->{template}); 1915 $layout->set_text (delete $self->{template});
1751 $self->{template} = $layout; 1916 $self->{template} = $layout;
1752 } 1917 }
1753 1918
1754 if (exists $self->{markup}) { 1919 if (exists $self->{markup}) {
… …
1772 1937
1773 delete $self->{ox}; 1938 delete $self->{ox};
1774 $self->SUPER::realloc; 1939 $self->SUPER::realloc;
1775} 1940}
1776 1941
1942sub clear {
1943 my ($self) = @_;
1944
1945 $self->set_text ("");
1946}
1947
1777sub set_text { 1948sub set_text {
1778 my ($self, $text) = @_; 1949 my ($self, $text) = @_;
1779 1950
1780 return if $self->{text} eq "T$text"; 1951 return if $self->{text} eq "T$text";
1781 $self->{text} = "T$text"; 1952 $self->{text} = "T$text";
… …
1804 1975
1805sub size_request { 1976sub size_request {
1806 my ($self) = @_; 1977 my ($self) = @_;
1807 1978
1808 $self->{size_req} ||= do { 1979 $self->{size_req} ||= do {
1980 my ($max_w, $max_h) = $self->get_max_wh;
1981
1809 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1982 $self->{layout}->set_font ($self->{font}) if $self->{font};
1810 $self->{layout}->set_width ($self->{max_w} || -1); 1983 $self->{layout}->set_width ($max_w);
1811 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1984 $self->{layout}->set_ellipsise ($self->{ellipsise});
1812 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1985 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1813 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1986 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1814 1987
1815 my ($w, $h) = $self->{layout}->size; 1988 my ($w, $h) = $self->{layout}->size;
1816 1989
1817 if (exists $self->{template}) { 1990 if (exists $self->{template}) {
1818 $self->{template}->set_font ($self->{font}) if $self->{font}; 1991 $self->{template}->set_font ($self->{font}) if $self->{font};
1819 $self->{template}->set_width ($self->{max_w} || -1); 1992 $self->{template}->set_width ($max_w);
1820 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1993 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1821 1994
1822 my ($w2, $h2) = $self->{template}->size; 1995 my ($w2, $h2) = $self->{template}->size;
1823 1996
1824 $w = List::Util::max $w, $w2; 1997 $w = List::Util::max $w, $w2;
… …
1880 2053
1881 [$self->{layout}->size] 2054 [$self->{layout}->size]
1882 }; 2055 };
1883 2056
1884 unless (exists $self->{ox}) { 2057 unless (exists $self->{ox}) {
1885 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2058 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1886 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2059 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1887 : ($self->{w} - $size->[0]) * 0.5);
1888 2060
1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2061 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891 : ($self->{h} - $size->[1]) * 0.5);
1892 }; 2062 };
1893 2063
1894 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2064# unless ($self->{list}) {
1895 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2065# $self->{list} = DC::OpenGL::glGenList;
1896 2066# DC::OpenGL::glNewList $self->{list};
1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2067# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2068# DC::OpenGL::glEndList;
2069# }
2070#
2071# DC::OpenGL::glCallList $self->{list};
2072
2073 $self->{layout}->draw;
1898} 2074}
2075
2076#sub destroy {
2077# my ($self) = @_;
2078#
2079# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2080#
2081# $self->SUPER::destroy;
2082#}
1899 2083
1900############################################################################# 2084#############################################################################
1901 2085
1902package CFPlus::UI::EntryBase; 2086package DC::UI::EntryBase;
1903 2087
1904our @ISA = CFPlus::UI::Label::; 2088our @ISA = DC::UI::Label::;
1905 2089
1906use CFPlus::OpenGL; 2090use DC::OpenGL;
1907 2091
1908sub new { 2092sub new {
1909 my $class = shift; 2093 my $class = shift;
1910 2094
1911 $class->SUPER::new ( 2095 $class->SUPER::new (
1912 fg => [1, 1, 1], 2096 fg => [1, 1, 1],
1913 bg => [0, 0, 0, 0.2], 2097 bg => [0, 0, 0, 0.2],
2098 outline => undef,
1914 active_bg => [1, 1, 1, 0.5], 2099 active_bg => [0, 0, 1, .2],
1915 active_fg => [0, 0, 0], 2100 active_fg => [1, 1, 1],
2101 active_outline => [1, 1, 0],
1916 can_hover => 1, 2102 can_hover => 1,
1917 can_focus => 1, 2103 can_focus => 1,
2104 align => 0,
1918 valign => 0, 2105 valign => 0.5,
1919 can_events => 1, 2106 can_events => 1,
1920 ellipsise => 0, 2107 ellipsise => 0,
2108 padding_x => 4,
2109 padding_y => 2,
1921 #text => ... 2110 #text => ...
1922 #hidden => "*", 2111 #hidden => "*",
1923 @_ 2112 @_
1924 ) 2113 )
1925} 2114}
… …
1970 my $sym = $ev->{sym}; 2159 my $sym = $ev->{sym};
1971 my $uni = $ev->{unicode}; 2160 my $uni = $ev->{unicode};
1972 2161
1973 my $text = $self->get_text; 2162 my $text = $self->get_text;
1974 2163
1975 if ($uni == 8) { 2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2165
2166 if ($sym == DC::SDLK_BACKSPACE) {
1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977 } elsif ($uni == 127) { 2168 } elsif ($sym == DC::SDLK_DELETE) {
1978 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
1979 } elsif ($sym == CFPlus::SDLK_LEFT) { 2170 } elsif ($sym == DC::SDLK_LEFT) {
1980 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
1981 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2172 } elsif ($sym == DC::SDLK_RIGHT) {
1982 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1983 } elsif ($sym == CFPlus::SDLK_HOME) { 2174 } elsif ($sym == DC::SDLK_HOME) {
1984 # what a hack 2175 # what a hack
1985 $self->{cursor} = 2176 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2177 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1 2178 ? length $1
1988 : 0; 2179 : 0;
1989 } elsif ($sym == CFPlus::SDLK_END) { 2180 } elsif ($sym == DC::SDLK_END) {
1990 # uh, again 2181 # uh, again
1991 $self->{cursor} = 2182 $self->{cursor} =
1992 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2183 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1993 ? $self->{cursor} + length $1 2184 ? $self->{cursor} + length $1
1994 : length $self->{text}; 2185 : length $self->{text};
… …
2058 glColor_premultiply @{$self->{bg}}; 2249 glColor_premultiply @{$self->{bg}};
2059 } 2250 }
2060 2251
2061 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2062 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2063 glBegin GL_QUADS;
2064 glVertex 0 , 0;
2065 glVertex 0 , $self->{h};
2066 glVertex $self->{w}, $self->{h}; 2254 glRect 0, 0, $self->{w}, $self->{h};
2067 glVertex $self->{w}, 0;
2068 glEnd;
2069 glDisable GL_BLEND; 2255 glDisable GL_BLEND;
2070 2256
2071 $self->SUPER::_draw; 2257 $self->SUPER::_draw;
2072 2258
2073 #TODO: force update every cursor change :( 2259 #TODO: force update every cursor change :(
… …
2075 2261
2076 unless (exists $self->{cur_h}) { 2262 unless (exists $self->{cur_h}) {
2077 my $text = substr $self->{text}, 0, $self->{cursor}; 2263 my $text = substr $self->{text}, 0, $self->{cursor};
2078 utf8::encode $text; 2264 utf8::encode $text;
2079 2265
2080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2266 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2081 } 2267 }
2082 2268
2269 glColor_premultiply @{$self->{active_fg}};
2083 glBegin GL_LINES; 2270 glBegin GL_LINES;
2084 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2271 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2085 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2272 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2086 glEnd; 2273 glEnd;
2274
2275 glLineWidth 3;
2276 glColor @{$self->{active_outline}};
2277 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2278 glLineWidth 1;
2279
2280 } else {
2281 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2282 glBegin GL_LINE_STRIP;
2283 glVertex .5, $self->{h} * .5;
2284 glVertex .5, $self->{h} - 2.5;
2285 glVertex $self->{w} - .5, $self->{h} - 2.5;
2286 glVertex $self->{w} - .5, $self->{h} * .5;
2287 glEnd;
2087 } 2288 }
2088} 2289}
2089 2290
2090############################################################################# 2291#############################################################################
2091 2292
2092package CFPlus::UI::Entry; 2293package DC::UI::Entry;
2093 2294
2094our @ISA = CFPlus::UI::EntryBase::; 2295our @ISA = DC::UI::EntryBase::;
2095 2296
2096use CFPlus::OpenGL; 2297use DC::OpenGL;
2298
2299sub new {
2300 my $class = shift;
2301
2302 $class->SUPER::new (
2303 history_pointer => -1,
2304 @_
2305 )
2306}
2307
2097 2308
2098sub invoke_key_down { 2309sub invoke_key_down {
2099 my ($self, $ev) = @_; 2310 my ($self, $ev) = @_;
2100 2311
2101 my $sym = $ev->{sym}; 2312 my $sym = $ev->{sym};
… …
2107 $self->{history_pointer} = -1; 2318 $self->{history_pointer} = -1;
2108 $self->{history_saveback} = ''; 2319 $self->{history_saveback} = '';
2109 $self->emit (activate => $txt); 2320 $self->emit (activate => $txt);
2110 $self->update; 2321 $self->update;
2111 2322
2112 } elsif ($sym == CFPlus::SDLK_UP) { 2323 } elsif ($sym == DC::SDLK_UP) {
2113 if ($self->{history_pointer} < 0) { 2324 if ($self->{history_pointer} < 0) {
2114 $self->{history_saveback} = $self->get_text; 2325 $self->{history_saveback} = $self->get_text;
2115 } 2326 }
2116 if (@{$self->{history} || []} > 0) { 2327 if (@{$self->{history} || []} > 0) {
2117 $self->{history_pointer}++; 2328 $self->{history_pointer}++;
… …
2119 $self->{history_pointer} = @{$self->{history} || []} - 1; 2330 $self->{history_pointer} = @{$self->{history} || []} - 1;
2120 } 2331 }
2121 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2332 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2122 } 2333 }
2123 2334
2124 } elsif ($sym == CFPlus::SDLK_DOWN) { 2335 } elsif ($sym == DC::SDLK_DOWN) {
2125 $self->{history_pointer}--; 2336 $self->{history_pointer}--;
2126 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2337 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2127 2338
2128 if ($self->{history_pointer} >= 0) { 2339 if ($self->{history_pointer} >= 0) {
2129 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2340 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2130 } else { 2341 } else {
2342 if (defined $self->{history_saveback}) {
2131 $self->set_text ($self->{history_saveback}); 2343 $self->set_text ($self->{history_saveback});
2344 $self->{history_saveback} = undef;
2345 }
2132 } 2346 }
2133 2347
2134 } else { 2348 } else {
2135 return $self->SUPER::invoke_key_down ($ev) 2349 return $self->SUPER::invoke_key_down ($ev)
2136 } 2350 }
… …
2138 1 2352 1
2139} 2353}
2140 2354
2141############################################################################# 2355#############################################################################
2142 2356
2143package CFPlus::UI::TextEdit; 2357package DC::UI::TextEdit;
2144 2358
2145our @ISA = CFPlus::UI::EntryBase::; 2359our @ISA = DC::UI::EntryBase::;
2146 2360
2147use CFPlus::OpenGL; 2361use DC::OpenGL;
2362
2363sub new {
2364 my $class = shift;
2365
2366 $class->SUPER::new (
2367 padding_y => 4,
2368
2369 @_
2370 )
2371}
2148 2372
2149sub move_cursor_ver { 2373sub move_cursor_ver {
2150 my ($self, $dy) = @_; 2374 my ($self, $dy) = @_;
2151 2375
2152 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2376 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2153 2377
2154 $y += $dy; 2378 $line += $dy;
2155 2379
2156 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2380 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2157 $self->{cursor} = $index; 2381 $self->{cursor} = $index;
2158 delete $self->{cur_h}; 2382 delete $self->{cur_h};
2159 $self->update; 2383 $self->update;
2160 return; 2384 return;
2161 } 2385 }
… …
2164sub invoke_key_down { 2388sub invoke_key_down {
2165 my ($self, $ev) = @_; 2389 my ($self, $ev) = @_;
2166 2390
2167 my $sym = $ev->{sym}; 2391 my $sym = $ev->{sym};
2168 2392
2169 if ($sym == CFPlus::SDLK_UP) { 2393 if ($sym == DC::SDLK_UP) {
2170 $self->move_cursor_ver (-1); 2394 $self->move_cursor_ver (-1);
2171 } elsif ($sym == CFPlus::SDLK_DOWN) { 2395 } elsif ($sym == DC::SDLK_DOWN) {
2172 $self->move_cursor_ver (+1); 2396 $self->move_cursor_ver (+1);
2173 } else { 2397 } else {
2174 return $self->SUPER::invoke_key_down ($ev) 2398 return $self->SUPER::invoke_key_down ($ev)
2175 } 2399 }
2176 2400
2177 1 2401 1
2178} 2402}
2179 2403
2180############################################################################# 2404#############################################################################
2181 2405
2182package CFPlus::UI::Button; 2406package DC::UI::ButtonBin;
2183 2407
2184our @ISA = CFPlus::UI::Label::; 2408our @ISA = DC::UI::Bin::;
2185 2409
2186use CFPlus::OpenGL; 2410use DC::OpenGL;
2187 2411
2188my @tex = 2412my @tex =
2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2413 map { new_from_resource DC::Texture $_, mipmap => 1 }
2190 qw(b1_button_active.png); 2414 qw(b1_button_inactive.png b1_button_active.png);
2191 2415
2192sub new { 2416sub new {
2193 my $class = shift; 2417 my $class = shift;
2194 2418
2195 $class->SUPER::new ( 2419 $class->SUPER::new (
2196 padding_x => 4,
2197 padding_y => 4,
2198 fg => [1, 1, 1],
2199 active_fg => [0, 0, 1],
2200 can_hover => 1, 2420 can_hover => 1,
2201 align => 0, 2421 align => 0.5,
2202 valign => 0, 2422 valign => 0.5,
2203 can_events => 1, 2423 can_events => 1,
2204 @_ 2424 @_
2205 ) 2425 )
2206} 2426}
2207 2427
… …
2216} 2436}
2217 2437
2218sub _draw { 2438sub _draw {
2219 my ($self) = @_; 2439 my ($self) = @_;
2220 2440
2221 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2222
2223 glEnable GL_TEXTURE_2D; 2441 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2442 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 0, 0, 0, 1; 2443 glColor 0, 0, 0, 1;
2226 2444
2445 my $tex = $tex[$GRAB == $self];
2227 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2446 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228 2447
2229 glDisable GL_TEXTURE_2D; 2448 glDisable GL_TEXTURE_2D;
2230 2449
2231 $self->SUPER::_draw; 2450 $self->SUPER::_draw;
2232} 2451}
2233 2452
2234############################################################################# 2453#############################################################################
2235 2454
2236package CFPlus::UI::CheckBox; 2455package DC::UI::Button;
2237 2456
2238our @ISA = CFPlus::UI::DrawBG::; 2457our @ISA = DC::UI::Label::;
2458
2459use DC::OpenGL;
2239 2460
2240my @tex = 2461my @tex =
2241 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2462 map { new_from_resource DC::Texture $_, mipmap => 1 }
2463 qw(b1_button_inactive.png b1_button_active.png);
2464
2465sub new {
2466 my $class = shift;
2467
2468 $class->SUPER::new (
2469 padding_x => 8,
2470 padding_y => 4,
2471 fg => [1.0, 1.0, 1.0],
2472 active_fg => [0.8, 0.8, 0.8],
2473 can_hover => 1,
2474 align => 0.5,
2475 valign => 0.5,
2476 can_events => 1,
2477 @_
2478 )
2479}
2480
2481sub invoke_button_up {
2482 my ($self, $ev, $x, $y) = @_;
2483
2484 $self->emit ("activate")
2485 if $x >= 0 && $x < $self->{w}
2486 && $y >= 0 && $y < $self->{h};
2487
2488 1
2489}
2490
2491sub _draw {
2492 my ($self) = @_;
2493
2494 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2495
2496 glEnable GL_TEXTURE_2D;
2497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2498 glColor 0, 0, 0, 1;
2499
2500 my $tex = $tex[$GRAB == $self];
2501 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2502
2503 glDisable GL_TEXTURE_2D;
2504
2505 $self->SUPER::_draw;
2506}
2507
2508#############################################################################
2509
2510package DC::UI::CheckBox;
2511
2512our @ISA = DC::UI::DrawBG::;
2513
2514my @tex =
2515 map { new_from_resource DC::Texture $_, mipmap => 1 }
2242 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2516 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2243 2517
2244use CFPlus::OpenGL; 2518use DC::OpenGL;
2245 2519
2246sub new { 2520sub new {
2247 my $class = shift; 2521 my $class = shift;
2248 2522
2249 $class->SUPER::new ( 2523 $class->SUPER::new (
… …
2289sub _draw { 2563sub _draw {
2290 my ($self) = @_; 2564 my ($self) = @_;
2291 2565
2292 $self->SUPER::_draw; 2566 $self->SUPER::_draw;
2293 2567
2294 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2568 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2295 2569
2296 my ($w, $h) = @$self{qw(w h)}; 2570 my ($w, $h) = @$self{qw(w h)};
2297 2571
2298 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2572 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2299 2573
… …
2306 glDisable GL_TEXTURE_2D; 2580 glDisable GL_TEXTURE_2D;
2307} 2581}
2308 2582
2309############################################################################# 2583#############################################################################
2310 2584
2311package CFPlus::UI::Image; 2585package DC::UI::Image;
2312 2586
2313our @ISA = CFPlus::UI::Base::; 2587our @ISA = DC::UI::Base::;
2314 2588
2315use CFPlus::OpenGL; 2589use DC::OpenGL;
2316 2590
2317our %texture_cache; 2591our %texture_cache;
2318 2592
2319sub new { 2593sub new {
2320 my $class = shift; 2594 my $class = shift;
2321 2595
2322 my $self = $class->SUPER::new ( 2596 my $self = $class->SUPER::new (
2323 can_events => 0, 2597 can_events => 0,
2598 scale => 1,
2324 @_, 2599 @_,
2325 ); 2600 );
2326 2601
2327 $self->{path} || $self->{tex} 2602 $self->{path} || $self->{tex}
2328 or Carp::croak "'path' or 'tex' attributes required"; 2603 or Carp::croak "'path' or 'tex' attributes required";
2329 2604
2330 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2605 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2331 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2606 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2332 2607
2333 CFPlus::weaken $texture_cache{$self->{path}}; 2608 DC::weaken $texture_cache{$self->{path}};
2334 2609
2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2610 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2336 2611
2337 $self 2612 $self
2338} 2613}
2339 2614
2340sub STORABLE_freeze { 2615sub STORABLE_freeze {
2341 my ($self, $cloning) = @_; 2616 my ($self, $cloning) = @_;
2342 2617
2343 $self->{path} 2618 $self->{path}
2344 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2619 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2345 2620
2346 $self->{path} 2621 $self->{path}
2347} 2622}
2348 2623
2349sub STORABLE_attach { 2624sub STORABLE_attach {
… …
2353} 2628}
2354 2629
2355sub size_request { 2630sub size_request {
2356 my ($self) = @_; 2631 my ($self) = @_;
2357 2632
2358 ($self->{tex}{w}, $self->{tex}{h}) 2633 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2359} 2634}
2360 2635
2361sub _draw { 2636sub _draw {
2362 my ($self) = @_; 2637 my ($self) = @_;
2363 2638
… …
2373 } 2648 }
2374 2649
2375 glEnable GL_TEXTURE_2D; 2650 glEnable GL_TEXTURE_2D;
2376 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377 2652
2378 $tex->draw_quad (0, 0, $w, $h); 2653 $tex->draw_quad_alpha (0, 0, $w, $h);
2379 2654
2380 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2381} 2656}
2382 2657
2383############################################################################# 2658#############################################################################
2384 2659
2385package CFPlus::UI::ImageButton; 2660package DC::UI::ImageButton;
2386 2661
2387our @ISA = CFPlus::UI::Image::; 2662our @ISA = DC::UI::Image::;
2388 2663
2389use CFPlus::OpenGL; 2664use DC::OpenGL;
2390 2665
2391my %textures; 2666my %textures;
2392 2667
2393sub new { 2668sub new {
2394 my $class = shift; 2669 my $class = shift;
… …
2397 padding_x => 4, 2672 padding_x => 4,
2398 padding_y => 4, 2673 padding_y => 4,
2399 fg => [1, 1, 1], 2674 fg => [1, 1, 1],
2400 active_fg => [0, 0, 1], 2675 active_fg => [0, 0, 1],
2401 can_hover => 1, 2676 can_hover => 1,
2402 align => 0, 2677 align => 0.5,
2403 valign => 0, 2678 valign => 0.5,
2404 can_events => 1, 2679 can_events => 1,
2405 @_ 2680 @_
2406 ); 2681 );
2407} 2682}
2408 2683
2684sub invoke_button_down {
2685 my ($self, $ev, $x, $y) = @_;
2686
2687 1
2688}
2689
2409sub invoke_button_up { 2690sub invoke_button_up {
2410 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2411 2692
2412 $self->emit ("activate") 2693 $self->emit ("activate")
2413 if $x >= 0 && $x < $self->{w} 2694 if $x >= 0 && $x < $self->{w}
… …
2416 1 2697 1
2417} 2698}
2418 2699
2419############################################################################# 2700#############################################################################
2420 2701
2421package CFPlus::UI::VGauge; 2702package DC::UI::VGauge;
2422 2703
2423our @ISA = CFPlus::UI::Base::; 2704our @ISA = DC::UI::Base::;
2424 2705
2425use List::Util qw(min max); 2706use List::Util qw(min max);
2426 2707
2427use CFPlus::OpenGL; 2708use DC::OpenGL;
2428 2709
2429my %tex = ( 2710my %tex = (
2430 food => [ 2711 food => [
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2712 map { new_from_resource DC::Texture $_, mipmap => 1 }
2432 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2713 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2433 ], 2714 ],
2434 grace => [ 2715 grace => [
2435 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2716 map { new_from_resource DC::Texture $_, mipmap => 1 }
2436 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2717 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2437 ], 2718 ],
2438 hp => [ 2719 hp => [
2439 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2720 map { new_from_resource DC::Texture $_, mipmap => 1 }
2440 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2721 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2441 ], 2722 ],
2442 mana => [ 2723 mana => [
2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2444 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2725 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2445 ], 2726 ],
2446); 2727);
2447 2728
2448# eg. VGauge->new (gauge => 'food'), default gauge: food 2729# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2551 glDisable GL_TEXTURE_2D; 2832 glDisable GL_TEXTURE_2D;
2552} 2833}
2553 2834
2554############################################################################# 2835#############################################################################
2555 2836
2837package DC::UI::Progress;
2838
2839our @ISA = DC::UI::Label::;
2840
2841use DC::OpenGL;
2842
2843sub new {
2844 my ($class, %arg) = @_;
2845
2846 my $self = $class->SUPER::new (
2847 fg => [1, 1, 1],
2848 bg => [0, 0, 1, 0.2],
2849 bar => [0.7, 0.5, 0.1, 0.8],
2850 outline => [0.4, 0.3, 0],
2851 fontsize => 0.9,
2852 valign => 0.5,
2853 align => 0.5,
2854 can_events => 1,
2855 ellipsise => 1,
2856 label => "%d%%",
2857 %arg,
2858 );
2859
2860 $self->set_value ($arg{value} || -1);
2861
2862 $self
2863}
2864
2865sub set_label {
2866 my ($self, $label) = @_;
2867
2868 return if $self->{label} eq $label;
2869 $self->{label} = $label;
2870
2871 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2872}
2873
2874sub set_value {
2875 my ($self, $value) = @_;
2876
2877 if ($self->{value} ne $value) {
2878 $self->{value} = $value;
2879
2880 if ($value < 0) {
2881 $self->set_text ("-");
2882 } else {
2883 $self->set_text (sprintf $self->{label}, $value * 100);
2884 }
2885
2886 $self->update;
2887 }
2888}
2889
2890sub _draw {
2891 my ($self) = @_;
2892
2893 glEnable GL_BLEND;
2894 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2895
2896 if ($self->{value} >= 0) {
2897 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2898
2899 glColor_premultiply @{$self->{bar}};
2900 glRect 2, 2, $s, $self->{h} - 2;
2901 glColor_premultiply @{$self->{bg}};
2902 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2903 }
2904
2905 glColor_premultiply @{$self->{outline}};
2906 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2907
2908 glDisable GL_BLEND;
2909
2910 {
2911 local $self->{bg}; # do not draw background
2912 $self->SUPER::_draw;
2913 }
2914}
2915
2916#############################################################################
2917
2918package DC::UI::ExperienceProgress;
2919
2920our @ISA = DC::UI::Progress::;
2921
2922sub new {
2923 my ($class, %arg) = @_;
2924
2925 my $self = $class->SUPER::new (
2926 tooltip => sub {
2927 my ($self) = @_;
2928
2929 sprintf "level %d\n%s points\n%s next level\n%s to go",
2930 $self->{lvl},
2931 ::formsep ($self->{exp}),
2932 ::formsep ($self->{nxt}),
2933 ::formsep ($self->{nxt} - $self->{exp}),
2934 },
2935 %arg
2936 );
2937
2938 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2939 if $::CONN;
2940
2941 $self
2942}
2943
2944sub DESTROY {
2945 my ($self) = @_;
2946
2947 delete $::CONN->{on_exp_update}{$self+0}
2948 if $::CONN;
2949
2950 $self->SUPER::DESTROY;
2951}
2952
2953sub set_value {
2954 my ($self, $lvl, $exp) = @_;
2955
2956 $self->{lvl} = $lvl;
2957 $self->{exp} = $exp;
2958
2959 my $v = -1;
2960
2961 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2962 my $l0 = $table->[$lvl - 1];
2963 my $l1 = $table->[$lvl];
2964
2965 $self->{nxt} = $l1;
2966
2967 $v = ($exp - $l0) / ($l1 - $l0);
2968 }
2969
2970 $self->SUPER::set_value ($v);
2971}
2972
2973#############################################################################
2974
2556package CFPlus::UI::Gauge; 2975package DC::UI::Gauge;
2557 2976
2558our @ISA = CFPlus::UI::VBox::; 2977our @ISA = DC::UI::VBox::;
2559 2978
2560sub new { 2979sub new {
2561 my ($class, %arg) = @_; 2980 my ($class, %arg) = @_;
2562 2981
2563 my $self = $class->SUPER::new ( 2982 my $self = $class->SUPER::new (
… …
2565 can_hover => 1, 2984 can_hover => 1,
2566 can_events => 1, 2985 can_events => 1,
2567 %arg, 2986 %arg,
2568 ); 2987 );
2569 2988
2570 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2989 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2571 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2990 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2572 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2991 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2573 2992
2574 $self 2993 $self
2575} 2994}
2576 2995
2577sub set_fontsize { 2996sub set_fontsize {
… …
2598 $self->{value}->set_text ($val); 3017 $self->{value}->set_text ($val);
2599} 3018}
2600 3019
2601############################################################################# 3020#############################################################################
2602 3021
2603package CFPlus::UI::Slider; 3022package DC::UI::Slider;
2604 3023
2605use strict; 3024use strict;
2606 3025
2607use CFPlus::OpenGL; 3026use DC::OpenGL;
2608 3027
2609our @ISA = CFPlus::UI::DrawBG::; 3028our @ISA = DC::UI::DrawBG::;
2610 3029
2611my @tex = 3030my @tex =
2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3031 map { new_from_resource DC::Texture $_ }
2613 qw(s1_slider.png s1_slider_bg.png); 3032 qw(s1_slider.png s1_slider_bg.png);
2614 3033
2615sub new { 3034sub new {
2616 my $class = shift; 3035 my $class = shift;
2617 3036
… …
2654sub set_value { 3073sub set_value {
2655 my ($self, $value) = @_; 3074 my ($self, $value) = @_;
2656 3075
2657 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2658 3077
2659 $hi = $lo + 1 if $hi <= $lo; 3078 $hi = $lo if $hi < $lo;
2660 3079
2661 $page = $hi - $lo if $page > $hi - $lo; 3080 $value = $hi - $page if $value > $hi - $page;
2662
2663 $value = $lo if $value < $lo; 3081 $value = $lo if $value < $lo;
2664 $value = $hi - $page if $value > $hi - $page;
2665 3082
2666 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2667 if $unit; 3084 if $unit;
2668 3085
2669 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3086 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2685 3102
2686 $self->SUPER::invoke_button_down ($ev, $x, $y); 3103 $self->SUPER::invoke_button_down ($ev, $x, $y);
2687 3104
2688 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3105 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2689 3106
2690 $self->invoke_mouse_motion ($ev, $x, $y) 3107 $self->invoke_mouse_motion ($ev, $x, $y);
3108
3109 1
2691} 3110}
2692 3111
2693sub invoke_mouse_motion { 3112sub invoke_mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2695 3114
… …
2711sub invoke_mouse_wheel { 3130sub invoke_mouse_wheel {
2712 my ($self, $ev) = @_; 3131 my ($self, $ev) = @_;
2713 3132
2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3133 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2715 3134
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3135 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2717 3136
2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3137 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719 3138
2720 ! ! $delta 3139 1
2721} 3140}
2722 3141
2723sub update { 3142sub update {
2724 my ($self) = @_; 3143 my ($self) = @_;
2725 3144
… …
2731 my ($self) = @_; 3150 my ($self) = @_;
2732 3151
2733 unless ($self->{knob_w}) { 3152 unless ($self->{knob_w}) {
2734 $self->set_value ($self->{range}[0]); 3153 $self->set_value ($self->{range}[0]);
2735 3154
2736 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3155 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2737 my $range = ($hi - $page - $lo) || 1e-100; 3156 my $range = ($hi - $page - $lo) || 1e-10;
2738 3157
2739 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3158 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2740 3159
2741 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3160 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2742 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3161 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2743 3162
2744 $value = ($value - $lo) / $range; 3163 $value = ($value - $lo) / $range;
… …
2774 glDisable GL_TEXTURE_2D; 3193 glDisable GL_TEXTURE_2D;
2775} 3194}
2776 3195
2777############################################################################# 3196#############################################################################
2778 3197
2779package CFPlus::UI::ValSlider; 3198package DC::UI::ValSlider;
2780 3199
2781our @ISA = CFPlus::UI::HBox::; 3200our @ISA = DC::UI::HBox::;
2782 3201
2783sub new { 3202sub new {
2784 my ($class, %arg) = @_; 3203 my ($class, %arg) = @_;
2785 3204
2786 my $range = delete $arg{range}; 3205 my $range = delete $arg{range};
2787 3206
2788 my $self = $class->SUPER::new ( 3207 my $self = $class->SUPER::new (
2789 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3208 slider => (new DC::UI::Slider expand => 1, range => $range),
2790 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3209 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2791 to_value => sub { shift }, 3210 to_value => sub { shift },
2792 from_value => sub { shift }, 3211 from_value => sub { shift },
2793 %arg, 3212 %arg,
2794 ); 3213 );
2795 3214
… …
2815sub set_range { shift->{slider}->set_range (@_) } 3234sub set_range { shift->{slider}->set_range (@_) }
2816sub set_value { shift->{slider}->set_value (@_) } 3235sub set_value { shift->{slider}->set_value (@_) }
2817 3236
2818############################################################################# 3237#############################################################################
2819 3238
2820package CFPlus::UI::TextScroller; 3239package DC::UI::TextScroller;
2821 3240
2822our @ISA = CFPlus::UI::HBox::; 3241our @ISA = DC::UI::HBox::;
2823 3242
2824use CFPlus::OpenGL; 3243use DC::OpenGL;
2825 3244
2826sub new { 3245sub new {
2827 my $class = shift; 3246 my $class = shift;
2828 3247
2829 my $self = $class->SUPER::new ( 3248 my $self = $class->SUPER::new (
… …
2831 can_events => 1, 3250 can_events => 1,
2832 indent => 0, 3251 indent => 0,
2833 #font => default_font 3252 #font => default_font
2834 @_, 3253 @_,
2835 3254
2836 layout => (new CFPlus::Layout), 3255 layout => (new DC::Layout),
2837 par => [], 3256 par => [],
2838 max_par => 0, 3257 max_par => 0,
2839 height => 0, 3258 height => 0,
2840 children => [ 3259 children => [
2841 (new CFPlus::UI::Empty expand => 1), 3260 (new DC::UI::Empty expand => 1),
2842 (new CFPlus::UI::Slider vertical => 1), 3261 (new DC::UI::Slider vertical => 1),
2843 ], 3262 ],
2844 ); 3263 );
2845 3264
2846 $self->{children}[1]->connect (changed => sub { $self->update }); 3265 $self->{children}[1]->connect (changed => sub { $self->update });
2847 3266
… …
2856} 3275}
2857 3276
2858sub size_request { 3277sub size_request {
2859 my ($self) = @_; 3278 my ($self) = @_;
2860 3279
2861 my ($empty, $slider) = @{ $self->{children} }; 3280 my ($empty, $slider) = $self->visible_children;
2862 3281
2863 local $self->{children} = [$empty, $slider]; 3282 local $self->{children} = [$empty, $slider];
2864 $self->SUPER::size_request 3283 $self->SUPER::size_request
2865} 3284}
2866 3285
… …
2903 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3322 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2904 $layout->set_markup ($para->{markup}); 3323 $layout->set_markup ($para->{markup});
2905 3324
2906 $layout->set_shapes ( 3325 $layout->set_shapes (
2907 map 3326 map
2908 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3327 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2909 @{$para->{widget}} 3328 @{$para->{widget}}
2910 ); 3329 );
2911 3330
2912 $layout 3331 $layout
2913} 3332}
… …
3030 $ROOT->on_post_alloc ($self => sub { 3449 $ROOT->on_post_alloc ($self => sub {
3031 $self->force_uptodate; 3450 $self->force_uptodate;
3032 3451
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034 3453
3035 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3454 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3036 glClearColor 0, 0, 0, 0; 3455 glClearColor 0, 0, 0, 0;
3037 glClear GL_COLOR_BUFFER_BIT; 3456 glClear GL_COLOR_BUFFER_BIT;
3038 3457
3039 package CFPlus::UI::Base; 3458 package DC::UI::Base;
3040 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3459 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3041 (0, 0, $self->{w}, $self->{h}); 3460 (0, 0, $self->{w}, $self->{h});
3042 3461
3043 my $top = int $self->{children}[1]{range}[0]; 3462 my $top = int $self->{children}[1]{range}[0];
3044 3463
… …
3055 3474
3056 if ($y0 < $y + $h && $y < $y1) { 3475 if ($y0 < $y + $h && $y < $y1) {
3057 my $layout = $self->get_layout ($para); 3476 my $layout = $self->get_layout ($para);
3058 3477
3059 $layout->render ($para->{indent}, $y - $y0); 3478 $layout->render ($para->{indent}, $y - $y0);
3479 $layout->draw;
3060 3480
3061 if (my @w = @{ $para->{widget} }) { 3481 if (my @w = @{ $para->{widget} }) {
3062 my @s = $layout->get_shapes; 3482 my @s = $layout->get_shapes;
3063 3483
3064 for (@w) { 3484 for (@w) {
… …
3102 $self->{children}[1]->draw; 3522 $self->{children}[1]->draw;
3103} 3523}
3104 3524
3105############################################################################# 3525#############################################################################
3106 3526
3107package CFPlus::UI::Animator; 3527package DC::UI::Animator;
3108 3528
3109use CFPlus::OpenGL; 3529use DC::OpenGL;
3110 3530
3111our @ISA = CFPlus::UI::Bin::; 3531our @ISA = DC::UI::Bin::;
3112 3532
3113sub moveto { 3533sub moveto {
3114 my ($self, $x, $y) = @_; 3534 my ($self, $x, $y) = @_;
3115 3535
3116 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3536 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3144 glPopMatrix; 3564 glPopMatrix;
3145} 3565}
3146 3566
3147############################################################################# 3567#############################################################################
3148 3568
3149package CFPlus::UI::Flopper; 3569package DC::UI::Flopper;
3150 3570
3151our @ISA = CFPlus::UI::Button::; 3571our @ISA = DC::UI::Button::;
3152 3572
3153sub new { 3573sub new {
3154 my $class = shift; 3574 my $class = shift;
3155 3575
3156 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
… …
3168 $self->{other}->toggle_visibility; 3588 $self->{other}->toggle_visibility;
3169} 3589}
3170 3590
3171############################################################################# 3591#############################################################################
3172 3592
3173package CFPlus::UI::Tooltip; 3593package DC::UI::Tooltip;
3174 3594
3175our @ISA = CFPlus::UI::Bin::; 3595our @ISA = DC::UI::Bin::;
3176 3596
3177use CFPlus::OpenGL; 3597use DC::OpenGL;
3178 3598
3179sub new { 3599sub new {
3180 my $class = shift; 3600 my $class = shift;
3181 3601
3182 $class->SUPER::new ( 3602 $class->SUPER::new (
… …
3186} 3606}
3187 3607
3188sub set_tooltip_from { 3608sub set_tooltip_from {
3189 my ($self, $widget) = @_; 3609 my ($self, $widget) = @_;
3190 3610
3191 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3192 if $widget->{tooltip} =~ /^#(.*)$/;
3193
3194 my $tooltip = $widget->{tooltip}; 3611 my $tip = $widget->{tooltip};
3612 $tip = $tip->($widget) if "CODE" eq ref $tip;
3613
3614 $tip = DC::Pod::section_label tooltip => $1
3615 if $tip =~ /^#(.*)$/;
3195 3616
3196 if ($ENV{CFPLUS_DEBUG} & 2) { 3617 if ($ENV{CFPLUS_DEBUG} & 2) {
3197 $tooltip .= "\n\n" . (ref $widget) . "\n" 3618 $tip .= "\n\n" . (ref $widget) . "\n"
3198 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3619 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3199 . "req $widget->{req_w} $widget->{req_h}\n" 3620 . "req $widget->{req_w} $widget->{req_h}\n"
3200 . "visible $widget->{visible}"; 3621 . "visible $widget->{visible}";
3201 } 3622 }
3202 3623
3203 $tooltip =~ s/^\n+//; 3624 $tip =~ s/^\n+//;
3204 $tooltip =~ s/\n+$//; 3625 $tip =~ s/\n+$//;
3205 3626
3206 $self->add (new CFPlus::UI::Label 3627 $self->add (new DC::UI::Label
3628 fg => $DC::THEME{tooltip_fg},
3207 markup => $tooltip, 3629 markup => $tip,
3208 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3631 align => 0,
3209 fontsize => 0.8, 3632 fontsize => 0.8,
3210 style => 1, # FLAG_INVERSE 3633 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3211 ellipsise => 0, 3634 ellipsise => 0,
3212 font => ($widget->{tooltip_font} || $::FONT_PROP), 3635 font => ($widget->{tooltip_font} || $::FONT_PROP),
3213 ); 3636 );
3214} 3637}
3215 3638
… …
3250} 3673}
3251 3674
3252sub _draw { 3675sub _draw {
3253 my ($self) = @_; 3676 my ($self) = @_;
3254 3677
3255 glTranslate 0.375, 0.375;
3256
3257 my ($w, $h) = @$self{qw(w h)}; 3678 my ($w, $h) = @$self{qw(w h)};
3258 3679
3259 glColor 1, 0.8, 0.4; 3680 glColor @{ $DC::THEME{tooltip_bg} };
3260 glBegin GL_QUADS; 3681 glRect 0, 0, $w, $h;
3261 glVertex 0 , 0;
3262 glVertex 0 , $h;
3263 glVertex $w, $h;
3264 glVertex $w, 0;
3265 glEnd;
3266 3682
3267 glColor 0, 0, 0; 3683 glColor @{ $DC::THEME{tooltip_border} };
3268 glBegin GL_LINE_LOOP; 3684 glRect_lineloop .5, .5, $w + .5, $h + .5;
3269 glVertex 0 , 0;
3270 glVertex 0 , $h;
3271 glVertex $w, $h;
3272 glVertex $w, 0;
3273 glEnd;
3274 3685
3275 glTranslate 2 - 0.375, 2 - 0.375; 3686 glTranslate 2, 2;
3276 3687
3277 $self->SUPER::_draw; 3688 $self->SUPER::_draw;
3278} 3689}
3279 3690
3280############################################################################# 3691#############################################################################
3281 3692
3282package CFPlus::UI::Face; 3693package DC::UI::Face;
3283 3694
3284our @ISA = CFPlus::UI::DrawBG::; 3695our @ISA = DC::UI::DrawBG::;
3285 3696
3286use CFPlus::OpenGL; 3697use DC::OpenGL;
3287 3698
3288sub new { 3699sub new {
3289 my $class = shift; 3700 my $class = shift;
3290 3701
3291 my $self = $class->SUPER::new ( 3702 my $self = $class->SUPER::new (
3703 size_w => 32,
3704 size_h => 8,
3292 aspect => 1, 3705 aspect => 1,
3293 can_events => 0, 3706 can_events => 0,
3294 @_, 3707 @_,
3295 ); 3708 );
3296 3709
3297 if ($self->{anim} && $self->{animspeed}) { 3710 if ($self->{anim} && $self->{animspeed}) {
3298 CFPlus::weaken (my $widget = $self); 3711 DC::weaken (my $widget = $self);
3299 3712
3300 $self->{timer} = Event->timer ( 3713 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3714 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3302 hard => 1, 3715 return unless $::CONN;
3303 interval => $self->{animspeed}, 3716
3304 cb => sub { 3717 my $w = $widget
3718 or return;
3719
3305 ++$widget->{frame}; 3720 ++$w->{frame};
3721 $w->update_face;
3722
3723 # somehow, $widget can go away
3306 $widget->update; 3724 $w->update;
3307 }, 3725 $w->update_timer;
3308 ); 3726 };
3727
3728 $self->update_face;
3729 $self->update_timer;
3309 } 3730 }
3310 3731
3311 $self 3732 $self
3312} 3733}
3313 3734
3735sub update_timer {
3736 my ($self) = @_;
3737
3738 return unless $self->{timer};
3739
3740 if ($self->{visible}) {
3741 $self->{timer}->start;
3742 } else {
3743 $self->{timer}->stop;
3744 }
3745}
3746
3747sub update_face {
3748 my ($self) = @_;
3749
3750 if ($::CONN) {
3751 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3752 if ($anim && @$anim) {
3753 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3754 delete $self->{face_change_cb};
3755
3756 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3757 unless ($tex->{name} || $tex->{loading}) {
3758 $tex->upload (sub { $self->reconfigure });
3759 }
3760 }
3761 }
3762 }
3763 }
3764}
3765
3314sub size_request { 3766sub size_request {
3315 (32, 8) 3767 my ($self) = @_;
3768
3769 if ($::CONN) {
3770 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3771 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3772 if ($tex->{name}) {
3773 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3774 } elsif (!$tex->{loading}) {
3775 $tex->upload (sub { $self->reconfigure });
3776 }
3777 }
3778
3779 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3780 }
3781 }
3782
3783 ($self->{size_w} || 8, $self->{size_h} || 8)
3316} 3784}
3317 3785
3318sub update { 3786sub update {
3319 my ($self) = @_; 3787 my ($self) = @_;
3320 3788
3321 return unless $self->{visible}; 3789 return unless $self->{visible};
3322 3790
3323 $self->SUPER::update; 3791 $self->SUPER::update;
3324} 3792}
3325 3793
3794sub invoke_visibility_change {
3795 my ($self) = @_;
3796
3797 $self->update_timer;
3798
3799 0
3800}
3801
3326sub _draw { 3802sub _draw {
3327 my ($self) = @_; 3803 my ($self) = @_;
3328 3804
3329 return unless $::CONN;
3330
3331 $self->SUPER::_draw; 3805 $self->SUPER::_draw;
3332 3806
3333 my $face; 3807 if (my $tex = $self->{tex}) {
3334
3335 if ($self->{frame}) {
3336 my $anim = $::CONN->{anim}[$self->{anim}];
3337
3338 $face = $anim->[ $self->{frame} % @$anim ]
3339 if $anim && @$anim;
3340 }
3341
3342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3343
3344 if ($tex) {
3345 glEnable GL_TEXTURE_2D; 3808 glEnable GL_TEXTURE_2D;
3346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347 glColor 0, 0, 0, 1; 3810 glColor 0, 0, 0, 1;
3348 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3811 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3349 glDisable GL_TEXTURE_2D; 3812 glDisable GL_TEXTURE_2D;
… …
3351} 3814}
3352 3815
3353sub destroy { 3816sub destroy {
3354 my ($self) = @_; 3817 my ($self) = @_;
3355 3818
3356 $self->{timer}->cancel 3819 (delete $self->{timer})->cancel
3357 if $self->{timer}; 3820 if $self->{timer};
3358 3821
3359 $self->SUPER::destroy; 3822 $self->SUPER::destroy;
3360} 3823}
3361 3824
3362############################################################################# 3825#############################################################################
3363 3826
3364package CFPlus::UI::Buttonbar; 3827package DC::UI::Buttonbar;
3365 3828
3366our @ISA = CFPlus::UI::HBox::; 3829our @ISA = DC::UI::HBox::;
3367 3830
3368# TODO: should actually wrap buttons and other goodies. 3831# TODO: should actually wrap buttons and other goodies.
3369 3832
3370############################################################################# 3833#############################################################################
3371 3834
3372package CFPlus::UI::Menu; 3835package DC::UI::Menu;
3373 3836
3374our @ISA = CFPlus::UI::Toplevel::; 3837our @ISA = DC::UI::Toplevel::;
3375 3838
3376use CFPlus::OpenGL; 3839use DC::OpenGL;
3377 3840
3378sub new { 3841sub new {
3379 my $class = shift; 3842 my $class = shift;
3380 3843
3381 my $self = $class->SUPER::new ( 3844 my $self = $class->SUPER::new (
3382 items => [], 3845 items => [],
3383 z => 100, 3846 z => 100,
3384 @_, 3847 @_,
3385 ); 3848 );
3386 3849
3387 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3850 $self->add ($self->{vbox} = new DC::UI::VBox);
3388 3851
3389 for my $item (@{ $self->{items} }) { 3852 for my $item (@{ $self->{items} }) {
3390 my ($widget, $cb, $tooltip) = @$item; 3853 my ($widget, $cb, $tooltip) = @$item;
3391 3854
3392 # handle various types of items, only text for now 3855 # handle various types of items, only text for now
3393 if (!ref $widget) { 3856 if (!ref $widget) {
3394 if ($widget =~ /\t/) { 3857 if ($widget =~ /\t/) {
3395 my ($left, $right) = split /\t/, $widget, 2; 3858 my ($left, $right) = split /\t/, $widget, 2;
3396 3859
3397 $widget = new CFPlus::UI::HBox 3860 $widget = new DC::UI::HBox
3398 can_hover => 1, 3861 can_hover => 1,
3399 can_events => 1, 3862 can_events => 1,
3400 tooltip => $tooltip, 3863 tooltip => $tooltip,
3401 children => [ 3864 children => [
3402 (new CFPlus::UI::Label markup => $left, expand => 1), 3865 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3403 (new CFPlus::UI::Label markup => $right, align => +1), 3866 (new DC::UI::Label markup => $right, align => 1),
3404 ], 3867 ],
3405 ; 3868 ;
3406 3869
3407 } else { 3870 } else {
3408 $widget = new CFPlus::UI::Label 3871 $widget = new DC::UI::Label
3409 can_hover => 1, 3872 can_hover => 1,
3410 can_events => 1, 3873 can_events => 1,
3874 align => 0,
3411 markup => $widget, 3875 markup => $widget,
3412 tooltip => $tooltip; 3876 tooltip => $tooltip;
3413 } 3877 }
3414 } 3878 }
3415 3879
… …
3461 1 3925 1
3462} 3926}
3463 3927
3464############################################################################# 3928#############################################################################
3465 3929
3466package CFPlus::UI::Multiplexer; 3930package DC::UI::Multiplexer;
3467 3931
3468our @ISA = CFPlus::UI::Container::; 3932our @ISA = DC::UI::Container::;
3469 3933
3470sub new { 3934sub new {
3471 my $class = shift; 3935 my $class = shift;
3472 3936
3473 my $self = $class->SUPER::new ( 3937 my $self = $class->SUPER::new (
3474 @_, 3938 @_,
3475 ); 3939 );
3476 3940
3477 $self->{current} = $self->{children}[0] 3941 $self->set_current_page (0);
3478 if @{ $self->{children} };
3479 3942
3480 $self 3943 $self
3481} 3944}
3482 3945
3483sub add { 3946sub add {
3484 my ($self, @widgets) = @_; 3947 my ($self, @widgets) = @_;
3485 3948
3486 $self->SUPER::add (@widgets); 3949 $self->SUPER::add (@widgets);
3487 3950
3488 $self->{current} = $self->{children}[0] 3951 $self->set_current_page (0)
3489 if @{ $self->{children} }; 3952 if @widgets == @{ $self->{children} };
3490} 3953}
3491 3954
3492sub get_current_page { 3955sub get_current_page {
3493 my ($self) = @_; 3956 my ($self) = @_;
3494 3957
… …
3500 3963
3501 my $widget = ref $page_or_widget 3964 my $widget = ref $page_or_widget
3502 ? $page_or_widget 3965 ? $page_or_widget
3503 : $self->{children}[$page_or_widget]; 3966 : $self->{children}[$page_or_widget];
3504 3967
3968 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3969
3505 $self->{current} = $widget; 3970 if (($self->{current} = $widget)) {
3971 $self->{current}->set_visible if $self->{current} && $self->{visible};
3506 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3972 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3507 3973
3508 $self->emit (page_changed => $self->{current}); 3974 $self->emit (page_changed => $self->{current});
3975 }
3509 3976
3510 $self->realloc; 3977 $self->realloc;
3511} 3978}
3512 3979
3513sub visible_children { 3980sub visible_children {
3514 $_[0]{current} 3981 $_[0]{current} || ()
3515} 3982}
3516 3983
3517sub size_request { 3984sub size_request {
3518 my ($self) = @_; 3985 my ($self) = @_;
3519 3986
3987 $self->{current}
3520 $self->{current}->size_request 3988 ? $self->{current}->size_request
3989 : (0, 0)
3521} 3990}
3522 3991
3523sub invoke_size_allocate { 3992sub invoke_size_allocate {
3524 my ($self, $w, $h) = @_; 3993 my ($self, $w, $h) = @_;
3525 3994
3526 $self->{current}->configure (0, 0, $w, $h); 3995 $self->{current}->configure (0, 0, $w, $h)
3996 if $self->{current};
3527 3997
3528 1 3998 1
3529} 3999}
3530 4000
3531sub _draw { 4001sub _draw {
3532 my ($self) = @_; 4002 my ($self) = @_;
3533 4003
3534 $self->{current}->draw; 4004 $self->{current}->draw
4005 if $self->{current};
3535} 4006}
3536 4007
3537############################################################################# 4008#############################################################################
3538 4009
3539package CFPlus::UI::Notebook; 4010package DC::UI::Notebook;
3540 4011
4012use DC::OpenGL;
4013
3541our @ISA = CFPlus::UI::VBox::; 4014our @ISA = DC::UI::VBox::;
3542 4015
3543sub new { 4016sub new {
3544 my $class = shift; 4017 my $class = shift;
3545 4018
3546 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3547 buttonbar => (new CFPlus::UI::Buttonbar), 4020 buttonbar => (new DC::UI::Buttonbar),
3548 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4021 multiplexer => (new DC::UI::Multiplexer expand => 1),
4022 active_outline => [.7, .7, 0.2],
3549 # filter => # will be put between multiplexer and $self 4023 # filter => # will be put between multiplexer and $self
3550 @_, 4024 @_,
3551 ); 4025 );
3552 4026
3553 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4027 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3554 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4028 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3555 4029
4030 {
4031 Scalar::Util::weaken (my $wself = $self);
4032
4033 $self->{multiplexer}->connect (c_add => sub {
4034 my ($mplex, $widgets) = @_;
4035
4036 for my $child (@$widgets) {
4037 Scalar::Util::weaken $child;
4038 $child->{c_tab_} ||= do {
4039 my $tab =
4040 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4041 ? $child->{c_tab}
4042 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4043
4044 $tab->connect (activate => sub {
4045 $wself->set_current_page ($child);
4046 });
4047
4048 $tab
4049 };
4050
4051 $self->{buttonbar}->add ($child->{c_tab_});
4052 }
4053 });
4054
4055 $self->{multiplexer}->connect (c_remove => sub {
4056 my ($mplex, $widgets) = @_;
4057
4058 for my $child (@$widgets) {
4059 $wself->{buttonbar}->remove ($child->{c_tab_});
4060 }
4061 });
4062 }
4063
3556 $self 4064 $self
3557} 4065}
3558 4066
3559sub add { 4067sub add {
4068 my ($self, @widgets) = @_;
4069
4070 $self->{multiplexer}->add (@widgets)
4071}
4072
4073sub remove {
4074 my ($self, @widgets) = @_;
4075
4076 $self->{multiplexer}->remove (@widgets)
4077}
4078
4079sub pages {
4080 my ($self) = @_;
4081 $self->{multiplexer}->children
4082}
4083
4084sub page_index {
4085 my ($self, $widget) = @_;
4086
4087 my $i = 0;
4088 for ($self->pages) {
4089 if ($_ eq $widget) { return $i };
4090 $i++;
4091 }
4092
4093 undef
4094}
4095
4096sub add_tab {
3560 my ($self, $title, $widget, $tooltip) = @_; 4097 my ($self, $title, $widget, $tooltip) = @_;
3561 4098
3562 CFPlus::weaken $self; 4099 $title = [$title, $tooltip] unless ref $title;
4100 $widget->{c_tab} = $title;
3563 4101
3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3565 markup => $title,
3566 tooltip => $tooltip,
3567 on_activate => sub { $self->set_current_page ($widget) },
3568 );
3569
3570 $self->{multiplexer}->add ($widget); 4102 $self->add ($widget);
3571} 4103}
3572 4104
3573sub get_current_page { 4105sub get_current_page {
3574 my ($self) = @_; 4106 my ($self) = @_;
3575 4107
… …
3581 4113
3582 $self->{multiplexer}->set_current_page ($page); 4114 $self->{multiplexer}->set_current_page ($page);
3583 $self->emit (page_changed => $self->{multiplexer}{current}); 4115 $self->emit (page_changed => $self->{multiplexer}{current});
3584} 4116}
3585 4117
4118sub _draw {
4119 my ($self) = @_;
4120
4121 $self->SUPER::_draw ();
4122
4123 if (my $cur = $self->{multiplexer}{current}) {
4124 if ($cur = $cur->{c_tab_}) {
4125 glTranslate $self->{buttonbar}{x} + $cur->{x},
4126 $self->{buttonbar}{y} + $cur->{y};
4127 glLineWidth 3;
4128 #glEnable GL_BLEND;
4129 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4130 glColor @{$self->{active_outline}};
4131 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4132 glLineWidth 1;
4133 #glDisable GL_BLEND;
4134 }
4135 }
4136}
4137
3586############################################################################# 4138#############################################################################
3587 4139
3588package CFPlus::UI::Selector; 4140package DC::UI::Selector;
3589 4141
3590use utf8; 4142use utf8;
3591 4143
3592our @ISA = CFPlus::UI::Button::; 4144our @ISA = DC::UI::Button::;
3593 4145
3594sub new { 4146sub new {
3595 my $class = shift; 4147 my $class = shift;
3596 4148
3597 my $self = $class->SUPER::new ( 4149 my $self = $class->SUPER::new (
… …
3614 my ($value, $title, $tooltip) = @$_; 4166 my ($value, $title, $tooltip) = @$_;
3615 4167
3616 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4168 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3617 } 4169 }
3618 4170
3619 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4171 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3620} 4172}
3621 4173
3622sub _set_value { 4174sub _set_value {
3623 my ($self, $value) = @_; 4175 my ($self, $value) = @_;
3624 4176
3625 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4177 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4178 $item ||= $self->{options}[0]
3626 or return; 4179 or return;
3627 4180
3628 $self->{value} = $item->[0]; 4181 $self->{value} = $item->[0];
3629 $self->set_markup ("$item->[1] ⇓"); 4182 $self->set_markup ("$item->[1] ⇓");
3630 $self->set_tooltip ($item->[2]); 4183# $self->set_tooltip ($item->[2]);
3631} 4184}
3632 4185
3633sub set_value { 4186sub set_value {
3634 my ($self, $value) = @_; 4187 my ($self, $value) = @_;
3635 4188
… …
3637 4190
3638 $self->_set_value ($value); 4191 $self->_set_value ($value);
3639 $self->emit (changed => $value); 4192 $self->emit (changed => $value);
3640} 4193}
3641 4194
4195sub set_options {
4196 my ($self, $options) = @_;
4197
4198 $self->{options} = $options;
4199 $self->_set_value ($self->{value});
4200}
4201
3642############################################################################# 4202#############################################################################
3643 4203
3644package CFPlus::UI::Statusbox; 4204package DC::UI::Statusbox;
3645 4205
3646our @ISA = CFPlus::UI::VBox::; 4206our @ISA = DC::UI::VBox::;
3647 4207
3648sub new { 4208sub new {
3649 my $class = shift; 4209 my $class = shift;
3650 4210
3651 my $self = $class->SUPER::new ( 4211 my $self = $class->SUPER::new (
3652 fontsize => 0.8, 4212 fontsize => 0.8,
3653 @_, 4213 @_,
3654 ); 4214 );
3655 4215
3656 CFPlus::weaken (my $this = $self); 4216 DC::weaken (my $this = $self);
3657 4217
3658 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4218 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3659 4219
3660 $self 4220 $self
3661} 4221}
3662 4222
3663sub reorder { 4223sub reorder {
3664 my ($self) = @_; 4224 my ($self) = @_;
3665 my $NOW = Time::HiRes::time; 4225 my $NOW = EV::time;
3666 4226
3667 # freeze display when hovering over any label 4227 # freeze display when hovering over any label
3668 return if $CFPlus::UI::TOOLTIP->{owner} 4228 return if $DC::UI::TOOLTIP->{owner}
3669 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4229 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3670 values %{ $self->{item} }; 4230 values %{ $self->{item} };
3671 4231
3672 while (my ($k, $v) = each %{ $self->{item} }) { 4232 while (my ($k, $v) = each %{ $self->{item} }) {
3673 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4233 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3674 } 4234 }
4235
4236 $self->{timer}->set (1, 1);
3675 4237
3676 my @widgets; 4238 my @widgets;
3677 4239
3678 my @items = sort { 4240 my @items = sort {
3679 $a->{pri} <=> $b->{pri} 4241 $a->{pri} <=> $b->{pri}
3680 or $b->{id} <=> $a->{id} 4242 or $b->{id} <=> $a->{id}
3681 } values %{ $self->{item} }; 4243 } values %{ $self->{item} };
3682
3683 $self->{timer}->interval (1);
3684 4244
3685 my $count = 10 + 1; 4245 my $count = 10 + 1;
3686 for my $item (@items) { 4246 for my $item (@items) {
3687 last unless --$count; 4247 last unless --$count;
3688 4248
… …
3695 for ($short) { 4255 for ($short) {
3696 s/^\s+//; 4256 s/^\s+//;
3697 s/\s+/ /g; 4257 s/\s+/ /g;
3698 } 4258 }
3699 4259
3700 new CFPlus::UI::Label 4260 new DC::UI::Label
3701 markup => $short, 4261 markup => $short,
3702 tooltip => $item->{tooltip}, 4262 tooltip => $item->{tooltip},
3703 tooltip_font => $::FONT_PROP, 4263 tooltip_font => $::FONT_PROP,
3704 tooltip_width => 0.67, 4264 tooltip_width => 0.67,
3705 fontsize => $item->{fontsize} || $self->{fontsize}, 4265 fontsize => $item->{fontsize} || $self->{fontsize},
3706 max_w => $::WIDTH * 0.44, 4266 max_w => $::WIDTH * 0.44,
4267 align => 0,
3707 fg => [@{ $item->{fg} }], 4268 fg => [@{ $item->{fg} }],
3708 can_events => 1, 4269 can_events => 1,
3709 can_hover => 1 4270 can_hover => 1
3710 }; 4271 };
3711 4272
3712 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4273 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3713 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4274 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3714 $label->update; 4275 $label->update;
3715 $label->set_max_size (undef, $label->{req_h} * $diff) 4276 $label->set_max_size (undef, $label->{req_h} * $diff)
3716 if $diff < 1; 4277 if $diff < 1;
3717 $self->{timer}->interval (1/30); 4278 $self->{timer}->set (1/30, 1/30);
3718 } else { 4279 } else {
3719 $label->{fg}[3] = $item->{fg}[3] || 1; 4280 $label->{fg}[3] = $item->{fg}[3] || 1;
3720 } 4281 }
3721 4282
3722 push @widgets, $label; 4283 push @widgets, $label;
3723 } 4284 }
4285
4286 my $hash = join ",", @widgets;
4287 return if $hash eq $self->{last_widget_hash};
4288 $self->{last_widget_hash} = $hash;
3724 4289
3725 $self->clear; 4290 $self->clear;
3726 $self->SUPER::add (reverse @widgets); 4291 $self->SUPER::add (reverse @widgets);
3727} 4292}
3728 4293
… …
3784 $self->SUPER::destroy; 4349 $self->SUPER::destroy;
3785} 4350}
3786 4351
3787############################################################################# 4352#############################################################################
3788 4353
3789package CFPlus::UI::Root; 4354package DC::UI::Root;
3790 4355
3791our @ISA = CFPlus::UI::Container::; 4356our @ISA = DC::UI::Container::;
3792 4357
3793use List::Util qw(min max); 4358use List::Util qw(min max);
3794 4359
3795use CFPlus::OpenGL; 4360use DC::OpenGL;
3796 4361
3797sub new { 4362sub new {
3798 my $class = shift; 4363 my $class = shift;
3799 4364
3800 my $self = $class->SUPER::new ( 4365 my $self = $class->SUPER::new (
3801 visible => 1, 4366 visible => 1,
3802 @_, 4367 @_,
3803 ); 4368 );
3804 4369
3805 CFPlus::weaken ($self->{root} = $self); 4370 DC::weaken ($self->{root} = $self);
3806 4371
3807 $self 4372 $self
3808} 4373}
3809 4374
3810sub size_request { 4375sub size_request {
… …
3858} 4423}
3859 4424
3860sub update { 4425sub update {
3861 my ($self) = @_; 4426 my ($self) = @_;
3862 4427
3863 $::WANT_REFRESH++; 4428 $::WANT_REFRESH = 1;
3864} 4429}
3865 4430
3866sub add { 4431sub add {
3867 my ($self, @children) = @_; 4432 my ($self, @children) = @_;
3868 4433
… …
3905 while ($self->{refresh_hook}) { 4470 while ($self->{refresh_hook}) {
3906 $_->() 4471 $_->()
3907 for values %{delete $self->{refresh_hook}}; 4472 for values %{delete $self->{refresh_hook}};
3908 } 4473 }
3909 4474
3910 if ($self->{realloc}) { 4475 while ($self->{realloc}) {
3911 my %queue; 4476 my %queue;
3912 my @queue; 4477 my @queue;
3913 my $widget; 4478 my $widget;
3914 4479
3915 outer: 4480 outer:
… …
3935 4500
3936 delete $queue{$widget+0}; 4501 delete $queue{$widget+0};
3937 4502
3938 my ($w, $h) = $widget->size_request; 4503 my ($w, $h) = $widget->size_request;
3939 4504
3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4505 $w += $widget->{padding_x} * 2;
3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4506 $h += $widget->{padding_y} * 2;
4507
4508 $w = max $widget->{min_w}, $w;
4509 $h = max $widget->{min_h}, $h;
3942 4510
3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4511 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4512 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3945 4513
3946 $w = $widget->{force_w} if exists $widget->{force_w}; 4514 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3962 } 4530 }
3963 } 4531 }
3964 4532
3965 delete $self->{realloc}{$widget+0}; 4533 delete $self->{realloc}{$widget+0};
3966 } 4534 }
3967 }
3968 4535
3969 while (my $size_alloc = delete $self->{size_alloc}) { 4536 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} } 4537 my @queue = sort { $a->{visible} <=> $b->{visible} }
3971 values %$size_alloc; 4538 values %$size_alloc;
3972 4539
3973 while () { 4540 while () {
3974 my $widget = pop @queue || last; 4541 my $widget = pop @queue || last;
3975 4542
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4543 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 4544
3978 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0;
3980
3981 $w = max $widget->{min_w}, $w; 4545 $w = max $widget->{min_w}, $w;
3982 $h = max $widget->{min_h}, $h; 4546 $h = max $widget->{min_h}, $h;
3983 4547
3984# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4548# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4549# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986 4550
3987 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4551 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4552 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989 4553
3990 $w = int $w + 0.5; 4554 $w = int $w + 0.5;
3991 $h = int $h + 0.5; 4555 $h = int $h + 0.5;
3992 4556
3993 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4557 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3994 $widget->{old_w} = $widget->{w}; 4558 $widget->{old_w} = $widget->{w};
3995 $widget->{old_h} = $widget->{h}; 4559 $widget->{old_h} = $widget->{h};
3996 4560
3997 $widget->{w} = $w; 4561 $widget->{w} = $w;
3998 $widget->{h} = $h; 4562 $widget->{h} = $h;
3999 4563
4000 $widget->emit (size_allocate => $w, $h); 4564 $widget->emit (size_allocate => $w, $h);
4565 }
4001 } 4566 }
4002 } 4567 }
4003 } 4568 }
4004 4569
4005 while ($self->{post_alloc_hook}) { 4570 while ($self->{post_alloc_hook}) {
4006 $_->() 4571 $_->()
4007 for values %{delete $self->{post_alloc_hook}}; 4572 for values %{delete $self->{post_alloc_hook}};
4008 } 4573 }
4009
4010 4574
4011 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4575 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4576 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013 glClear GL_COLOR_BUFFER_BIT; 4577 glClear GL_COLOR_BUFFER_BIT;
4014 4578
… …
4017 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4581 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4018 glMatrixMode GL_MODELVIEW; 4582 glMatrixMode GL_MODELVIEW;
4019 glLoadIdentity; 4583 glLoadIdentity;
4020 4584
4021 { 4585 {
4022 package CFPlus::UI::Base; 4586 package DC::UI::Base;
4023 4587
4024 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4588 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4025 (0, 0, $self->{w}, $self->{h}); 4589 (0, 0, $self->{w}, $self->{h});
4026 4590
4027 $self->_draw; 4591 $self->_draw;
4028 } 4592 }
4029} 4593}
4030 4594
4031############################################################################# 4595#############################################################################
4032 4596
4033package CFPlus::UI; 4597package DC::UI;
4034 4598
4035$ROOT = new CFPlus::UI::Root; 4599$ROOT = new DC::UI::Root;
4036$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4600$TOOLTIP = new DC::UI::Tooltip z => 900;
4037 4601
40381 46021
4039 4603

Diff Legend

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