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.376 by root, Mon Jul 16 20:20:23 2007 UTC vs.
Revision 1.473 by root, Sun Jan 11 03:19:47 2009 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) = @_;
… …
188# call when resolution changes etc. 189# call when resolution changes etc.
189sub rescale_widgets { 190sub rescale_widgets {
190 my ($sx, $sy) = @_; 191 my ($sx, $sy) = @_;
191 192
192 for my $widget (values %WIDGET) { 193 for my $widget (values %WIDGET) {
193 if ($widget->{is_toplevel}) { 194 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 195 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 196 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196 197
197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 198 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 199 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
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};
… …
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
280 return if $self->{parent}; 281 return if $self->{parent};
281 282
282 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
283} 284}
284 285
285sub set_visible { 286sub set_visible {
286 my ($self) = @_; 287 my ($self) = @_;
287 288
288 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);
289 293
290 $self->{root} = $self->{parent}{root}; 294 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1; 295 $self->{visible} = $self->{parent}{visible} + 1;
292 296
293 $self->emit (visibility_change => 1); 297 $self->emit (visibility_change => 1);
294 298
295 $self->realloc if !exists $self->{req_w}; 299 $self->realloc if !exists $self->{req_w};
296 300
297 $_->set_visible for $self->children; 301 $_->set_visible for $self->visible_children;
298} 302}
299 303
300sub set_invisible { 304sub set_invisible {
301 my ($self) = @_; 305 my ($self) = @_;
302 306
… …
308 delete $self->{root}; 312 delete $self->{root};
309 313
310 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
312 316
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 317 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
315 319
316 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
318} 322}
… …
337sub hide { 341sub hide {
338 my ($self) = @_; 342 my ($self) = @_;
339 343
340 $self->set_invisible; 344 $self->set_invisible;
341 345
346 # extra $parent copy for 5.8.8+ bug workaround
347 # (otherwise $_[0] in remove gets freed
348 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 349 $parent->remove ($self);
343 if $self->{parent}; 350 }
344} 351}
345 352
346sub move_abs { 353sub move_abs {
347 my ($self, $x, $y, $z) = @_; 354 my ($self, $x, $y, $z) = @_;
348 355
… …
360 $self->{force_h} = $h; 367 $self->{force_h} = $h;
361 368
362 $self->realloc; 369 $self->realloc;
363} 370}
364 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
365sub size_request { 390sub size_request {
366 require Carp; 391 require Carp;
367 Carp::confess "size_request is abstract"; 392 Carp::confess "size_request is abstract";
368} 393}
369 394
… …
375 my ($self, $x, $y, $w, $h) = @_; 400 my ($self, $x, $y, $w, $h) = @_;
376 401
377 if ($self->{aspect}) { 402 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 403 my ($ow, $oh) = ($w, $h);
379 404
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 405 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 406 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 407
383 # use alignment to adjust x, y 408 # use alignment to adjust x, y
384 409
385 $x += int 0.5 * ($ow - $w); 410 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 411 $y += int 0.5 * ($oh - $h);
… …
427 452
428 return if $self->{tooltip} eq $tooltip; 453 return if $self->{tooltip} eq $tooltip;
429 454
430 $self->{tooltip} = $tooltip; 455 $self->{tooltip} = $tooltip;
431 456
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 457 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 458 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 459 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 460 }
436} 461}
437 462
438# translate global coordinates to local coordinate system 463# translate global coordinates to local coordinate system
439sub coord2local { 464sub coord2local {
440 my ($self, $x, $y) = @_; 465 my ($self, $x, $y) = @_;
441 466
442 Carp::confess unless $self->{parent};#d# 467 return (undef, undef) unless $self->{parent};
443 468
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 469 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 470}
446 471
447# translate local coordinates to global coordinate system 472# translate local coordinates to global coordinate system
448sub coord2global { 473sub coord2global {
449 my ($self, $x, $y) = @_; 474 my ($self, $x, $y) = @_;
450 475
451 Carp::confess unless $self->{parent};#d# 476 return (undef, undef) unless $self->{parent};
452 477
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 478 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 479}
455 480
456sub invoke_focus_in { 481sub invoke_focus_in {
… …
505sub connect { 530sub connect {
506 my ($self, $signal, $cb) = @_; 531 my ($self, $signal, $cb) = @_;
507 532
508 push @{ $self->{signal_cb}{$signal} }, $cb; 533 push @{ $self->{signal_cb}{$signal} }, $cb;
509 534
510 defined wantarray and CFPlus::guard { 535 defined wantarray and DC::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 536 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 537 @{ $self->{signal_cb}{$signal} };
513 } 538 }
514} 539}
515 540
… …
547 572
548 # parent 573 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 574 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 575}
551 576
552sub find_widget { 577#sub find_widget {
553 my ($self, $x, $y) = @_; 578# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 579
564sub set_parent { 580sub set_parent {
565 my ($self, $parent) = @_; 581 my ($self, $parent) = @_;
566 582
567 CFPlus::weaken ($self->{parent} = $parent); 583 DC::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 584 $self->set_visible if $parent->{visible};
569} 585}
570 586
571sub realloc { 587sub realloc {
572 my ($self) = @_; 588 my ($self) = @_;
… …
598 614
599# 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
600# functions seems pointless. 616# functions seems pointless.
601our ($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
602 618
603sub draw { 619#sub draw {
604 my ($self) = @_; 620#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 621
650sub _draw { 622sub _draw {
651 my ($self) = @_; 623 my ($self) = @_;
652 624
653 warn "no draw defined for $self\n"; 625 warn "no draw defined for $self\n";
654} 626}
655 627
656my $cntx;#d#
657sub DESTROY { 628sub DESTROY {
658 my ($self) = @_; 629 my ($self) = @_;
659 630
660 return if CFPlus::in_destruct; 631 return if DC::in_destruct;
661 632
633 local $@;
662 eval { $self->destroy }; 634 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 635 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 636
665 delete $WIDGET{$self+0}; 637 delete $WIDGET{$self+0};
666} 638}
667 639
668############################################################################# 640#############################################################################
669 641
670package CFPlus::UI::DrawBG; 642package DC::UI::DrawBG;
671 643
672our @ISA = CFPlus::UI::Base::; 644our @ISA = DC::UI::Base::;
673 645
674use strict; 646use strict;
675use CFPlus::OpenGL; 647use DC::OpenGL;
676 648
677sub new { 649sub new {
678 my $class = shift; 650 my $class = shift;
679
680 # range [value, low, high, page]
681 651
682 $class->SUPER::new ( 652 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 653 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 654 #active_bg => [1, 1, 1, 0.5],
685 @_ 655 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 667 my ($w, $h) = @$self{qw(w h)};
698 668
699 glEnable GL_BLEND; 669 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 670 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 671 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 672 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 673 glDisable GL_BLEND;
711 } 674 }
712} 675}
713 676
714############################################################################# 677#############################################################################
715 678
716package CFPlus::UI::Empty; 679package DC::UI::Empty;
717 680
718our @ISA = CFPlus::UI::Base::; 681our @ISA = DC::UI::Base::;
719 682
720sub new { 683sub new {
721 my ($class, %arg) = @_; 684 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 685 $class->SUPER::new (can_events => 0, %arg);
723} 686}
… …
730 693
731sub draw { } 694sub draw { }
732 695
733############################################################################# 696#############################################################################
734 697
735package CFPlus::UI::Container; 698package DC::UI::Container;
736 699
737our @ISA = CFPlus::UI::Base::; 700our @ISA = DC::UI::Base::;
738 701
739sub new { 702sub new {
740 my ($class, %arg) = @_; 703 my ($class, %arg) = @_;
741 704
742 my $children = delete $arg{children}; 705 my $children = delete $arg{children};
… …
746 can_events => 0, 709 can_events => 0,
747 %arg, 710 %arg,
748 ); 711 );
749 712
750 $self->add (@$children) 713 $self->add (@$children)
751 if $children; 714 if $children && @$children;
752 715
753 $self 716 $self
754} 717}
755 718
756sub realloc { 719sub realloc {
… …
765 my ($self, @widgets) = @_; 728 my ($self, @widgets) = @_;
766 729
767 $_->set_parent ($self) 730 $_->set_parent ($self)
768 for @widgets; 731 for @widgets;
769 732
733 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 734 use sort 'stable';
771 735
772 $self->{children} = [ 736 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 737 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 738 @{$self->{children}}, @widgets
775 ]; 739 ];
776 740
777 $self->realloc; 741 $self->realloc;
742
743 $self->emit (c_add => \@widgets);
744
745 map $_+0, @widgets
778} 746}
779 747
780sub children { 748sub children {
781 @{ $_[0]{children} } 749 @{ $_[0]{children} }
782} 750}
783 751
784sub remove { 752sub remove {
785 my ($self, $child) = @_; 753 my ($self, @widgets) = @_;
786 754
755 $self->emit (c_remove => \@widgets);
756
757 for my $child (@widgets) {
787 delete $child->{parent}; 758 delete $child->{parent};
788 $child->hide; 759 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 760 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
761 }
791 762
792 $self->realloc; 763 $self->realloc;
793} 764}
794 765
795sub clear { 766sub clear {
796 my ($self) = @_; 767 my ($self) = @_;
797 768
798 my $children = delete $self->{children}; 769 my $children = $self->{children};
799 $self->{children} = []; 770 $self->{children} = [];
800 771
801 for (@$children) { 772 for (@$children) {
802 delete $_->{parent}; 773 delete $_->{parent};
803 $_->hide; 774 $_->hide;
… …
823} 794}
824 795
825sub _draw { 796sub _draw {
826 my ($self) = @_; 797 my ($self) = @_;
827 798
828 $_->draw for @{$self->{children}}; 799 $_->draw for $self->visible_children;
829} 800}
830 801
831############################################################################# 802#############################################################################
832 803
833package CFPlus::UI::Bin; 804package DC::UI::Bin;
834 805
835our @ISA = CFPlus::UI::Container::; 806our @ISA = DC::UI::Container::;
836 807
837sub new { 808sub new {
838 my ($class, %arg) = @_; 809 my ($class, %arg) = @_;
839 810
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 811 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 812
842 $class->SUPER::new (children => [$child], %arg) 813 $class->SUPER::new (children => [$child], %arg)
843} 814}
844 815
845sub add { 816sub add {
846 my ($self, $child) = @_; 817 my ($self, $child) = @_;
847 818
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 819 $self->clear;
849 $self->SUPER::add ($child); 820 $self->SUPER::add ($child);
850} 821}
851 822
852sub remove { 823sub remove {
853 my ($self, $widget) = @_; 824 my ($self, $widget) = @_;
854 825
855 $self->SUPER::remove ($widget); 826 $self->SUPER::remove ($widget);
856 827
857 $self->{children} = [new CFPlus::UI::Empty] 828 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 829 unless @{$self->{children}};
859} 830}
860 831
861sub child { $_[0]->{children}[0] } 832sub child { $_[0]->{children}[0] }
862 833
… …
871 842
872 1 843 1
873} 844}
874 845
875############################################################################# 846#############################################################################
876
877# back-buffered drawing area 847# back-buffered drawing area
878 848
879package CFPlus::UI::Window; 849package DC::UI::Window;
880 850
881our @ISA = CFPlus::UI::Bin::; 851our @ISA = DC::UI::Bin::;
882 852
883use CFPlus::OpenGL; 853use DC::OpenGL;
884 854
885sub new { 855sub new {
886 my ($class, %arg) = @_; 856 my ($class, %arg) = @_;
887 857
888 my $self = $class->SUPER::new (%arg); 858 my $self = $class->SUPER::new (%arg);
… …
910} 880}
911 881
912sub render_child { 882sub render_child {
913 my ($self) = @_; 883 my ($self) = @_;
914 884
915 $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 {
916 glClearColor 0, 0, 0, 0; 886 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 887 glClear GL_COLOR_BUFFER_BIT;
918 888
919 { 889 {
920 package CFPlus::UI::Base; 890 package DC::UI::Base;
921 891
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 892 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 893 (0, 0, $self->{w}, $self->{h});
924 894
925 $self->_render; 895 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 912 glDisable GL_TEXTURE_2D;
943} 913}
944 914
945############################################################################# 915#############################################################################
946 916
947package CFPlus::UI::ViewPort; 917package DC::UI::ViewPort;
948 918
949use List::Util qw(min max); 919use List::Util qw(min max);
950 920
951our @ISA = CFPlus::UI::Window::; 921our @ISA = DC::UI::Window::;
952 922
953sub new { 923sub new {
954 my $class = shift; 924 my $class = shift;
955 925
956 $class->SUPER::new ( 926 $class->SUPER::new (
… …
963sub size_request { 933sub size_request {
964 my ($self) = @_; 934 my ($self) = @_;
965 935
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 936 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 937
968 $w = 10 if $self->{scroll_x}; 938 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 939 $h = 1 if $self->{scroll_y};
970 940
971 ($w, $h) 941 ($w, $h)
972} 942}
973 943
974sub invoke_size_allocate { 944sub invoke_size_allocate {
… …
986} 956}
987 957
988sub set_offset { 958sub set_offset {
989 my ($self, $x, $y) = @_; 959 my ($self, $x, $y) = @_;
990 960
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 961 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 962 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 963
994 $self->emit (changed => $self->{view_x}, $self->{view_y}); 964 if ($x != $self->{view_x} or $y != $self->{view_y}) {
965 $self->{view_x} = $x;
966 $self->{view_y} = $y;
967
968 $self->emit (changed => $x, $y);
995 $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 }
996} 989}
997 990
998# 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
999sub coord2local { 992sub coord2local {
1000 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
… …
1015 my ($self, $x, $y) = @_; 1008 my ($self, $x, $y) = @_;
1016 1009
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 1012 ) {
1020 $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})
1021 } else { 1014 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 1015 $self->DC::UI::Base::find_widget ($x, $y)
1023 } 1016 }
1024} 1017}
1025 1018
1026sub _render { 1019sub _render {
1027 my ($self) = @_; 1020 my ($self) = @_;
1028 1021
1029 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};
1030 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};
1031 1024
1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1025 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1033 1026
1034 $self->SUPER::_render; 1027 $self->SUPER::_render;
1035} 1028}
1036 1029
1037############################################################################# 1030#############################################################################
1038 1031
1039package CFPlus::UI::ScrolledWindow; 1032package DC::UI::ScrolledWindow;
1040 1033
1041our @ISA = CFPlus::UI::Table::; 1034our @ISA = DC::UI::Table::;
1042 1035
1043sub new { 1036sub new {
1044 my ($class, %arg) = @_; 1037 my ($class, %arg) = @_;
1045 1038
1046 my $child = delete $arg{child}; 1039 my $child = delete $arg{child};
1047 1040
1048 my $self; 1041 my $self;
1049 1042
1050 my $hslider = new CFPlus::UI::Slider 1043 my $hslider = new DC::UI::Slider
1044 c_col => 0,
1045 c_row => 1,
1051 vertical => 0, 1046 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1048 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1049 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1051 },
1057 ; 1052 ;
1058 1053
1059 my $vslider = new CFPlus::UI::Slider 1054 my $vslider = new DC::UI::Slider
1055 c_col => 1,
1056 c_row => 0,
1060 vertical => 1, 1057 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1059 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1060 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1074 col_expand => [1, 0], 1071 col_expand => [1, 0],
1075 row_expand => [1, 0], 1072 row_expand => [1, 0],
1076 %arg, 1073 %arg,
1077 ); 1074 );
1078 1075
1079 $self->{vp} = new CFPlus::UI::ViewPort 1076 $self->{vp} = new DC::UI::ViewPort
1077 c_col => 0,
1078 c_row => 0,
1080 expand => 1, 1079 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1080 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1081 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1082 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1083 my ($vp, $x, $y) = @_;
1084
1085 $vp->{parent}{hslider}->set_value ($x); 1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y); 1086 $vp->{parent}{vslider}->set_value ($y);
1087 1087
1088 0
1089 },
1090 on_size_allocate => sub {
1091 my ($vp, $w, $h) = @_;
1092 $vp->{parent}->update_slider;
1088 0 1093 0
1089 }, 1094 },
1090 ; 1095 ;
1091 1096
1092 $self->SUPER::add (0, 0, $self->{vp}); 1097 $self->SUPER::add ($self->{vp});
1093 1098
1094 $self->add ($child) if $child; 1099 $self->add ($child) if $child;
1095 1100
1096 $self 1101 $self
1097} 1102}
1098
1099#TODO# update range on size_allocate depending on child
1100 1103
1101sub add { 1104sub add {
1102 my ($self, $widget) = @_; 1105 my ($self, $widget) = @_;
1103 1106
1104 $self->{vp}->add ($self->{child} = $widget); 1107 $self->{vp}->add ($self->{child} = $widget);
1105} 1108}
1106 1109
1110sub set_offset { shift->{vp}->set_offset (@_) }
1111sub set_center { shift->{vp}->set_center (@_) }
1112sub make_visible { shift->{vp}->make_visible (@_) }
1113
1107sub update_slider { 1114sub update_slider {
1108 my ($self) = @_; 1115 my ($self) = @_;
1109 1116
1110 my $child = ($self->{vp} or return)->child; 1117 my $child = ($self->{vp} or return)->child;
1111 1118
1119 if ($self->{scroll_x}) {
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1120 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114 1122
1115 my $visible = $w1 > $w2; 1123 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) { 1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1126 $visible ? $self->SUPER::add ($self->{hslider})
1118 : $self->{hslider}->hide; 1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1119 } 1129 }
1120 1130
1131 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1132 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1133 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123 1134
1124 my $visible = $h1 > $h2; 1135 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) { 1136 if ($visible != $self->{vslider_visible}) {
1137 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1138 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->{vslider}->hide; 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);
1128 } 1159 };
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136} 1160}
1137 1161
1138sub invoke_mouse_wheel { 1162sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_; 1163 my ($self, $ev) = @_;
1140 1164
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->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};
1144 1167
1145 1 1168 1
1146} 1169}
1147 1170
1148sub invoke_button_down { 1171sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
1150 1173
1151 if ($ev->{button} == 2) { 1174 if ($ev->{button} == 2) {
1152 $self->grab_focus; 1175 $self->start_dragging ($ev);
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1; 1176 return 1;
1165 } 1177 }
1166 1178
1167 0 1179 0
1168} 1180}
… …
1195 $self->SUPER::invoke_size_allocate ($w, $h) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1196} 1208}
1197 1209
1198############################################################################# 1210#############################################################################
1199 1211
1200package CFPlus::UI::Frame; 1212package DC::UI::Frame;
1201 1213
1202our @ISA = CFPlus::UI::Bin::; 1214our @ISA = DC::UI::Bin::;
1203 1215
1204use CFPlus::OpenGL; 1216use DC::OpenGL;
1205 1217
1206sub new { 1218sub new {
1207 my $class = shift; 1219 my $class = shift;
1208 1220
1209 $class->SUPER::new ( 1221 $class->SUPER::new (
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1231 my ($w, $h) = @$self{qw(w h)};
1220 1232
1221 glEnable GL_BLEND; 1233 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1235 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1236 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1237 glDisable GL_BLEND;
1233 } 1238 }
1234 1239
1235 $self->SUPER::_draw; 1240 $self->SUPER::_draw;
1236} 1241}
1237 1242
1238############################################################################# 1243#############################################################################
1239 1244
1240package CFPlus::UI::FancyFrame; 1245package DC::UI::FancyFrame;
1241 1246
1242our @ISA = CFPlus::UI::Bin::; 1247our @ISA = DC::UI::Bin::;
1243 1248
1244use CFPlus::OpenGL; 1249use DC::OpenGL;
1245 1250
1246sub new { 1251sub new {
1247 my ($class, %arg) = @_; 1252 my ($class, %arg) = @_;
1248 1253
1249 if ((exists $arg{label}) && !ref $arg{label}) { 1254 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label 1255 $arg{label} = new DC::UI::Label
1251 align => 1, 1256 align => 1,
1252 valign => 0, 1257 valign => 0.5,
1253 text => $arg{label}, 1258 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75; 1259 fontsize => ($arg{border} || 0.8) * 0.75;
1255 } 1260 }
1256 1261
1257 my $self = $class->SUPER::new ( 1262 my $self = $class->SUPER::new (
1258 # label => "", 1263 # label => "",
1259 fg => [0.6, 0.3, 0.1], 1264 fg => undef,
1260 border => 0.8, 1265 border => 0.8,
1261 style => 'single', 1266 style => 'single',
1262 %arg, 1267 %arg,
1263 ); 1268 );
1264 1269
… …
1267 1272
1268sub add { 1273sub add {
1269 my ($self, @widgets) = @_; 1274 my ($self, @widgets) = @_;
1270 1275
1271 $self->SUPER::add (@widgets); 1276 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1277 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273} 1278}
1274 1279
1275sub border { 1280sub border {
1276 int $_[0]{border} * $::FONTSIZE 1281 int $_[0]{border} * $::FONTSIZE
1277} 1282}
… …
1317 my $border = $self->border; 1322 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h}); 1323 my ($w, $h) = ($self->{w}, $self->{h});
1319 1324
1320 $child->draw; 1325 $child->draw;
1321 1326
1322 glColor @{$self->{fg}}; 1327 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1323 glBegin GL_LINE_STRIP; 1328 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1329 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1330 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 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;
1327 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;
… …
1335 } 1340 }
1336} 1341}
1337 1342
1338############################################################################# 1343#############################################################################
1339 1344
1340package CFPlus::UI::Toplevel; 1345package DC::UI::Toplevel;
1341 1346
1342our @ISA = CFPlus::UI::Bin::; 1347our @ISA = DC::UI::Bin::;
1343 1348
1344use CFPlus::OpenGL; 1349use DC::OpenGL;
1345 1350
1346my $bg = 1351my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1352 new_from_resource DC::Texture "d1_bg.png",
1348 mipmap => 1, wrap => 1; 1353 mipmap => 1, wrap => 1;
1349 1354
1350my @border = 1355my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1356 map { new_from_resource DC::Texture $_, mipmap => 1 }
1352 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);
1353 1362
1354sub new { 1363sub new {
1355 my ($class, %arg) = @_; 1364 my ($class, %arg) = @_;
1356 1365
1357 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
1358 bg => [1, 1, 1, 1], 1367 bg => [1, 1, 1, 1],
1359 border_bg => [1, 1, 1, 1], 1368 border_bg => [1, 1, 1, 1],
1360 border => 0.6, 1369 border => 0.8,
1361 can_events => 1, 1370 can_events => 1,
1362 min_w => 64, 1371 min_w => 64,
1363 min_h => 32, 1372 min_h => 32,
1364 %arg, 1373 %arg,
1365 ); 1374 );
1366 1375
1367 $self->{title_widget} = new CFPlus::UI::Label 1376 $self->{title_widget} = new DC::UI::Label
1368 align => 0, 1377 align => 0.5,
1369 valign => 1, 1378 valign => 1,
1370 text => $self->{title}, 1379 text => $self->{title},
1371 fontsize => $self->{border}, 1380 fontsize => $self->{border},
1372 if exists $self->{title}; 1381 if exists $self->{title};
1373 1382
1374 if ($self->{has_close_button}) { 1383 if ($self->{has_close_button}) {
1375 $self->{close_button} = 1384 $self->{close_button} =
1376 new CFPlus::UI::ImageButton 1385 new DC::UI::ImageButton
1377 path => 'x1_close.png', 1386 path => 'x1_close.png',
1378 on_activate => sub { $self->emit ("delete") }; 1387 on_activate => sub { $self->emit ("delete") };
1379 1388
1380 $self->CFPlus::UI::Container::add ($self->{close_button}); 1389 $self->DC::UI::Container::add ($self->{close_button});
1381 } 1390 }
1382 1391
1383 $self 1392 $self
1384} 1393}
1385 1394
1386sub add { 1395sub add {
1387 my ($self, @widgets) = @_; 1396 my ($self, @widgets) = @_;
1388 1397
1389 $self->SUPER::add (@widgets); 1398 $self->SUPER::add (@widgets);
1390 $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};
1391 $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};
1392} 1401}
1393 1402
1394sub border { 1403sub border {
1395 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
1396} 1414}
1397 1415
1398sub size_request { 1416sub size_request {
1399 my ($self) = @_; 1417 my ($self) = @_;
1400 1418
… …
1525 glEnable GL_TEXTURE_2D; 1543 glEnable GL_TEXTURE_2D;
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1527 1545
1528 my $border = $self->border; 1546 my $border = $self->border;
1529 1547
1548 if ($border) {
1530 glColor @{ $self->{border_bg} }; 1549 glColor @{ $self->{border_bg} };
1531 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1550 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1551 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1552 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1534 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1553 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1554
1555 # move
1556 my $w2 = ($w - $border) * .5;
1557 my $h2 = ($h - $border) * .5;
1558 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1559 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1560 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1561
1562 # resize
1563 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1565 unless $self->{has_close_button};
1566 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1567 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1568 }
1535 1569
1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1570 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1537 glColor @{ $self->{bg} }; 1571 glColor @{ $self->{bg} };
1538 1572
1539 # TODO: repeat texture not scale 1573 # TODO: repeat texture not scale
… …
1558 if $self->{close_button}; 1592 if $self->{close_button};
1559} 1593}
1560 1594
1561############################################################################# 1595#############################################################################
1562 1596
1563package CFPlus::UI::Table; 1597package DC::UI::Table;
1564 1598
1565our @ISA = CFPlus::UI::Base::; 1599our @ISA = DC::UI::Container::;
1566 1600
1567use List::Util qw(max sum); 1601use List::Util qw(max sum);
1568 1602
1569use CFPlus::OpenGL; 1603use DC::OpenGL;
1570 1604
1571sub new { 1605sub new {
1572 my $class = shift; 1606 my $class = shift;
1573 1607
1574 $class->SUPER::new ( 1608 $class->SUPER::new (
1575 children => [],
1576 col_expand => [], 1609 col_expand => [],
1577 row_expand => [], 1610 row_expand => [],
1578 @_, 1611 @_,
1579 ) 1612 )
1580} 1613}
1581 1614
1582sub children {
1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1584}
1585
1586# TODO: store row/col info in child widget and use standard add/del
1587sub add { 1615sub add {
1616 my ($self, @widgets) = @_;
1617
1618 for my $child (@widgets) {
1619 $child->{c_rowspan} ||= 1;
1620 $child->{c_colspan} ||= 1;
1621 }
1622
1623 $self->SUPER::add (@widgets);
1624}
1625
1626sub add_at {
1588 my ($self) = shift; 1627 my $self = shift;
1628
1629 my @widgets;
1589 1630
1590 while (@_) { 1631 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, (); 1632 my ($col, $row, $child) = splice @_, 0, 3, ();
1592 $child->set_parent ($self);
1593 $self->{children}[$y][$x] = $child;
1594 }
1595 1633
1596 $self->{force_realloc} = 1; 1634 $child->{c_row} = $row;
1597 $self->{force_size_alloc} = 1; 1635 $child->{c_col} = $col;
1598 $self->realloc;
1599}
1600 1636
1601sub remove { 1637 push @widgets, $child;
1638 }
1639
1640 $self->add (@widgets);
1641}
1642
1643sub get_wh {
1602 my ($self, $child) = @_; 1644 my ($self) = @_;
1603 1645
1604 for (@{ $self->{children} }) { 1646 my (@w, @h);
1605 for (@{ $_ || [] }) { 1647
1606 $_ = undef if $_ == $child; 1648 my @children = $self->children;
1649
1650 # first pass, columns
1651 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1652 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1653
1654 my $sw = sum @w[$c .. $c + $cs - 1];
1655
1656 if ($w > $sw) {
1657 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1607 } 1658 }
1608 } 1659 }
1609}
1610 1660
1611# TODO: move to container class maybe? send children a signal on removal? 1661 # second pass, rows
1612sub clear { 1662 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1613 my ($self) = @_;
1614
1615 my @children = $self->children;
1616 delete $self->{children};
1617
1618 for (@children) {
1619 delete $_->{parent};
1620 $_->hide;
1621 }
1622
1623 $self->realloc;
1624}
1625
1626sub get_wh {
1627 my ($self) = @_;
1628
1629 my (@w, @h);
1630
1631 for my $y (0 .. $#{$self->{children}}) {
1632 my $row = $self->{children}[$y]
1633 or next;
1634
1635 for my $x (0 .. $#$row) {
1636 my $widget = $row->[$x]
1637 or next;
1638 my ($w, $h) = @$widget{qw(req_w req_h)}; 1663 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1639 1664
1640 $w[$x] = max $w[$x], $w; 1665 my $sh = sum @h[$r .. $r + $rs - 1];
1641 $h[$y] = max $h[$y], $h; 1666
1667 if ($h > $sh) {
1668 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1642 } 1669 }
1643 } 1670 }
1644 1671
1645 (\@w, \@h) 1672 (\@w, \@h)
1646} 1673}
… …
1662 my ($ws, $hs) = $self->get_wh; 1689 my ($ws, $hs) = $self->get_wh;
1663 1690
1664 my $req_w = (sum @$ws) || 1; 1691 my $req_w = (sum @$ws) || 1;
1665 my $req_h = (sum @$hs) || 1; 1692 my $req_h = (sum @$hs) || 1;
1666 1693
1667 # TODO: nicer code 1694 # now linearly scale the rows/columns to the allocated size
1668 my @col_expand = @{$self->{col_expand}}; 1695 my @col_expand = @{$self->{col_expand}};
1669 @col_expand = (1) x @$ws unless @col_expand; 1696 @col_expand = (1) x @$ws unless @col_expand;
1670 my $col_expand = (sum @col_expand) || 1; 1697 my $col_expand = (sum @col_expand) || 1;
1671 1698
1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1699 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1673 1700
1674 CFPlus::UI::harmonize $ws; 1701 DC::UI::harmonize $ws;
1675 1702
1676 my @row_expand = @{$self->{row_expand}}; 1703 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand; 1704 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1; 1705 my $row_expand = (sum @row_expand) || 1;
1679 1706
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1707 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681 1708
1682 CFPlus::UI::harmonize $hs; 1709 DC::UI::harmonize $hs;
1683 1710
1684 my $y; 1711 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1712 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1685 1713
1686 for my $r (0 .. $#{$self->{children}}) { 1714 for my $widget ($self->children) {
1687 my $row = $self->{children}[$r] 1715 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1688 or next;
1689 1716
1690 my $x = 0; 1717 $widget->configure (
1691 my $row_h = $hs->[$r]; 1718 $x[$c], $y[$r],
1719 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1692 1720 );
1693 for my $c (0 .. $#$row) {
1694 my $col_w = $ws->[$c];
1695
1696 if (my $widget = $row->[$c]) {
1697 $widget->configure ($x, $y, $col_w, $row_h);
1698 }
1699
1700 $x += $col_w;
1701 }
1702
1703 $y += $row_h;
1704 } 1721 }
1705 1722
1706 1 1723 1
1707} 1724}
1708 1725
1709sub find_widget {
1710 my ($self, $x, $y) = @_;
1711
1712 $x -= $self->{x};
1713 $y -= $self->{y};
1714
1715 my $res;
1716
1717 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1718 $res = $_->find_widget ($x, $y)
1719 and return $res;
1720 }
1721
1722 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1723}
1724
1725sub _draw {
1726 my ($self) = @_;
1727
1728 for (grep $_, @{$self->{children}}) {
1729 $_->draw for grep $_, @$_;
1730 }
1731}
1732
1733############################################################################# 1726#############################################################################
1734 1727
1735package CFPlus::UI::Fixed; 1728package DC::UI::Fixed;
1736 1729
1737use List::Util qw(min max); 1730use List::Util qw(min max);
1738 1731
1739our @ISA = CFPlus::UI::Container::; 1732our @ISA = DC::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747 1733
1748sub _scale($$$) { 1734sub _scale($$$) {
1749 my ($mode, $val, $max) = @_; 1735 my ($rel, $val, $max) = @_;
1750 1736
1751 $mode eq "abs" ? $val 1737 $rel ? $val * $max : $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754} 1738}
1755 1739
1756sub size_request { 1740sub size_request {
1757 my ($self) = @_; 1741 my ($self) = @_;
1758 1742
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1743 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760 1744
1761 # determine overall size by querying abs widgets 1745 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) { 1746 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1747 unless ($child->{c_rel}) {
1748 my $x = $child->{c_x};
1749 my $y = $child->{c_y};
1764 1750
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1751 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1752 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1771 } 1753 }
1772 } 1754 }
1773 1755
1774 my $W = $x2 - $x1; 1756 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1; 1757 my $H = $y2 - $y1;
1776 1758
1777 # now layout remaining widgets 1759 # now layout remaining widgets
1778 for my $child ($self->visible_children) { 1760 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1761 if ($child->{c_rel}) {
1762 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1763 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1780 1764
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1765 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1766 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1789 } 1767 }
1790 } 1768 }
1791 1769
1792 my $W = $x2 - $x1; 1770 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1; 1771 my $H = $y2 - $y1;
… …
1797 1775
1798sub invoke_size_allocate { 1776sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_; 1777 my ($self, $W, $H) = @_;
1800 1778
1801 for my $child ($self->visible_children) { 1779 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1780 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1781 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1803 1782
1804 $x = _scale $pos, $x, $W; 1783 $x += $child->{c_halign} * $child->{req_w};
1805 $y = _scale $pos, $x, $H; 1784 $y += $child->{c_valign} * $child->{req_h};
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808 1785
1809 $child->configure ($x, $y, $w, $h); 1786 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1810 } 1787 }
1811 1788
1812 1 1789 1
1813} 1790}
1814 1791
1815############################################################################# 1792#############################################################################
1816 1793
1817package CFPlus::UI::Box; 1794package DC::UI::Box;
1818 1795
1819our @ISA = CFPlus::UI::Container::; 1796our @ISA = DC::UI::Container::;
1820 1797
1821sub size_request { 1798sub size_request {
1822 my ($self) = @_; 1799 my ($self) = @_;
1800
1801 my @children = $self->visible_children;
1823 1802
1824 $self->{vertical} 1803 $self->{vertical}
1825 ? ( 1804 ? (
1826 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_w}, @children),
1827 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1806 (List::Util::sum map $_->{req_h}, @children),
1828 ) 1807 )
1829 : ( 1808 : (
1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1809 (List::Util::sum map $_->{req_w}, @children),
1831 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1810 (List::Util::max map $_->{req_h}, @children),
1832 ) 1811 )
1833} 1812}
1834 1813
1835sub invoke_size_allocate { 1814sub invoke_size_allocate {
1836 my ($self, $w, $h) = @_; 1815 my ($self, $w, $h) = @_;
… …
1857 $req[$_] += $space * $children[$_]{expand} 1836 $req[$_] += $space * $children[$_]{expand}
1858 for 0 .. $#children; 1837 for 0 .. $#children;
1859 } 1838 }
1860 } 1839 }
1861 1840
1862 CFPlus::UI::harmonize \@req; 1841 DC::UI::harmonize \@req;
1863 1842
1864 my $pos = 0; 1843 my $pos = 0;
1865 for (0 .. $#children) { 1844 for (0 .. $#children) {
1866 my $alloc = $req[$_]; 1845 my $alloc = $req[$_];
1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1846 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1872 1 1851 1
1873} 1852}
1874 1853
1875############################################################################# 1854#############################################################################
1876 1855
1877package CFPlus::UI::HBox; 1856package DC::UI::HBox;
1878 1857
1879our @ISA = CFPlus::UI::Box::; 1858our @ISA = DC::UI::Box::;
1880 1859
1881sub new { 1860sub new {
1882 my $class = shift; 1861 my $class = shift;
1883 1862
1884 $class->SUPER::new ( 1863 $class->SUPER::new (
… …
1887 ) 1866 )
1888} 1867}
1889 1868
1890############################################################################# 1869#############################################################################
1891 1870
1892package CFPlus::UI::VBox; 1871package DC::UI::VBox;
1893 1872
1894our @ISA = CFPlus::UI::Box::; 1873our @ISA = DC::UI::Box::;
1895 1874
1896sub new { 1875sub new {
1897 my $class = shift; 1876 my $class = shift;
1898 1877
1899 $class->SUPER::new ( 1878 $class->SUPER::new (
… …
1902 ) 1881 )
1903} 1882}
1904 1883
1905############################################################################# 1884#############################################################################
1906 1885
1907package CFPlus::UI::Label; 1886package DC::UI::Label;
1908 1887
1909our @ISA = CFPlus::UI::DrawBG::; 1888our @ISA = DC::UI::DrawBG::;
1910 1889
1911use CFPlus::OpenGL; 1890use DC::OpenGL;
1912 1891
1913sub new { 1892sub new {
1914 my ($class, %arg) = @_; 1893 my ($class, %arg) = @_;
1915 1894
1916 my $self = $class->SUPER::new ( 1895 my $self = $class->SUPER::new (
… …
1921 #text => initial text 1900 #text => initial text
1922 #markup => initial narkup 1901 #markup => initial narkup
1923 #max_w => maximum pixel width 1902 #max_w => maximum pixel width
1924 #style => 0, # render flags 1903 #style => 0, # render flags
1925 ellipsise => 3, # end 1904 ellipsise => 3, # end
1926 layout => (new CFPlus::Layout), 1905 layout => (new DC::Layout),
1927 fontsize => 1, 1906 fontsize => 1,
1928 align => -1, 1907 align => 0.5,
1929 valign => -1, 1908 valign => 0.5,
1930 padding_x => 2, 1909 padding_x => 4,
1931 padding_y => 2, 1910 padding_y => 2,
1932 can_events => 0, 1911 can_events => 0,
1933 %arg 1912 %arg
1934 ); 1913 );
1935 1914
1936 if (exists $self->{template}) { 1915 if (exists $self->{template}) {
1937 my $layout = new CFPlus::Layout; 1916 my $layout = new DC::Layout;
1938 $layout->set_text (delete $self->{template}); 1917 $layout->set_text (delete $self->{template});
1939 $self->{template} = $layout; 1918 $self->{template} = $layout;
1940 } 1919 }
1941 1920
1942 if (exists $self->{markup}) { 1921 if (exists $self->{markup}) {
… …
1960 1939
1961 delete $self->{ox}; 1940 delete $self->{ox};
1962 $self->SUPER::realloc; 1941 $self->SUPER::realloc;
1963} 1942}
1964 1943
1944sub clear {
1945 my ($self) = @_;
1946
1947 $self->set_text ("");
1948}
1949
1965sub set_text { 1950sub set_text {
1966 my ($self, $text) = @_; 1951 my ($self, $text) = @_;
1967 1952
1968 return if $self->{text} eq "T$text"; 1953 return if $self->{text} eq "T$text";
1969 $self->{text} = "T$text"; 1954 $self->{text} = "T$text";
… …
1992 1977
1993sub size_request { 1978sub size_request {
1994 my ($self) = @_; 1979 my ($self) = @_;
1995 1980
1996 $self->{size_req} ||= do { 1981 $self->{size_req} ||= do {
1982 my ($max_w, $max_h) = $self->get_max_wh;
1983
1997 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1984 $self->{layout}->set_font ($self->{font}) if $self->{font};
1998 $self->{layout}->set_width ($self->{max_w} || -1); 1985 $self->{layout}->set_width ($max_w);
1999 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1986 $self->{layout}->set_ellipsise ($self->{ellipsise});
2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1987 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1988 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2002 1989
2003 my ($w, $h) = $self->{layout}->size; 1990 my ($w, $h) = $self->{layout}->size;
2004 1991
2005 if (exists $self->{template}) { 1992 if (exists $self->{template}) {
2006 $self->{template}->set_font ($self->{font}) if $self->{font}; 1993 $self->{template}->set_font ($self->{font}) if $self->{font};
2007 $self->{template}->set_width ($self->{max_w} || -1); 1994 $self->{template}->set_width ($max_w);
2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1995 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2009 1996
2010 my ($w2, $h2) = $self->{template}->size; 1997 my ($w2, $h2) = $self->{template}->size;
2011 1998
2012 $w = List::Util::max $w, $w2; 1999 $w = List::Util::max $w, $w2;
… …
2068 2055
2069 [$self->{layout}->size] 2056 [$self->{layout}->size]
2070 }; 2057 };
2071 2058
2072 unless (exists $self->{ox}) { 2059 unless (exists $self->{ox}) {
2073 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2060 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2074 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2061 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2075 : ($self->{w} - $size->[0]) * 0.5);
2076 2062
2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2063 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2079 : ($self->{h} - $size->[1]) * 0.5);
2080 }; 2064 };
2081 2065
2082 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2066# unless ($self->{list}) {
2083 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2067# $self->{list} = DC::OpenGL::glGenList;
2084 2068# DC::OpenGL::glNewList $self->{list};
2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2069# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2070# DC::OpenGL::glEndList;
2071# }
2072#
2073# DC::OpenGL::glCallList $self->{list};
2074
2075 $self->{layout}->draw;
2086} 2076}
2077
2078#sub destroy {
2079# my ($self) = @_;
2080#
2081# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2082#
2083# $self->SUPER::destroy;
2084#}
2087 2085
2088############################################################################# 2086#############################################################################
2089 2087
2090package CFPlus::UI::EntryBase; 2088package DC::UI::EntryBase;
2091 2089
2092our @ISA = CFPlus::UI::Label::; 2090our @ISA = DC::UI::Label::;
2093 2091
2094use CFPlus::OpenGL; 2092use DC::OpenGL;
2095 2093
2096sub new { 2094sub new {
2097 my $class = shift; 2095 my $class = shift;
2098 2096
2099 $class->SUPER::new ( 2097 $class->SUPER::new (
2100 fg => [1, 1, 1], 2098 fg => [1, 1, 1],
2101 bg => [0, 0, 0, 0.2], 2099 bg => [0, 0, 0, 0.2],
2100 outline => undef,
2102 active_bg => [1, 1, 1, 0.5], 2101 active_bg => [0, 0, 1, .2],
2103 active_fg => [0, 0, 0], 2102 active_fg => [1, 1, 1],
2103 active_outline => [1, 1, 0],
2104 can_hover => 1, 2104 can_hover => 1,
2105 can_focus => 1, 2105 can_focus => 1,
2106 align => 0,
2106 valign => 0, 2107 valign => 0.5,
2107 can_events => 1, 2108 can_events => 1,
2108 ellipsise => 0, 2109 ellipsise => 0,
2110 padding_x => 4,
2111 padding_y => 2,
2109 #text => ... 2112 #text => ...
2110 #hidden => "*", 2113 #hidden => "*",
2111 @_ 2114 @_
2112 ) 2115 )
2113} 2116}
… …
2160 2163
2161 my $text = $self->get_text; 2164 my $text = $self->get_text;
2162 2165
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2166 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2164 2167
2165 if ($uni == 8) { 2168 if ($sym == DC::SDLK_BACKSPACE) {
2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2169 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2167 } elsif ($uni == 127) { 2170 } elsif ($sym == DC::SDLK_DELETE) {
2168 substr $text, $self->{cursor}, 1, ""; 2171 substr $text, $self->{cursor}, 1, "";
2169 } elsif ($sym == CFPlus::SDLK_LEFT) { 2172 } elsif ($sym == DC::SDLK_LEFT) {
2170 --$self->{cursor} if $self->{cursor}; 2173 --$self->{cursor} if $self->{cursor};
2171 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2174 } elsif ($sym == DC::SDLK_RIGHT) {
2172 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2175 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2173 } elsif ($sym == CFPlus::SDLK_HOME) { 2176 } elsif ($sym == DC::SDLK_HOME) {
2174 # what a hack 2177 # what a hack
2175 $self->{cursor} = 2178 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2179 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1 2180 ? length $1
2178 : 0; 2181 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) { 2182 } elsif ($sym == DC::SDLK_END) {
2180 # uh, again 2183 # uh, again
2181 $self->{cursor} = 2184 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2185 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1 2186 ? $self->{cursor} + length $1
2184 : length $self->{text}; 2187 : length $self->{text};
… …
2248 glColor_premultiply @{$self->{bg}}; 2251 glColor_premultiply @{$self->{bg}};
2249 } 2252 }
2250 2253
2251 glEnable GL_BLEND; 2254 glEnable GL_BLEND;
2252 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2255 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glBegin GL_QUADS;
2254 glVertex 0 , 0;
2255 glVertex 0 , $self->{h};
2256 glVertex $self->{w}, $self->{h}; 2256 glRect 0, 0, $self->{w}, $self->{h};
2257 glVertex $self->{w}, 0;
2258 glEnd;
2259 glDisable GL_BLEND; 2257 glDisable GL_BLEND;
2260 2258
2261 $self->SUPER::_draw; 2259 $self->SUPER::_draw;
2262 2260
2263 #TODO: force update every cursor change :( 2261 #TODO: force update every cursor change :(
… …
2265 2263
2266 unless (exists $self->{cur_h}) { 2264 unless (exists $self->{cur_h}) {
2267 my $text = substr $self->{text}, 0, $self->{cursor}; 2265 my $text = substr $self->{text}, 0, $self->{cursor};
2268 utf8::encode $text; 2266 utf8::encode $text;
2269 2267
2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2268 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2271 } 2269 }
2272 2270
2271 glColor_premultiply @{$self->{active_fg}};
2273 glBegin GL_LINES; 2272 glBegin GL_LINES;
2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2273 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2274 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2276 glEnd; 2275 glEnd;
2276
2277 glLineWidth 3;
2278 glColor @{$self->{active_outline}};
2279 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2280 glLineWidth 1;
2281
2282 } else {
2283 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2284 glBegin GL_LINE_STRIP;
2285 glVertex .5, $self->{h} * .5;
2286 glVertex .5, $self->{h} - 2.5;
2287 glVertex $self->{w} - .5, $self->{h} - 2.5;
2288 glVertex $self->{w} - .5, $self->{h} * .5;
2289 glEnd;
2277 } 2290 }
2278} 2291}
2279 2292
2280############################################################################# 2293#############################################################################
2281 2294
2282package CFPlus::UI::Entry; 2295package DC::UI::Entry;
2283 2296
2284our @ISA = CFPlus::UI::EntryBase::; 2297our @ISA = DC::UI::EntryBase::;
2285 2298
2286use CFPlus::OpenGL; 2299use DC::OpenGL;
2300
2301sub new {
2302 my $class = shift;
2303
2304 $class->SUPER::new (
2305 history_pointer => -1,
2306 @_
2307 )
2308}
2309
2287 2310
2288sub invoke_key_down { 2311sub invoke_key_down {
2289 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
2290 2313
2291 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
… …
2297 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
2298 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
2299 $self->emit (activate => $txt); 2322 $self->emit (activate => $txt);
2300 $self->update; 2323 $self->update;
2301 2324
2302 } elsif ($sym == CFPlus::SDLK_UP) { 2325 } elsif ($sym == DC::SDLK_UP) {
2303 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
2304 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
2305 } 2328 }
2306 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
2307 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
2309 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
2310 } 2333 }
2311 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2312 } 2335 }
2313 2336
2314 } elsif ($sym == CFPlus::SDLK_DOWN) { 2337 } elsif ($sym == DC::SDLK_DOWN) {
2315 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2317 2340
2318 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
2319 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2320 } else { 2343 } else {
2344 if (defined $self->{history_saveback}) {
2321 $self->set_text ($self->{history_saveback}); 2345 $self->set_text ($self->{history_saveback});
2346 $self->{history_saveback} = undef;
2347 }
2322 } 2348 }
2323 2349
2324 } else { 2350 } else {
2325 return $self->SUPER::invoke_key_down ($ev) 2351 return $self->SUPER::invoke_key_down ($ev)
2326 } 2352 }
… …
2328 1 2354 1
2329} 2355}
2330 2356
2331############################################################################# 2357#############################################################################
2332 2358
2333package CFPlus::UI::TextEdit; 2359package DC::UI::TextEdit;
2334 2360
2335our @ISA = CFPlus::UI::EntryBase::; 2361our @ISA = DC::UI::EntryBase::;
2336 2362
2337use CFPlus::OpenGL; 2363use DC::OpenGL;
2364
2365sub new {
2366 my $class = shift;
2367
2368 $class->SUPER::new (
2369 padding_y => 4,
2370
2371 @_
2372 )
2373}
2338 2374
2339sub move_cursor_ver { 2375sub move_cursor_ver {
2340 my ($self, $dy) = @_; 2376 my ($self, $dy) = @_;
2341 2377
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2378 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343 2379
2344 $y += $dy; 2380 $line += $dy;
2345 2381
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2382 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2347 $self->{cursor} = $index; 2383 $self->{cursor} = $index;
2348 delete $self->{cur_h}; 2384 delete $self->{cur_h};
2349 $self->update; 2385 $self->update;
2350 return; 2386 return;
2351 } 2387 }
… …
2354sub invoke_key_down { 2390sub invoke_key_down {
2355 my ($self, $ev) = @_; 2391 my ($self, $ev) = @_;
2356 2392
2357 my $sym = $ev->{sym}; 2393 my $sym = $ev->{sym};
2358 2394
2359 if ($sym == CFPlus::SDLK_UP) { 2395 if ($sym == DC::SDLK_UP) {
2360 $self->move_cursor_ver (-1); 2396 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) { 2397 } elsif ($sym == DC::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1); 2398 $self->move_cursor_ver (+1);
2363 } else { 2399 } else {
2364 return $self->SUPER::invoke_key_down ($ev) 2400 return $self->SUPER::invoke_key_down ($ev)
2365 } 2401 }
2366 2402
2367 1 2403 1
2368} 2404}
2369 2405
2370############################################################################# 2406#############################################################################
2371 2407
2372package CFPlus::UI::Button; 2408package DC::UI::ButtonBin;
2373 2409
2374our @ISA = CFPlus::UI::Label::; 2410our @ISA = DC::UI::Bin::;
2375 2411
2376use CFPlus::OpenGL; 2412use DC::OpenGL;
2377 2413
2378my @tex = 2414my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2415 map { new_from_resource DC::Texture $_, mipmap => 1 }
2380 qw(b1_button_active.png); 2416 qw(b1_button_inactive.png b1_button_active.png);
2381 2417
2382sub new { 2418sub new {
2383 my $class = shift; 2419 my $class = shift;
2384 2420
2385 $class->SUPER::new ( 2421 $class->SUPER::new (
2386 padding_x => 4,
2387 padding_y => 4,
2388 fg => [1, 1, 1],
2389 active_fg => [0, 0, 1],
2390 can_hover => 1, 2422 can_hover => 1,
2391 align => 0, 2423 align => 0.5,
2392 valign => 0, 2424 valign => 0.5,
2393 can_events => 1, 2425 can_events => 1,
2394 @_ 2426 @_
2395 ) 2427 )
2396} 2428}
2397 2429
… …
2406} 2438}
2407 2439
2408sub _draw { 2440sub _draw {
2409 my ($self) = @_; 2441 my ($self) = @_;
2410 2442
2411 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2412
2413 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
2416 2446
2447 my $tex = $tex[$GRAB == $self];
2417 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 2449
2419 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2420 2451
2421 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2422} 2453}
2423 2454
2424############################################################################# 2455#############################################################################
2425 2456
2426package CFPlus::UI::CheckBox; 2457package DC::UI::Button;
2427 2458
2428our @ISA = CFPlus::UI::DrawBG::; 2459our @ISA = DC::UI::Label::;
2460
2461use DC::OpenGL;
2429 2462
2430my @tex = 2463my @tex =
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2464 map { new_from_resource DC::Texture $_, mipmap => 1 }
2465 qw(b1_button_inactive.png b1_button_active.png);
2466
2467sub new {
2468 my $class = shift;
2469
2470 $class->SUPER::new (
2471 padding_x => 8,
2472 padding_y => 4,
2473 fg => [1.0, 1.0, 1.0],
2474 active_fg => [0.8, 0.8, 0.8],
2475 can_hover => 1,
2476 align => 0.5,
2477 valign => 0.5,
2478 can_events => 1,
2479 @_
2480 )
2481}
2482
2483sub invoke_button_up {
2484 my ($self, $ev, $x, $y) = @_;
2485
2486 $self->emit ("activate")
2487 if $x >= 0 && $x < $self->{w}
2488 && $y >= 0 && $y < $self->{h};
2489
2490 1
2491}
2492
2493sub _draw {
2494 my ($self) = @_;
2495
2496 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2497
2498 glEnable GL_TEXTURE_2D;
2499 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2500 glColor 0, 0, 0, 1;
2501
2502 my $tex = $tex[$GRAB == $self];
2503 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2504
2505 glDisable GL_TEXTURE_2D;
2506
2507 $self->SUPER::_draw;
2508}
2509
2510#############################################################################
2511
2512package DC::UI::CheckBox;
2513
2514our @ISA = DC::UI::DrawBG::;
2515
2516my @tex =
2517 map { new_from_resource DC::Texture $_, mipmap => 1 }
2432 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2518 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2433 2519
2434use CFPlus::OpenGL; 2520use DC::OpenGL;
2435 2521
2436sub new { 2522sub new {
2437 my $class = shift; 2523 my $class = shift;
2438 2524
2439 $class->SUPER::new ( 2525 $class->SUPER::new (
… …
2479sub _draw { 2565sub _draw {
2480 my ($self) = @_; 2566 my ($self) = @_;
2481 2567
2482 $self->SUPER::_draw; 2568 $self->SUPER::_draw;
2483 2569
2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2570 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2485 2571
2486 my ($w, $h) = @$self{qw(w h)}; 2572 my ($w, $h) = @$self{qw(w h)};
2487 2573
2488 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2574 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2489 2575
… …
2496 glDisable GL_TEXTURE_2D; 2582 glDisable GL_TEXTURE_2D;
2497} 2583}
2498 2584
2499############################################################################# 2585#############################################################################
2500 2586
2501package CFPlus::UI::Image; 2587package DC::UI::Image;
2502 2588
2503our @ISA = CFPlus::UI::Base::; 2589our @ISA = DC::UI::Base::;
2504 2590
2505use CFPlus::OpenGL; 2591use DC::OpenGL;
2506 2592
2507our %texture_cache; 2593our %texture_cache;
2508 2594
2509sub new { 2595sub new {
2510 my $class = shift; 2596 my $class = shift;
2511 2597
2512 my $self = $class->SUPER::new ( 2598 my $self = $class->SUPER::new (
2513 can_events => 0, 2599 can_events => 0,
2600 scale => 1,
2514 @_, 2601 @_,
2515 ); 2602 );
2516 2603
2517 $self->{path} || $self->{tex} 2604 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required"; 2605 or Carp::croak "'path' or 'tex' attributes required";
2519 2606
2520 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2607 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2608 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2522 2609
2523 CFPlus::weaken $texture_cache{$self->{path}}; 2610 DC::weaken $texture_cache{$self->{path}};
2524 2611
2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2612 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2526 2613
2527 $self 2614 $self
2528} 2615}
2529 2616
2530sub STORABLE_freeze { 2617sub STORABLE_freeze {
2531 my ($self, $cloning) = @_; 2618 my ($self, $cloning) = @_;
2532 2619
2533 $self->{path} 2620 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2621 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2535 2622
2536 $self->{path} 2623 $self->{path}
2537} 2624}
2538 2625
2539sub STORABLE_attach { 2626sub STORABLE_attach {
… …
2543} 2630}
2544 2631
2545sub size_request { 2632sub size_request {
2546 my ($self) = @_; 2633 my ($self) = @_;
2547 2634
2548 ($self->{tex}{w}, $self->{tex}{h}) 2635 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2549} 2636}
2550 2637
2551sub _draw { 2638sub _draw {
2552 my ($self) = @_; 2639 my ($self) = @_;
2553 2640
… …
2563 } 2650 }
2564 2651
2565 glEnable GL_TEXTURE_2D; 2652 glEnable GL_TEXTURE_2D;
2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2567 2654
2568 $tex->draw_quad (0, 0, $w, $h); 2655 $tex->draw_quad_alpha (0, 0, $w, $h);
2569 2656
2570 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2571} 2658}
2572 2659
2573############################################################################# 2660#############################################################################
2574 2661
2575package CFPlus::UI::ImageButton; 2662package DC::UI::ImageButton;
2576 2663
2577our @ISA = CFPlus::UI::Image::; 2664our @ISA = DC::UI::Image::;
2578 2665
2579use CFPlus::OpenGL; 2666use DC::OpenGL;
2580 2667
2581my %textures; 2668my %textures;
2582 2669
2583sub new { 2670sub new {
2584 my $class = shift; 2671 my $class = shift;
… …
2587 padding_x => 4, 2674 padding_x => 4,
2588 padding_y => 4, 2675 padding_y => 4,
2589 fg => [1, 1, 1], 2676 fg => [1, 1, 1],
2590 active_fg => [0, 0, 1], 2677 active_fg => [0, 0, 1],
2591 can_hover => 1, 2678 can_hover => 1,
2592 align => 0, 2679 align => 0.5,
2593 valign => 0, 2680 valign => 0.5,
2594 can_events => 1, 2681 can_events => 1,
2595 @_ 2682 @_
2596 ); 2683 );
2597} 2684}
2598 2685
2686sub invoke_button_down {
2687 my ($self, $ev, $x, $y) = @_;
2688
2689 1
2690}
2691
2599sub invoke_button_up { 2692sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_; 2693 my ($self, $ev, $x, $y) = @_;
2601 2694
2602 $self->emit ("activate") 2695 $self->emit ("activate")
2603 if $x >= 0 && $x < $self->{w} 2696 if $x >= 0 && $x < $self->{w}
… …
2606 1 2699 1
2607} 2700}
2608 2701
2609############################################################################# 2702#############################################################################
2610 2703
2611package CFPlus::UI::VGauge; 2704package DC::UI::VGauge;
2612 2705
2613our @ISA = CFPlus::UI::Base::; 2706our @ISA = DC::UI::Base::;
2614 2707
2615use List::Util qw(min max); 2708use List::Util qw(min max);
2616 2709
2617use CFPlus::OpenGL; 2710use DC::OpenGL;
2618 2711
2619my %tex = ( 2712my %tex = (
2620 food => [ 2713 food => [
2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2714 map { new_from_resource DC::Texture $_, mipmap => 1 }
2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2715 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2623 ], 2716 ],
2624 grace => [ 2717 grace => [
2625 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2718 map { new_from_resource DC::Texture $_, mipmap => 1 }
2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2719 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2627 ], 2720 ],
2628 hp => [ 2721 hp => [
2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2722 map { new_from_resource DC::Texture $_, mipmap => 1 }
2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2723 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2631 ], 2724 ],
2632 mana => [ 2725 mana => [
2633 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2726 map { new_from_resource DC::Texture $_, mipmap => 1 }
2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2727 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2635 ], 2728 ],
2636); 2729);
2637 2730
2638# eg. VGauge->new (gauge => 'food'), default gauge: food 2731# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2741 glDisable GL_TEXTURE_2D; 2834 glDisable GL_TEXTURE_2D;
2742} 2835}
2743 2836
2744############################################################################# 2837#############################################################################
2745 2838
2839package DC::UI::Progress;
2840
2841our @ISA = DC::UI::Label::;
2842
2843use DC::OpenGL;
2844
2845sub new {
2846 my ($class, %arg) = @_;
2847
2848 my $self = $class->SUPER::new (
2849 padding_x => 2,
2850 padding_y => 2,
2851 fg => [1, 1, 1],
2852 bg => [0, 0, 1, 0.2],
2853 bar => [0.7, 0.5, 0.1, 0.8],
2854 outline => [0.4, 0.3, 0],
2855 fontsize => 0.9,
2856 valign => 0.5,
2857 align => 0.5,
2858 can_events => 1,
2859 ellipsise => 1,
2860 label => "%d%%",
2861 %arg,
2862 );
2863
2864 $self->set_value ($arg{value} || -1);
2865
2866 $self
2867}
2868
2869sub set_label {
2870 my ($self, $label) = @_;
2871
2872 return if $self->{label} eq $label;
2873 $self->{label} = $label;
2874
2875 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2876}
2877
2878sub set_value {
2879 my ($self, $value) = @_;
2880
2881 if ($self->{value} ne $value) {
2882 $self->{value} = $value;
2883
2884 if ($value < 0) {
2885 $self->set_text ("-");
2886 } else {
2887 $self->set_text (sprintf $self->{label}, $value * 100);
2888 }
2889
2890 $self->update;
2891 }
2892}
2893
2894sub _draw {
2895 my ($self) = @_;
2896
2897 glEnable GL_BLEND;
2898 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2899
2900 my $px = $self->{padding_x};
2901 my $py = $self->{padding_y};
2902
2903 if ($self->{value} >= 0) {
2904 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2905
2906 glColor_premultiply @{$self->{bar}};
2907 glRect $px, $py, $s, $self->{h} - $py;
2908 glColor_premultiply @{$self->{bg}};
2909 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2910 }
2911
2912 glColor_premultiply @{$self->{outline}};
2913
2914 $px -= .5;
2915 $py -= .5;
2916
2917 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2918
2919 glDisable GL_BLEND;
2920
2921 {
2922 local $self->{bg}; # do not draw background
2923 $self->SUPER::_draw;
2924 }
2925}
2926
2927#############################################################################
2928
2929package DC::UI::ExperienceProgress;
2930
2931our @ISA = DC::UI::Progress::;
2932
2933sub new {
2934 my ($class, %arg) = @_;
2935
2936 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2937
2938 my $self = $class->SUPER::new (
2939 %arg,
2940 tooltip => sub {
2941 my ($self) = @_;
2942
2943 sprintf "%slevel %d\n%s points\n%s next level\n%s to go",
2944 $tt,
2945 $self->{lvl},
2946 ::formsep ($self->{exp}),
2947 ::formsep ($self->{nxt}),
2948 ::formsep ($self->{nxt} - $self->{exp}),
2949 },
2950 );
2951
2952 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2953 if $::CONN;
2954
2955 $self
2956}
2957
2958sub DESTROY {
2959 my ($self) = @_;
2960
2961 delete $::CONN->{on_exp_update}{$self+0}
2962 if $::CONN;
2963
2964 $self->SUPER::DESTROY;
2965}
2966
2967sub set_value {
2968 my ($self, $lvl, $exp) = @_;
2969
2970 $self->{lvl} = $lvl;
2971 $self->{exp} = $exp;
2972
2973 my $v = -1;
2974
2975 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2976 my $l0 = $table->[$lvl - 1];
2977 my $l1 = $table->[$lvl];
2978
2979 $self->{nxt} = $l1;
2980
2981 $v = ($exp - $l0) / ($l1 - $l0);
2982 }
2983
2984 $self->SUPER::set_value ($v);
2985}
2986
2987#############################################################################
2988
2746package CFPlus::UI::Gauge; 2989package DC::UI::Gauge;
2747 2990
2748our @ISA = CFPlus::UI::VBox::; 2991our @ISA = DC::UI::VBox::;
2749 2992
2750sub new { 2993sub new {
2751 my ($class, %arg) = @_; 2994 my ($class, %arg) = @_;
2752 2995
2753 my $self = $class->SUPER::new ( 2996 my $self = $class->SUPER::new (
… …
2755 can_hover => 1, 2998 can_hover => 1,
2756 can_events => 1, 2999 can_events => 1,
2757 %arg, 3000 %arg,
2758 ); 3001 );
2759 3002
2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3003 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3004 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3005 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2763 3006
2764 $self 3007 $self
2765} 3008}
2766 3009
2767sub set_fontsize { 3010sub set_fontsize {
… …
2788 $self->{value}->set_text ($val); 3031 $self->{value}->set_text ($val);
2789} 3032}
2790 3033
2791############################################################################# 3034#############################################################################
2792 3035
2793package CFPlus::UI::Slider; 3036package DC::UI::Slider;
2794 3037
2795use strict; 3038use strict;
2796 3039
2797use CFPlus::OpenGL; 3040use DC::OpenGL;
2798 3041
2799our @ISA = CFPlus::UI::DrawBG::; 3042our @ISA = DC::UI::DrawBG::;
2800 3043
2801my @tex = 3044my @tex =
2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3045 map { new_from_resource DC::Texture $_ }
2803 qw(s1_slider.png s1_slider_bg.png); 3046 qw(s1_slider.png s1_slider_bg.png);
2804 3047
2805sub new { 3048sub new {
2806 my $class = shift; 3049 my $class = shift;
2807 3050
… …
2844sub set_value { 3087sub set_value {
2845 my ($self, $value) = @_; 3088 my ($self, $value) = @_;
2846 3089
2847 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2848 3091
2849 $hi = $lo + 1 if $hi <= $lo; 3092 $hi = $lo if $hi < $lo;
2850 3093
2851 $page = $hi - $lo if $page > $hi - $lo; 3094 $value = $hi - $page if $value > $hi - $page;
2852
2853 $value = $lo if $value < $lo; 3095 $value = $lo if $value < $lo;
2854 $value = $hi - $page if $value > $hi - $page;
2855 3096
2856 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2857 if $unit; 3098 if $unit;
2858 3099
2859 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3100 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2875 3116
2876 $self->SUPER::invoke_button_down ($ev, $x, $y); 3117 $self->SUPER::invoke_button_down ($ev, $x, $y);
2877 3118
2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3119 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2879 3120
2880 $self->invoke_mouse_motion ($ev, $x, $y) 3121 $self->invoke_mouse_motion ($ev, $x, $y);
3122
3123 1
2881} 3124}
2882 3125
2883sub invoke_mouse_motion { 3126sub invoke_mouse_motion {
2884 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2885 3128
… …
2901sub invoke_mouse_wheel { 3144sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_; 3145 my ($self, $ev) = @_;
2903 3146
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3147 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905 3148
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3149 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2907 3150
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3151 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909 3152
2910 ! ! $delta 3153 1
2911} 3154}
2912 3155
2913sub update { 3156sub update {
2914 my ($self) = @_; 3157 my ($self) = @_;
2915 3158
… …
2921 my ($self) = @_; 3164 my ($self) = @_;
2922 3165
2923 unless ($self->{knob_w}) { 3166 unless ($self->{knob_w}) {
2924 $self->set_value ($self->{range}[0]); 3167 $self->set_value ($self->{range}[0]);
2925 3168
2926 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3169 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2927 my $range = ($hi - $page - $lo) || 1e-100; 3170 my $range = ($hi - $page - $lo) || 1e-10;
2928 3171
2929 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3172 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2930 3173
2931 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3174 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2932 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3175 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2933 3176
2934 $value = ($value - $lo) / $range; 3177 $value = ($value - $lo) / $range;
… …
2964 glDisable GL_TEXTURE_2D; 3207 glDisable GL_TEXTURE_2D;
2965} 3208}
2966 3209
2967############################################################################# 3210#############################################################################
2968 3211
2969package CFPlus::UI::ValSlider; 3212package DC::UI::ValSlider;
2970 3213
2971our @ISA = CFPlus::UI::HBox::; 3214our @ISA = DC::UI::HBox::;
2972 3215
2973sub new { 3216sub new {
2974 my ($class, %arg) = @_; 3217 my ($class, %arg) = @_;
2975 3218
2976 my $range = delete $arg{range}; 3219 my $range = delete $arg{range};
2977 3220
2978 my $self = $class->SUPER::new ( 3221 my $self = $class->SUPER::new (
2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3222 slider => (new DC::UI::Slider expand => 1, range => $range),
2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3223 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2981 to_value => sub { shift }, 3224 to_value => sub { shift },
2982 from_value => sub { shift }, 3225 from_value => sub { shift },
2983 %arg, 3226 %arg,
2984 ); 3227 );
2985 3228
… …
3005sub set_range { shift->{slider}->set_range (@_) } 3248sub set_range { shift->{slider}->set_range (@_) }
3006sub set_value { shift->{slider}->set_value (@_) } 3249sub set_value { shift->{slider}->set_value (@_) }
3007 3250
3008############################################################################# 3251#############################################################################
3009 3252
3010package CFPlus::UI::TextScroller; 3253package DC::UI::TextScroller;
3011 3254
3012our @ISA = CFPlus::UI::HBox::; 3255our @ISA = DC::UI::HBox::;
3013 3256
3014use CFPlus::OpenGL; 3257use DC::OpenGL;
3015 3258
3016sub new { 3259sub new {
3017 my $class = shift; 3260 my $class = shift;
3018 3261
3019 my $self = $class->SUPER::new ( 3262 my $self = $class->SUPER::new (
… …
3021 can_events => 1, 3264 can_events => 1,
3022 indent => 0, 3265 indent => 0,
3023 #font => default_font 3266 #font => default_font
3024 @_, 3267 @_,
3025 3268
3026 layout => (new CFPlus::Layout), 3269 layout => (new DC::Layout),
3027 par => [], 3270 par => [],
3028 max_par => 0, 3271 max_par => 0,
3029 height => 0, 3272 height => 0,
3030 children => [ 3273 children => [
3031 (new CFPlus::UI::Empty expand => 1), 3274 (new DC::UI::Empty expand => 1),
3032 (new CFPlus::UI::Slider vertical => 1), 3275 (new DC::UI::Slider vertical => 1),
3033 ], 3276 ],
3034 ); 3277 );
3035 3278
3036 $self->{children}[1]->connect (changed => sub { $self->update }); 3279 $self->{children}[1]->connect (changed => sub { $self->update });
3037 3280
… …
3046} 3289}
3047 3290
3048sub size_request { 3291sub size_request {
3049 my ($self) = @_; 3292 my ($self) = @_;
3050 3293
3051 my ($empty, $slider) = @{ $self->{children} }; 3294 my ($empty, $slider) = $self->visible_children;
3052 3295
3053 local $self->{children} = [$empty, $slider]; 3296 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request 3297 $self->SUPER::size_request
3055} 3298}
3056 3299
… …
3093 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3336 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3094 $layout->set_markup ($para->{markup}); 3337 $layout->set_markup ($para->{markup});
3095 3338
3096 $layout->set_shapes ( 3339 $layout->set_shapes (
3097 map 3340 map
3098 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3341 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3099 @{$para->{widget}} 3342 @{$para->{widget}}
3100 ); 3343 );
3101 3344
3102 $layout 3345 $layout
3103} 3346}
… …
3220 $ROOT->on_post_alloc ($self => sub { 3463 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate; 3464 $self->force_uptodate;
3222 3465
3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3466 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3224 3467
3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3468 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3226 glClearColor 0, 0, 0, 0; 3469 glClearColor 0, 0, 0, 0;
3227 glClear GL_COLOR_BUFFER_BIT; 3470 glClear GL_COLOR_BUFFER_BIT;
3228 3471
3229 package CFPlus::UI::Base; 3472 package DC::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3473 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h}); 3474 (0, 0, $self->{w}, $self->{h});
3232 3475
3233 my $top = int $self->{children}[1]{range}[0]; 3476 my $top = int $self->{children}[1]{range}[0];
3234 3477
… …
3245 3488
3246 if ($y0 < $y + $h && $y < $y1) { 3489 if ($y0 < $y + $h && $y < $y1) {
3247 my $layout = $self->get_layout ($para); 3490 my $layout = $self->get_layout ($para);
3248 3491
3249 $layout->render ($para->{indent}, $y - $y0); 3492 $layout->render ($para->{indent}, $y - $y0);
3493 $layout->draw;
3250 3494
3251 if (my @w = @{ $para->{widget} }) { 3495 if (my @w = @{ $para->{widget} }) {
3252 my @s = $layout->get_shapes; 3496 my @s = $layout->get_shapes;
3253 3497
3254 for (@w) { 3498 for (@w) {
… …
3292 $self->{children}[1]->draw; 3536 $self->{children}[1]->draw;
3293} 3537}
3294 3538
3295############################################################################# 3539#############################################################################
3296 3540
3297package CFPlus::UI::Animator; 3541package DC::UI::Animator;
3298 3542
3299use CFPlus::OpenGL; 3543use DC::OpenGL;
3300 3544
3301our @ISA = CFPlus::UI::Bin::; 3545our @ISA = DC::UI::Bin::;
3302 3546
3303sub moveto { 3547sub moveto {
3304 my ($self, $x, $y) = @_; 3548 my ($self, $x, $y) = @_;
3305 3549
3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3550 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3334 glPopMatrix; 3578 glPopMatrix;
3335} 3579}
3336 3580
3337############################################################################# 3581#############################################################################
3338 3582
3339package CFPlus::UI::Flopper; 3583package DC::UI::Flopper;
3340 3584
3341our @ISA = CFPlus::UI::Button::; 3585our @ISA = DC::UI::Button::;
3342 3586
3343sub new { 3587sub new {
3344 my $class = shift; 3588 my $class = shift;
3345 3589
3346 my $self = $class->SUPER::new ( 3590 my $self = $class->SUPER::new (
… …
3358 $self->{other}->toggle_visibility; 3602 $self->{other}->toggle_visibility;
3359} 3603}
3360 3604
3361############################################################################# 3605#############################################################################
3362 3606
3363package CFPlus::UI::Tooltip; 3607package DC::UI::Tooltip;
3364 3608
3365our @ISA = CFPlus::UI::Bin::; 3609our @ISA = DC::UI::Bin::;
3366 3610
3367use CFPlus::OpenGL; 3611use DC::OpenGL;
3368 3612
3369sub new { 3613sub new {
3370 my $class = shift; 3614 my $class = shift;
3371 3615
3372 $class->SUPER::new ( 3616 $class->SUPER::new (
… …
3376} 3620}
3377 3621
3378sub set_tooltip_from { 3622sub set_tooltip_from {
3379 my ($self, $widget) = @_; 3623 my ($self, $widget) = @_;
3380 3624
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
3383
3384 my $tooltip = $widget->{tooltip}; 3625 my $tip = $widget->{tooltip};
3626 $tip = $tip->($widget) if "CODE" eq ref $tip;
3627
3628 $tip = DC::Pod::section_label tooltip => $1
3629 if $tip =~ /^#(.*)$/;
3385 3630
3386 if ($ENV{CFPLUS_DEBUG} & 2) { 3631 if ($ENV{CFPLUS_DEBUG} & 2) {
3387 $tooltip .= "\n\n" . (ref $widget) . "\n" 3632 $tip .= "\n\n" . (ref $widget) . "\n"
3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3633 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3389 . "req $widget->{req_w} $widget->{req_h}\n" 3634 . "req $widget->{req_w} $widget->{req_h}\n"
3390 . "visible $widget->{visible}"; 3635 . "visible $widget->{visible}";
3391 } 3636 }
3392 3637
3393 $tooltip =~ s/^\n+//; 3638 $tip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//; 3639 $tip =~ s/\n+$//;
3395 3640
3396 $self->add (new CFPlus::UI::Label 3641 $self->add (new DC::UI::Label
3642 fg => $DC::THEME{tooltip_fg},
3397 markup => $tooltip, 3643 markup => $tip,
3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3644 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3645 align => 0,
3399 fontsize => 0.8, 3646 fontsize => 0.8,
3400 style => 1, # FLAG_INVERSE 3647 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3401 ellipsise => 0, 3648 ellipsise => 0,
3402 font => ($widget->{tooltip_font} || $::FONT_PROP), 3649 font => ($widget->{tooltip_font} || $::FONT_PROP),
3403 ); 3650 );
3404} 3651}
3405 3652
… …
3440} 3687}
3441 3688
3442sub _draw { 3689sub _draw {
3443 my ($self) = @_; 3690 my ($self) = @_;
3444 3691
3445 glTranslate 0.375, 0.375;
3446
3447 my ($w, $h) = @$self{qw(w h)}; 3692 my ($w, $h) = @$self{qw(w h)};
3448 3693
3449 glColor 1, 0.8, 0.4; 3694 glColor @{ $DC::THEME{tooltip_bg} };
3450 glBegin GL_QUADS; 3695 glRect 0, 0, $w, $h;
3451 glVertex 0 , 0;
3452 glVertex 0 , $h;
3453 glVertex $w, $h;
3454 glVertex $w, 0;
3455 glEnd;
3456 3696
3457 glColor 0, 0, 0; 3697 glColor @{ $DC::THEME{tooltip_border} };
3458 glBegin GL_LINE_LOOP; 3698 glRect_lineloop .5, .5, $w + .5, $h + .5;
3459 glVertex 0 , 0;
3460 glVertex 0 , $h;
3461 glVertex $w, $h;
3462 glVertex $w, 0;
3463 glEnd;
3464 3699
3465 glTranslate 2 - 0.375, 2 - 0.375; 3700 glTranslate 2, 2;
3466 3701
3467 $self->SUPER::_draw; 3702 $self->SUPER::_draw;
3468} 3703}
3469 3704
3470############################################################################# 3705#############################################################################
3471 3706
3472package CFPlus::UI::Face; 3707package DC::UI::Face;
3473 3708
3474our @ISA = CFPlus::UI::DrawBG::; 3709our @ISA = DC::UI::DrawBG::;
3475 3710
3476use CFPlus::OpenGL; 3711use DC::OpenGL;
3477 3712
3478sub new { 3713sub new {
3479 my $class = shift; 3714 my $class = shift;
3480 3715
3481 my $self = $class->SUPER::new ( 3716 my $self = $class->SUPER::new (
… …
3485 can_events => 0, 3720 can_events => 0,
3486 @_, 3721 @_,
3487 ); 3722 );
3488 3723
3489 if ($self->{anim} && $self->{animspeed}) { 3724 if ($self->{anim} && $self->{animspeed}) {
3490 CFPlus::weaken (my $widget = $self); 3725 DC::weaken (my $widget = $self);
3491 3726
3492 $self->{timer} = Event->timer ( 3727 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3728 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3494 hard => 1,
3495 interval => $self->{animspeed},
3496 cb => sub {
3497 return unless $::CONN; 3729 return unless $::CONN;
3498 3730
3731 my $w = $widget
3732 or return;
3733
3499 ++$widget->{frame}; 3734 ++$w->{frame};
3500 $self->update_face; 3735 $w->update_face;
3736
3737 # somehow, $widget can go away
3501 $self->update; 3738 $w->update;
3502 }, 3739 $w->update_timer;
3503 ); 3740 };
3504 3741
3505 $self->update_face; 3742 $self->update_face;
3743 $self->update_timer;
3506 } 3744 }
3507 3745
3508 $self 3746 $self
3509} 3747}
3510 3748
3749sub update_timer {
3750 my ($self) = @_;
3751
3752 return unless $self->{timer};
3753
3754 if ($self->{visible}) {
3755 $self->{timer}->start;
3756 } else {
3757 $self->{timer}->stop;
3758 }
3759}
3760
3511sub update_face { 3761sub update_face {
3512 my ($self) = @_; 3762 my ($self) = @_;
3513 3763
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
3524sub size_request {
3525 my ($self) = @_;
3526
3527 if ($::CONN) { 3764 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3765 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) { 3766 if ($anim && @$anim) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3767 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3531 } else { 3768 delete $self->{face_change_cb};
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3769
3533 $self->realloc; 3770 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3771 unless ($tex->{name} || $tex->{loading}) {
3772 $tex->upload (sub { $self->reconfigure });
3773 }
3534 }); 3774 }
3535 } 3775 }
3536 } 3776 }
3537 } 3777 }
3778}
3779
3780sub size_request {
3781 my ($self) = @_;
3782
3783 if ($::CONN) {
3784 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3785 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3786 if ($tex->{name}) {
3787 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3788 } elsif (!$tex->{loading}) {
3789 $tex->upload (sub { $self->reconfigure });
3790 }
3791 }
3792
3793 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3794 }
3795 }
3538 3796
3539 ($self->{size_w} || 8, $self->{size_h} || 8) 3797 ($self->{size_w} || 8, $self->{size_h} || 8)
3540} 3798}
3541 3799
3542sub update { 3800sub update {
… …
3545 return unless $self->{visible}; 3803 return unless $self->{visible};
3546 3804
3547 $self->SUPER::update; 3805 $self->SUPER::update;
3548} 3806}
3549 3807
3808sub invoke_visibility_change {
3809 my ($self) = @_;
3810
3811 $self->update_timer;
3812
3813 0
3814}
3815
3550sub _draw { 3816sub _draw {
3551 my ($self) = @_; 3817 my ($self) = @_;
3552 3818
3553 return unless $::CONN;
3554
3555 $self->SUPER::_draw; 3819 $self->SUPER::_draw;
3556 3820
3557 my $faceid = $::CONN->{faceid}[$self->{face}] 3821 if (my $tex = $self->{tex}) {
3558 or return;
3559
3560 my $tex = $::CONN->{texture}[$faceid];
3561
3562 if ($tex) {
3563 glEnable GL_TEXTURE_2D; 3822 glEnable GL_TEXTURE_2D;
3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3823 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3565 glColor 0, 0, 0, 1; 3824 glColor 0, 0, 0, 1;
3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3825 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3567 glDisable GL_TEXTURE_2D; 3826 glDisable GL_TEXTURE_2D;
… …
3569} 3828}
3570 3829
3571sub destroy { 3830sub destroy {
3572 my ($self) = @_; 3831 my ($self) = @_;
3573 3832
3574 $self->{timer}->cancel 3833 (delete $self->{timer})->cancel
3575 if $self->{timer}; 3834 if $self->{timer};
3576 3835
3577 $self->SUPER::destroy; 3836 $self->SUPER::destroy;
3578} 3837}
3579 3838
3580############################################################################# 3839#############################################################################
3581 3840
3582package CFPlus::UI::Buttonbar; 3841package DC::UI::Buttonbar;
3583 3842
3584our @ISA = CFPlus::UI::HBox::; 3843our @ISA = DC::UI::HBox::;
3585 3844
3586# TODO: should actually wrap buttons and other goodies. 3845# TODO: should actually wrap buttons and other goodies.
3587 3846
3588############################################################################# 3847#############################################################################
3589 3848
3590package CFPlus::UI::Menu; 3849package DC::UI::Menu;
3591 3850
3592our @ISA = CFPlus::UI::Toplevel::; 3851our @ISA = DC::UI::Toplevel::;
3593 3852
3594use CFPlus::OpenGL; 3853use DC::OpenGL;
3595 3854
3596sub new { 3855sub new {
3597 my $class = shift; 3856 my $class = shift;
3598 3857
3599 my $self = $class->SUPER::new ( 3858 my $self = $class->SUPER::new (
3600 items => [], 3859 items => [],
3601 z => 100, 3860 z => 100,
3602 @_, 3861 @_,
3603 ); 3862 );
3604 3863
3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3864 $self->add ($self->{vbox} = new DC::UI::VBox);
3606 3865
3607 for my $item (@{ $self->{items} }) { 3866 for my $item (@{ $self->{items} }) {
3608 my ($widget, $cb, $tooltip) = @$item; 3867 my ($widget, $cb, $tooltip) = @$item;
3609 3868
3610 # handle various types of items, only text for now 3869 # handle various types of items, only text for now
3611 if (!ref $widget) { 3870 if (!ref $widget) {
3612 if ($widget =~ /\t/) { 3871 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2; 3872 my ($left, $right) = split /\t/, $widget, 2;
3614 3873
3615 $widget = new CFPlus::UI::HBox 3874 $widget = new DC::UI::HBox
3616 can_hover => 1, 3875 can_hover => 1,
3617 can_events => 1, 3876 can_events => 1,
3618 tooltip => $tooltip, 3877 tooltip => $tooltip,
3619 children => [ 3878 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1), 3879 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1), 3880 (new DC::UI::Label markup => $right, align => 1),
3622 ], 3881 ],
3623 ; 3882 ;
3624 3883
3625 } else { 3884 } else {
3626 $widget = new CFPlus::UI::Label 3885 $widget = new DC::UI::Label
3627 can_hover => 1, 3886 can_hover => 1,
3628 can_events => 1, 3887 can_events => 1,
3888 align => 0,
3629 markup => $widget, 3889 markup => $widget,
3630 tooltip => $tooltip; 3890 tooltip => $tooltip;
3631 } 3891 }
3632 } 3892 }
3633 3893
… …
3649 $GRAB = $self; 3909 $GRAB = $self;
3650 $self->{button} = $ev->{button}; 3910 $self->{button} = $ev->{button};
3651 3911
3652 $self->show; 3912 $self->show;
3653 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3913 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3914
3915 1 # so it can be used inside event handlers
3654} 3916}
3655 3917
3656sub invoke_mouse_motion { 3918sub invoke_mouse_motion {
3657 my ($self, $ev, $x, $y) = @_; 3919 my ($self, $ev, $x, $y) = @_;
3658 3920
… …
3679 1 3941 1
3680} 3942}
3681 3943
3682############################################################################# 3944#############################################################################
3683 3945
3684package CFPlus::UI::Multiplexer; 3946package DC::UI::Multiplexer;
3685 3947
3686our @ISA = CFPlus::UI::Container::; 3948our @ISA = DC::UI::Container::;
3687 3949
3688sub new { 3950sub new {
3689 my $class = shift; 3951 my $class = shift;
3690 3952
3691 my $self = $class->SUPER::new ( 3953 my $self = $class->SUPER::new (
3692 @_, 3954 @_,
3693 ); 3955 );
3694 3956
3695 $self->{current} = $self->{children}[0] 3957 $self->set_current_page (0);
3696 if @{ $self->{children} };
3697 3958
3698 $self 3959 $self
3699} 3960}
3700 3961
3701sub add { 3962sub add {
3702 my ($self, @widgets) = @_; 3963 my ($self, @widgets) = @_;
3703 3964
3704 $self->SUPER::add (@widgets); 3965 $self->SUPER::add (@widgets);
3705 3966
3706 $self->{current} = $self->{children}[0] 3967 $self->set_current_page (0)
3707 if @{ $self->{children} }; 3968 if @widgets == @{ $self->{children} };
3708} 3969}
3709 3970
3710sub get_current_page { 3971sub get_current_page {
3711 my ($self) = @_; 3972 my ($self) = @_;
3712 3973
… …
3718 3979
3719 my $widget = ref $page_or_widget 3980 my $widget = ref $page_or_widget
3720 ? $page_or_widget 3981 ? $page_or_widget
3721 : $self->{children}[$page_or_widget]; 3982 : $self->{children}[$page_or_widget];
3722 3983
3984 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3985
3723 $self->{current} = $widget; 3986 if (($self->{current} = $widget)) {
3987 $self->{current}->set_visible if $self->{current} && $self->{visible};
3724 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3988 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3725 3989
3726 $self->emit (page_changed => $self->{current}); 3990 $self->emit (page_changed => $self->{current});
3991 }
3727 3992
3728 $self->realloc; 3993 $self->realloc;
3729} 3994}
3730 3995
3731sub visible_children { 3996sub visible_children {
3732 $_[0]{current} 3997 $_[0]{current} || ()
3733} 3998}
3734 3999
3735sub size_request { 4000sub size_request {
3736 my ($self) = @_; 4001 my ($self) = @_;
3737 4002
4003 $self->{current}
3738 $self->{current}->size_request 4004 ? $self->{current}->size_request
4005 : (0, 0)
3739} 4006}
3740 4007
3741sub invoke_size_allocate { 4008sub invoke_size_allocate {
3742 my ($self, $w, $h) = @_; 4009 my ($self, $w, $h) = @_;
3743 4010
3744 $self->{current}->configure (0, 0, $w, $h); 4011 $self->{current}->configure (0, 0, $w, $h)
4012 if $self->{current};
3745 4013
3746 1 4014 1
3747} 4015}
3748 4016
3749sub _draw { 4017sub _draw {
3750 my ($self) = @_; 4018 my ($self) = @_;
3751 4019
3752 $self->{current}->draw; 4020 $self->{current}->draw
4021 if $self->{current};
3753} 4022}
3754 4023
3755############################################################################# 4024#############################################################################
3756 4025
3757package CFPlus::UI::Notebook; 4026package DC::UI::Notebook;
3758 4027
4028use DC::OpenGL;
4029
3759our @ISA = CFPlus::UI::VBox::; 4030our @ISA = DC::UI::VBox::;
3760 4031
3761sub new { 4032sub new {
3762 my $class = shift; 4033 my $class = shift;
3763 4034
3764 my $self = $class->SUPER::new ( 4035 my $self = $class->SUPER::new (
3765 buttonbar => (new CFPlus::UI::Buttonbar), 4036 buttonbar => (new DC::UI::Buttonbar),
3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4037 multiplexer => (new DC::UI::Multiplexer expand => 1),
4038 active_outline => [.7, .7, 0.2],
3767 # filter => # will be put between multiplexer and $self 4039 # filter => # will be put between multiplexer and $self
3768 @_, 4040 @_,
3769 ); 4041 );
3770 4042
3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4043 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3772 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4044 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3773 4045
4046 {
4047 Scalar::Util::weaken (my $wself = $self);
4048
4049 $self->{multiplexer}->connect (c_add => sub {
4050 my ($mplex, $widgets) = @_;
4051
4052 for my $child (@$widgets) {
4053 Scalar::Util::weaken $child;
4054 $child->{c_tab_} ||= do {
4055 my $tab =
4056 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4057 ? $child->{c_tab}
4058 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4059
4060 $tab->connect (activate => sub {
4061 $wself->set_current_page ($child);
4062 });
4063
4064 $tab
4065 };
4066
4067 $self->{buttonbar}->add ($child->{c_tab_});
4068 }
4069 });
4070
4071 $self->{multiplexer}->connect (c_remove => sub {
4072 my ($mplex, $widgets) = @_;
4073
4074 for my $child (@$widgets) {
4075 $wself->{buttonbar}->remove ($child->{c_tab_});
4076 }
4077 });
4078 }
4079
3774 $self 4080 $self
3775} 4081}
3776 4082
3777sub add { 4083sub add {
4084 my ($self, @widgets) = @_;
4085
4086 $self->{multiplexer}->add (@widgets)
4087}
4088
4089sub remove {
4090 my ($self, @widgets) = @_;
4091
4092 $self->{multiplexer}->remove (@widgets)
4093}
4094
4095sub pages {
4096 my ($self) = @_;
4097 $self->{multiplexer}->children
4098}
4099
4100sub page_index {
4101 my ($self, $widget) = @_;
4102
4103 my $i = 0;
4104 for ($self->pages) {
4105 if ($_ eq $widget) { return $i };
4106 $i++;
4107 }
4108
4109 undef
4110}
4111
4112sub add_tab {
3778 my ($self, $title, $widget, $tooltip) = @_; 4113 my ($self, $title, $widget, $tooltip) = @_;
3779 4114
3780 CFPlus::weaken $self; 4115 $title = [$title, $tooltip] unless ref $title;
4116 $widget->{c_tab} = $title;
3781 4117
3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3783 markup => $title,
3784 tooltip => $tooltip,
3785 on_activate => sub { $self->set_current_page ($widget) },
3786 );
3787
3788 $self->{multiplexer}->add ($widget); 4118 $self->add ($widget);
3789} 4119}
3790 4120
3791sub get_current_page { 4121sub get_current_page {
3792 my ($self) = @_; 4122 my ($self) = @_;
3793 4123
… …
3799 4129
3800 $self->{multiplexer}->set_current_page ($page); 4130 $self->{multiplexer}->set_current_page ($page);
3801 $self->emit (page_changed => $self->{multiplexer}{current}); 4131 $self->emit (page_changed => $self->{multiplexer}{current});
3802} 4132}
3803 4133
4134sub _draw {
4135 my ($self) = @_;
4136
4137 $self->SUPER::_draw ();
4138
4139 if (my $cur = $self->{multiplexer}{current}) {
4140 if ($cur = $cur->{c_tab_}) {
4141 glTranslate $self->{buttonbar}{x} + $cur->{x},
4142 $self->{buttonbar}{y} + $cur->{y};
4143 glLineWidth 3;
4144 #glEnable GL_BLEND;
4145 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4146 glColor @{$self->{active_outline}};
4147 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4148 glLineWidth 1;
4149 #glDisable GL_BLEND;
4150 }
4151 }
4152}
4153
3804############################################################################# 4154#############################################################################
3805 4155
3806package CFPlus::UI::Selector; 4156package DC::UI::Selector;
3807 4157
3808use utf8; 4158use utf8;
3809 4159
3810our @ISA = CFPlus::UI::Button::; 4160our @ISA = DC::UI::Button::;
3811 4161
3812sub new { 4162sub new {
3813 my $class = shift; 4163 my $class = shift;
3814 4164
3815 my $self = $class->SUPER::new ( 4165 my $self = $class->SUPER::new (
… …
3832 my ($value, $title, $tooltip) = @$_; 4182 my ($value, $title, $tooltip) = @$_;
3833 4183
3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4184 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3835 } 4185 }
3836 4186
3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4187 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3838} 4188}
3839 4189
3840sub _set_value { 4190sub _set_value {
3841 my ($self, $value) = @_; 4191 my ($self, $value) = @_;
3842 4192
3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4193 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4194 $item ||= $self->{options}[0]
3844 or return; 4195 or return;
3845 4196
3846 $self->{value} = $item->[0]; 4197 $self->{value} = $item->[0];
3847 $self->set_markup ("$item->[1] ⇓"); 4198 $self->set_markup ("$item->[1] ⇓");
3848 $self->set_tooltip ($item->[2]); 4199# $self->set_tooltip ($item->[2]);
3849} 4200}
3850 4201
3851sub set_value { 4202sub set_value {
3852 my ($self, $value) = @_; 4203 my ($self, $value) = @_;
3853 4204
… …
3855 4206
3856 $self->_set_value ($value); 4207 $self->_set_value ($value);
3857 $self->emit (changed => $value); 4208 $self->emit (changed => $value);
3858} 4209}
3859 4210
4211sub set_options {
4212 my ($self, $options) = @_;
4213
4214 $self->{options} = $options;
4215 $self->_set_value ($self->{value});
4216}
4217
3860############################################################################# 4218#############################################################################
3861 4219
3862package CFPlus::UI::Statusbox; 4220package DC::UI::Statusbox;
3863 4221
3864our @ISA = CFPlus::UI::VBox::; 4222our @ISA = DC::UI::VBox::;
3865 4223
3866sub new { 4224sub new {
3867 my $class = shift; 4225 my $class = shift;
3868 4226
3869 my $self = $class->SUPER::new ( 4227 my $self = $class->SUPER::new (
3870 fontsize => 0.8, 4228 fontsize => 0.8,
3871 @_, 4229 @_,
3872 ); 4230 );
3873 4231
3874 CFPlus::weaken (my $this = $self); 4232 DC::weaken (my $this = $self);
3875 4233
3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4234 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3877 4235
3878 $self 4236 $self
3879} 4237}
3880 4238
3881sub reorder { 4239sub reorder {
3882 my ($self) = @_; 4240 my ($self) = @_;
3883 my $NOW = Time::HiRes::time; 4241 my $NOW = EV::time;
3884 4242
3885 # freeze display when hovering over any label 4243 # freeze display when hovering over any label
3886 return if $CFPlus::UI::TOOLTIP->{owner} 4244 return if $DC::UI::TOOLTIP->{owner}
3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4245 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3888 values %{ $self->{item} }; 4246 values %{ $self->{item} };
3889 4247
3890 while (my ($k, $v) = each %{ $self->{item} }) { 4248 while (my ($k, $v) = each %{ $self->{item} }) {
3891 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4249 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3892 } 4250 }
4251
4252 $self->{timer}->set (1, 1);
3893 4253
3894 my @widgets; 4254 my @widgets;
3895 4255
3896 my @items = sort { 4256 my @items = sort {
3897 $a->{pri} <=> $b->{pri} 4257 $a->{pri} <=> $b->{pri}
3898 or $b->{id} <=> $a->{id} 4258 or $b->{id} <=> $a->{id}
3899 } values %{ $self->{item} }; 4259 } values %{ $self->{item} };
3900
3901 $self->{timer}->interval (1);
3902 4260
3903 my $count = 10 + 1; 4261 my $count = 10 + 1;
3904 for my $item (@items) { 4262 for my $item (@items) {
3905 last unless --$count; 4263 last unless --$count;
3906 4264
… …
3913 for ($short) { 4271 for ($short) {
3914 s/^\s+//; 4272 s/^\s+//;
3915 s/\s+/ /g; 4273 s/\s+/ /g;
3916 } 4274 }
3917 4275
3918 new CFPlus::UI::Label 4276 new DC::UI::Label
3919 markup => $short, 4277 markup => $short,
3920 tooltip => $item->{tooltip}, 4278 tooltip => $item->{tooltip},
3921 tooltip_font => $::FONT_PROP, 4279 tooltip_font => $::FONT_PROP,
3922 tooltip_width => 0.67, 4280 tooltip_width => 0.67,
3923 fontsize => $item->{fontsize} || $self->{fontsize}, 4281 fontsize => $item->{fontsize} || $self->{fontsize},
3924 max_w => $::WIDTH * 0.44, 4282 max_w => $::WIDTH * 0.44,
4283 align => 0,
3925 fg => [@{ $item->{fg} }], 4284 fg => [@{ $item->{fg} }],
3926 can_events => 1, 4285 can_events => 1,
3927 can_hover => 1 4286 can_hover => 1
3928 }; 4287 };
3929 4288
3930 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4289 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3931 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4290 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3932 $label->update; 4291 $label->update;
3933 $label->set_max_size (undef, $label->{req_h} * $diff) 4292 $label->set_max_size (undef, $label->{req_h} * $diff)
3934 if $diff < 1; 4293 if $diff < 1;
3935 $self->{timer}->interval (1/30); 4294 $self->{timer}->set (1/30, 1/30);
3936 } else { 4295 } else {
3937 $label->{fg}[3] = $item->{fg}[3] || 1; 4296 $label->{fg}[3] = $item->{fg}[3] || 1;
3938 } 4297 }
3939 4298
3940 push @widgets, $label; 4299 push @widgets, $label;
3941 } 4300 }
4301
4302 my $hash = join ",", @widgets;
4303 return if $hash eq $self->{last_widget_hash};
4304 $self->{last_widget_hash} = $hash;
3942 4305
3943 $self->clear; 4306 $self->clear;
3944 $self->SUPER::add (reverse @widgets); 4307 $self->SUPER::add (reverse @widgets);
3945} 4308}
3946 4309
… …
4002 $self->SUPER::destroy; 4365 $self->SUPER::destroy;
4003} 4366}
4004 4367
4005############################################################################# 4368#############################################################################
4006 4369
4007package CFPlus::UI::Root; 4370package DC::UI::Root;
4008 4371
4009our @ISA = CFPlus::UI::Container::; 4372our @ISA = DC::UI::Container::;
4010 4373
4011use List::Util qw(min max); 4374use List::Util qw(min max);
4012 4375
4013use CFPlus::OpenGL; 4376use DC::OpenGL;
4014 4377
4015sub new { 4378sub new {
4016 my $class = shift; 4379 my $class = shift;
4017 4380
4018 my $self = $class->SUPER::new ( 4381 my $self = $class->SUPER::new (
4019 visible => 1, 4382 visible => 1,
4020 @_, 4383 @_,
4021 ); 4384 );
4022 4385
4023 CFPlus::weaken ($self->{root} = $self); 4386 DC::weaken ($self->{root} = $self);
4024 4387
4025 $self 4388 $self
4026} 4389}
4027 4390
4028sub size_request { 4391sub size_request {
… …
4076} 4439}
4077 4440
4078sub update { 4441sub update {
4079 my ($self) = @_; 4442 my ($self) = @_;
4080 4443
4081 $::WANT_REFRESH++; 4444 $::WANT_REFRESH = 1;
4082} 4445}
4083 4446
4084sub add { 4447sub add {
4085 my ($self, @children) = @_; 4448 my ($self, @children) = @_;
4086 4449
… …
4123 while ($self->{refresh_hook}) { 4486 while ($self->{refresh_hook}) {
4124 $_->() 4487 $_->()
4125 for values %{delete $self->{refresh_hook}}; 4488 for values %{delete $self->{refresh_hook}};
4126 } 4489 }
4127 4490
4128 if ($self->{realloc}) { 4491 while ($self->{realloc}) {
4129 my %queue; 4492 my %queue;
4130 my @queue; 4493 my @queue;
4131 my $widget; 4494 my $widget;
4132 4495
4133 outer: 4496 outer:
… …
4153 4516
4154 delete $queue{$widget+0}; 4517 delete $queue{$widget+0};
4155 4518
4156 my ($w, $h) = $widget->size_request; 4519 my ($w, $h) = $widget->size_request;
4157 4520
4158 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4521 $w += $widget->{padding_x} * 2;
4159 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4522 $h += $widget->{padding_y} * 2;
4523
4524 $w = max $widget->{min_w}, $w;
4525 $h = max $widget->{min_h}, $h;
4160 4526
4161 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4527 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4162 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4528 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4163 4529
4164 $w = $widget->{force_w} if exists $widget->{force_w}; 4530 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4180 } 4546 }
4181 } 4547 }
4182 4548
4183 delete $self->{realloc}{$widget+0}; 4549 delete $self->{realloc}{$widget+0};
4184 } 4550 }
4185 }
4186 4551
4187 while (my $size_alloc = delete $self->{size_alloc}) { 4552 while (my $size_alloc = delete $self->{size_alloc}) {
4188 my @queue = sort { $b->{visible} <=> $a->{visible} } 4553 my @queue = sort { $a->{visible} <=> $b->{visible} }
4189 values %$size_alloc; 4554 values %$size_alloc;
4190 4555
4191 while () { 4556 while () {
4192 my $widget = pop @queue || last; 4557 my $widget = pop @queue || last;
4193 4558
4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4559 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4195 4560
4196 $w = 0 if $w < 0;
4197 $h = 0 if $h < 0;
4198
4199 $w = max $widget->{min_w}, $w; 4561 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h; 4562 $h = max $widget->{min_h}, $h;
4201 4563
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4564# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4565# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204 4566
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4567 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4568 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207 4569
4208 $w = int $w + 0.5; 4570 $w = int $w + 0.5;
4209 $h = int $h + 0.5; 4571 $h = int $h + 0.5;
4210 4572
4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4573 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4212 $widget->{old_w} = $widget->{w}; 4574 $widget->{old_w} = $widget->{w};
4213 $widget->{old_h} = $widget->{h}; 4575 $widget->{old_h} = $widget->{h};
4214 4576
4215 $widget->{w} = $w; 4577 $widget->{w} = $w;
4216 $widget->{h} = $h; 4578 $widget->{h} = $h;
4217 4579
4218 $widget->emit (size_allocate => $w, $h); 4580 $widget->emit (size_allocate => $w, $h);
4581 }
4219 } 4582 }
4220 } 4583 }
4221 } 4584 }
4222 4585
4223 while ($self->{post_alloc_hook}) { 4586 while ($self->{post_alloc_hook}) {
4224 $_->() 4587 $_->()
4225 for values %{delete $self->{post_alloc_hook}}; 4588 for values %{delete $self->{post_alloc_hook}};
4226 } 4589 }
4227
4228 4590
4229 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4591 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4592 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4231 glClear GL_COLOR_BUFFER_BIT; 4593 glClear GL_COLOR_BUFFER_BIT;
4232 4594
… …
4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4597 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4236 glMatrixMode GL_MODELVIEW; 4598 glMatrixMode GL_MODELVIEW;
4237 glLoadIdentity; 4599 glLoadIdentity;
4238 4600
4239 { 4601 {
4240 package CFPlus::UI::Base; 4602 package DC::UI::Base;
4241 4603
4242 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4604 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4243 (0, 0, $self->{w}, $self->{h}); 4605 (0, 0, $self->{w}, $self->{h});
4244 4606
4245 $self->_draw; 4607 $self->_draw;
4246 } 4608 }
4247} 4609}
4248 4610
4249############################################################################# 4611#############################################################################
4250 4612
4251package CFPlus::UI; 4613package DC::UI;
4252 4614
4253$ROOT = new CFPlus::UI::Root; 4615$ROOT = new DC::UI::Root;
4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4616$TOOLTIP = new DC::UI::Tooltip z => 900;
4255 4617
42561 46181
4257

Diff Legend

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