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.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.481 by root, Tue Oct 12 05:11:38 2010 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
7use Event;
8 6
9use CFPlus; 7use Guard ();
8
9use DC;
10use CFPlus::Pod; 10use DC::Pod;
11use CFPlus::Texture; 11use DC::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
17our $TOOLTIP; 17our $TOOLTIP;
18our $BUTTON_STATE; 18our $BUTTON_STATE;
19 19
20our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21 21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
23 $_[0]->stop;
24
23 if (!$GRAB) { 25 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 27 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 28 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 29 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 32 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 33 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 34
33 return if $ENV{CFPLUS_DEBUG} & 8; 35 return if $ENV{CFPLUS_DEBUG} & 8;
34 36
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 38 $TOOLTIP->show;
41 } 39 }
42 40
43 return; 41 return;
… …
46 } 44 }
47 45
48 $TOOLTIP->hide; 46 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 47 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 48 delete $TOOLTIP->{owner};
51}); 49};
52 50
53sub get_layout { 51sub get_layout {
54 my $layout; 52 my $layout;
55 53
56 for (grep { $_->{name} } values %WIDGET) { 54 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 89 my $hover = $HOVER; $HOVER = $widget;
92 90
93 $hover->update if $hover && $hover->{can_hover}; 91 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 92 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 93
96 $TOOLTIP_WATCHER->start; 94 $TOOLTIP_WATCHER->again;
97 } 95 }
98} 96}
99 97
100sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
101 my ($ev) = @_; 99 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
108 106
109 $GRAB = $widget; 107 $GRAB = $widget;
110 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
111 109
112 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->invoke;
113 } 111 }
114 112
115 if ($GRAB) { 113 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 115 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 116 my $delta = $ev->{button} * 2 - 9;
117 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
118
119 $ev->{dx} = $shift ? $delta : 0;
120 $ev->{dy} = $shift ? 0 : $delta;
121
120 $GRAB->emit (mouse_wheel => $ev); 122 $GRAB->emit (mouse_wheel => $ev);
121 } else { 123 } else {
122 $GRAB->emit (button_down => $ev) 124 $GRAB->emit (button_down => $ev)
123 } 125 }
124 } 126 }
… …
138 my $grab = $GRAB; undef $GRAB; 140 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 141 $grab->update if $grab;
140 $GRAB->update if $GRAB; 142 $GRAB->update if $GRAB;
141 143
142 check_hover $widget; 144 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 145 $TOOLTIP_WATCHER->invoke;
144 } 146 }
145} 147}
146 148
147sub feed_sdl_motion_event { 149sub feed_sdl_motion_event {
148 my ($ev) = @_; 150 my ($ev) = @_;
… …
188# call when resolution changes etc. 190# call when resolution changes etc.
189sub rescale_widgets { 191sub rescale_widgets {
190 my ($sx, $sy) = @_; 192 my ($sx, $sy) = @_;
191 193
192 for my $widget (values %WIDGET) { 194 for my $widget (values %WIDGET) {
193 if ($widget->{is_toplevel}) { 195 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 196 $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.]+$/; 197 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196 198
197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 199 $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}; 200 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
210 reconfigure_widgets; 212 reconfigure_widgets;
211} 213}
212 214
213############################################################################# 215#############################################################################
214 216
215package CFPlus::UI::Event; 217package DC::UI::Event;
216 218
217sub xy { 219sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 220 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 221}
220 222
221############################################################################# 223#############################################################################
222 224
223package CFPlus::UI::Base; 225package DC::UI::Base;
224 226
225use strict; 227use common::sense;
226 228
227use CFPlus::OpenGL; 229use DC::OpenGL;
228 230
229sub new { 231sub new {
230 my $class = shift; 232 my $class = shift;
231 233
232 my $self = bless { 234 my $self = bless {
… …
237 h => undef, 239 h => undef,
238 can_events => 1, 240 can_events => 1,
239 @_ 241 @_
240 }, $class; 242 }, $class;
241 243
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 244 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 245
244 for (keys %$self) { 246 for (keys %$self) {
245 if (/^on_(.*)$/) { 247 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 248 $self->connect ($1 => delete $self->{$_});
247 } 249 }
248 } 250 }
249 251
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 252 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 253 $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}; 254 $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}; 255 $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}; 256 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 257
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 258 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 259 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 260
259 $self->show if $layout->{show}; 261 $self->show if $layout->{show};
… …
269 $self->emit ("destroy"); 271 $self->emit ("destroy");
270 %$self = (); 272 %$self = ();
271} 273}
272 274
273sub TO_JSON { 275sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 276 { "\fw" => $_[0]{s_id} }
275} 277}
276 278
277sub show { 279sub show {
278 my ($self) = @_; 280 my ($self) = @_;
279 281
280 return if $self->{parent}; 282 return if $self->{parent};
281 283
282 $CFPlus::UI::ROOT->add ($self); 284 $DC::UI::ROOT->add ($self);
283} 285}
284 286
285sub set_visible { 287sub set_visible {
286 my ($self) = @_; 288 my ($self) = @_;
287 289
288 return if $self->{visible}; 290 return if $self->{visible};
291
292 $self->{parent} && $self->{parent}{root}#d#
293 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
289 294
290 $self->{root} = $self->{parent}{root}; 295 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1; 296 $self->{visible} = $self->{parent}{visible} + 1;
292 297
293 $self->emit (visibility_change => 1); 298 $self->emit (visibility_change => 1);
294 299
295 $self->realloc if !exists $self->{req_w}; 300 $self->realloc if !exists $self->{req_w};
296 301
297 $_->set_visible for $self->children; 302 $_->set_visible for $self->visible_children;
298} 303}
299 304
300sub set_invisible { 305sub set_invisible {
301 my ($self) = @_; 306 my ($self) = @_;
302 307
… …
308 delete $self->{root}; 313 delete $self->{root};
309 314
310 undef $GRAB if $GRAB == $self; 315 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 316 undef $HOVER if $HOVER == $self;
312 317
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 318 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 319 if $TOOLTIP->{owner} == $self;
315 320
316 $self->emit ("focus_out"); 321 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 322 $self->emit (visibility_change => 0);
318} 323}
… …
337sub hide { 342sub hide {
338 my ($self) = @_; 343 my ($self) = @_;
339 344
340 $self->set_invisible; 345 $self->set_invisible;
341 346
347 # extra $parent copy for 5.8.8+ bug workaround
348 # (otherwise $_[0] in remove gets freed
349 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 350 $parent->remove ($self);
343 if $self->{parent}; 351 }
344} 352}
345 353
346sub move_abs { 354sub move_abs {
347 my ($self, $x, $y, $z) = @_; 355 my ($self, $x, $y, $z) = @_;
348 356
… …
360 $self->{force_h} = $h; 368 $self->{force_h} = $h;
361 369
362 $self->realloc; 370 $self->realloc;
363} 371}
364 372
373# traverse the widget chain up to find the maximum "physical" size constraints
374sub get_max_wh {
375 my ($self) = @_;
376
377 my ($w, $h) = @$self{qw(max_w max_h)};
378
379 if ($w <= 0 || $h <= 0) {
380 my ($mw, $mh) = $self->{parent}
381 ? $self->{parent}->get_max_wh
382 : ($::WIDTH, $::HEIGHT);
383
384 $w = $mw if $w <= 0;
385 $h = $mh if $h <= 0;
386 }
387
388 ($w, $h)
389}
390
365sub size_request { 391sub size_request {
366 require Carp; 392 require Carp;
367 Carp::confess "size_request is abstract"; 393 Carp::confess "size_request is abstract";
368} 394}
369 395
… …
375 my ($self, $x, $y, $w, $h) = @_; 401 my ($self, $x, $y, $w, $h) = @_;
376 402
377 if ($self->{aspect}) { 403 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 404 my ($ow, $oh) = ($w, $h);
379 405
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 406 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 407 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 408
383 # use alignment to adjust x, y 409 # use alignment to adjust x, y
384 410
385 $x += int 0.5 * ($ow - $w); 411 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 412 $y += int 0.5 * ($oh - $h);
… …
427 453
428 return if $self->{tooltip} eq $tooltip; 454 return if $self->{tooltip} eq $tooltip;
429 455
430 $self->{tooltip} = $tooltip; 456 $self->{tooltip} = $tooltip;
431 457
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 458 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 459 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 460 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 461 }
436} 462}
437 463
438# translate global coordinates to local coordinate system 464# translate global coordinates to local coordinate system
439sub coord2local { 465sub coord2local {
440 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
441 467
442 Carp::confess unless $self->{parent};#d# 468 return (undef, undef) unless $self->{parent};
443 469
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 470 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 471}
446 472
447# translate local coordinates to global coordinate system 473# translate local coordinates to global coordinate system
448sub coord2global { 474sub coord2global {
449 my ($self, $x, $y) = @_; 475 my ($self, $x, $y) = @_;
450 476
451 Carp::confess unless $self->{parent};#d# 477 return (undef, undef) unless $self->{parent};
452 478
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 479 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 480}
455 481
456sub invoke_focus_in { 482sub invoke_focus_in {
… …
505sub connect { 531sub connect {
506 my ($self, $signal, $cb) = @_; 532 my ($self, $signal, $cb) = @_;
507 533
508 push @{ $self->{signal_cb}{$signal} }, $cb; 534 push @{ $self->{signal_cb}{$signal} }, $cb;
509 535
510 defined wantarray and CFPlus::guard { 536 defined wantarray and Guard::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 537 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 538 @{ $self->{signal_cb}{$signal} };
513 } 539 }
514} 540}
515 541
… …
547 573
548 # parent 574 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 575 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 576}
551 577
552sub find_widget { 578#sub find_widget {
553 my ($self, $x, $y) = @_; 579# 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 580
564sub set_parent { 581sub set_parent {
565 my ($self, $parent) = @_; 582 my ($self, $parent) = @_;
566 583
567 CFPlus::weaken ($self->{parent} = $parent); 584 DC::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 585 $self->set_visible if $parent->{visible};
569} 586}
570 587
571sub realloc { 588sub realloc {
572 my ($self) = @_; 589 my ($self) = @_;
… …
598 615
599# using global variables seems a bit hacky, but passing through all drawing 616# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 617# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 618our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 619
603sub draw { 620#sub draw {
604 my ($self) = @_; 621#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 622
650sub _draw { 623sub _draw {
651 my ($self) = @_; 624 my ($self) = @_;
652 625
653 warn "no draw defined for $self\n"; 626 warn "no draw defined for $self\n";
654} 627}
655 628
656my $cntx;#d#
657sub DESTROY { 629sub DESTROY {
658 my ($self) = @_; 630 my ($self) = @_;
659 631
660 return if CFPlus::in_destruct; 632 return if DC::in_destruct;
661 633
634 local $@;
662 eval { $self->destroy }; 635 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 637
665 delete $WIDGET{$self+0}; 638 delete $WIDGET{$self+0};
666} 639}
667 640
668############################################################################# 641#############################################################################
669 642
670package CFPlus::UI::DrawBG; 643package DC::UI::DrawBG;
671 644
672our @ISA = CFPlus::UI::Base::; 645our @ISA = DC::UI::Base::;
673 646
674use strict; 647use common::sense;
648
675use CFPlus::OpenGL; 649use DC::OpenGL;
676 650
677sub new { 651sub new {
678 my $class = shift; 652 my $class = shift;
679
680 # range [value, low, high, page]
681 653
682 $class->SUPER::new ( 654 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
685 @_ 657 @_
686 ) 658 )
687} 659}
688 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
689sub _draw { 668sub _draw {
690 my ($self) = @_; 669 my ($self) = @_;
691 670
692 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self
693 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
694 : $self->{bg}; 673 : $self->{bg};
695 674
696 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
697 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
698 677
699 glEnable GL_BLEND; 678 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 680 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 682 glDisable GL_BLEND;
711 } 683 }
712} 684}
713 685
714############################################################################# 686#############################################################################
715 687
716package CFPlus::UI::Empty; 688package DC::UI::Empty;
717 689
718our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
719 691
720sub new { 692sub new {
721 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
723} 695}
… …
730 702
731sub draw { } 703sub draw { }
732 704
733############################################################################# 705#############################################################################
734 706
735package CFPlus::UI::Container; 707package DC::UI::Container;
736 708
737our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
738 710
739sub new { 711sub new {
740 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
741 713
742 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
746 can_events => 0, 718 can_events => 0,
747 %arg, 719 %arg,
748 ); 720 );
749 721
750 $self->add (@$children) 722 $self->add (@$children)
751 if $children; 723 if $children && @$children;
752 724
753 $self 725 $self
754} 726}
755 727
756sub realloc { 728sub realloc {
… …
765 my ($self, @widgets) = @_; 737 my ($self, @widgets) = @_;
766 738
767 $_->set_parent ($self) 739 $_->set_parent ($self)
768 for @widgets; 740 for @widgets;
769 741
742 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 743 use sort 'stable';
771 744
772 $self->{children} = [ 745 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 746 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
775 ]; 748 ];
776 749
777 $self->realloc; 750 $self->realloc;
751
752 $self->emit (c_add => \@widgets);
753
754 map $_+0, @widgets
778} 755}
779 756
780sub children { 757sub children {
781 @{ $_[0]{children} } 758 @{ $_[0]{children} }
782} 759}
783 760
784sub remove { 761sub remove {
785 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
786 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
787 delete $child->{parent}; 767 delete $child->{parent};
788 $child->hide; 768 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
791 771
792 $self->realloc; 772 $self->realloc;
793} 773}
794 774
795sub clear { 775sub clear {
796 my ($self) = @_; 776 my ($self) = @_;
797 777
798 my $children = delete $self->{children}; 778 my $children = $self->{children};
799 $self->{children} = []; 779 $self->{children} = [];
800 780
801 for (@$children) { 781 for (@$children) {
802 delete $_->{parent}; 782 delete $_->{parent};
803 $_->hide; 783 $_->hide;
… …
823} 803}
824 804
825sub _draw { 805sub _draw {
826 my ($self) = @_; 806 my ($self) = @_;
827 807
828 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
829} 809}
830 810
831############################################################################# 811#############################################################################
832 812
833package CFPlus::UI::Bin; 813package DC::UI::Bin;
834 814
835our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
836 816
837sub new { 817sub new {
838 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
839 819
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 821
842 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
843} 823}
844 824
845sub add { 825sub add {
846 my ($self, $child) = @_; 826 my ($self, $child) = @_;
847 827
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
849 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
850} 830}
851 831
852sub remove { 832sub remove {
853 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
854 834
855 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
856 836
857 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 838 unless @{$self->{children}};
859} 839}
860 840
861sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
862 842
… …
871 851
872 1 852 1
873} 853}
874 854
875############################################################################# 855#############################################################################
876
877# back-buffered drawing area 856# back-buffered drawing area
878 857
879package CFPlus::UI::Window; 858package DC::UI::Window;
880 859
881our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
882 861
883use CFPlus::OpenGL; 862use DC::OpenGL;
884 863
885sub new { 864sub new {
886 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
887 866
888 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
910} 889}
911 890
912sub render_child { 891sub render_child {
913 my ($self) = @_; 892 my ($self) = @_;
914 893
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 894 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
918 897
919 { 898 {
920 package CFPlus::UI::Base; 899 package DC::UI::Base;
921 900
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
924 903
925 $self->_render; 904 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
943} 922}
944 923
945############################################################################# 924#############################################################################
946 925
947package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
948 927
928use List::Util qw(min max);
929
949our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
950 931
951sub new { 932sub new {
952 my $class = shift; 933 my $class = shift;
953 934
954 $class->SUPER::new ( 935 $class->SUPER::new (
… …
961sub size_request { 942sub size_request {
962 my ($self) = @_; 943 my ($self) = @_;
963 944
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 946
966 $w = 10 if $self->{scroll_x}; 947 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 948 $h = 1 if $self->{scroll_y};
968 949
969 ($w, $h) 950 ($w, $h)
970} 951}
971 952
972sub invoke_size_allocate { 953sub invoke_size_allocate {
… …
984} 965}
985 966
986sub set_offset { 967sub set_offset {
987 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
988 969
970 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
971 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
972
973 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 974 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 975 $self->{view_y} = $y;
991 976
977 $self->emit (changed => $x, $y);
992 $self->update; 978 $self->update;
979 }
980}
981
982sub set_center {
983 my ($self, $x, $y) = @_;
984
985 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
986}
987
988sub make_visible {
989 my ($self, $x, $y, $border) = @_;
990
991 if ( $x < $self->{view_x} + $self->{w} * $border
992 || $x > $self->{view_x} + $self->{w} * (1 - $border)
993 || $y < $self->{view_y} + $self->{h} * $border
994 || $y > $self->{view_y} + $self->{h} * (1 - $border)
995 ) {
996 $self->set_center ($x, $y);
997 }
993} 998}
994 999
995# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 1001sub coord2local {
997 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1013 1018
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1021 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 1023 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1020 } 1025 }
1021} 1026}
1022 1027
1023sub _render { 1028sub _render {
1024 my ($self) = @_; 1029 my ($self) = @_;
1025 1030
1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1031 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1032 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1028 1033
1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1030 1035
1031 $self->SUPER::_render; 1036 $self->SUPER::_render;
1032} 1037}
1033 1038
1034############################################################################# 1039#############################################################################
1035 1040
1036package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1037 1042
1038our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1039 1044
1040sub new { 1045sub new {
1041 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1042 1047
1043 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1044 1049
1045 my $self; 1050 my $self;
1046 1051
1047 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1053 c_col => 0,
1054 c_row => 1,
1048 vertical => 0, 1055 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1057 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1060 },
1054 ; 1061 ;
1055 1062
1056 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1064 c_col => 1,
1065 c_row => 0,
1057 vertical => 1, 1066 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1068 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1071 },
1063 ; 1072 ;
1064 1073
1065 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1067 can_events => 1, 1077 can_events => 1,
1068 hslider => $hslider, 1078 hslider => $hslider,
1069 vslider => $vslider, 1079 vslider => $vslider,
1070 col_expand => [1, 0], 1080 col_expand => [1, 0],
1071 row_expand => [1, 0], 1081 row_expand => [1, 0],
1072 %arg, 1082 %arg,
1073 ); 1083 );
1074 1084
1085 $self->{vp} = new DC::UI::ViewPort
1086 c_col => 0,
1087 c_row => 0,
1088 expand => 1,
1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1104 ;
1105
1075 $self->SUPER::add (0, 0, $self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1107
1079 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1080 1109
1081 $self 1110 $self
1082} 1111}
1083
1084#TODO# update range on size_allocate depending on child
1085 1112
1086sub add { 1113sub add {
1087 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1088 1115
1089 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1090} 1117}
1091 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
1123sub update_slider {
1124 my ($self) = @_;
1125
1126 my $child = ($self->{vp} or return)->child;
1127
1128 if ($self->{scroll_x}) {
1129 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1130 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1131
1132 my $visible = $w1 > $w2;
1133 if ($visible != $self->{hslider_visible}) {
1134 $self->{hslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{hslider})
1136 : $self->SUPER::remove ($self->{hslider});
1137 }
1138 }
1139
1140 if ($self->{scroll_y}) {
1141 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1142 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1143
1144 my $visible = $h1 > $h2;
1145 if ($visible != $self->{vslider_visible}) {
1146 $self->{vslider_visible} = $visible;
1147 $visible ? $self->SUPER::add ($self->{vslider})
1148 : $self->SUPER::remove ($self->{vslider});
1149 }
1150 }
1151}
1152
1153sub start_dragging {
1154 my ($self, $ev) = @_;
1155
1156 $self->grab_focus;
1157
1158 my $ox = $self->{vp}{view_x};
1159 my $oy = $self->{vp}{view_y};
1160
1161 $self->{motion} = sub {
1162 my ($ev, $x, $y) = @_;
1163
1164 $ox -= $ev->{xrel};
1165 $oy -= $ev->{yrel};
1166
1167 $self->{vp}->set_offset ($ox, $oy);
1168 };
1169}
1170
1092sub invoke_mouse_wheel { 1171sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1172 my ($self, $ev) = @_;
1094 1173
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev); 1174 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1175 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1098 1176
1099 1 1177 1
1100} 1178}
1101 1179
1102sub update_slider { 1180sub invoke_button_down {
1103 my ($self) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1104 1182
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w}); 1183 if ($ev->{button} == 2) {
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1184 $self->start_dragging ($ev);
1107 #$self->{hslider}->set_visibility ($w1 != $w2); 1185 return 1;
1186 }
1108 1187
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h}); 1188 0
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1112} 1189}
1113 1190
1114sub update { 1191sub invoke_button_up {
1115 my ($self) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1116 1193
1117 $self->SUPER::update; 1194 if (delete $self->{motion}) {
1118 $self->update_slider; 1195 return 1;
1196 }
1197
1198 0
1199}
1200
1201sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_;
1203
1204 if ($self->{motion}) {
1205 $self->{motion}->($ev, $x, $y);
1206 return 1;
1207 }
1208
1209 0
1119} 1210}
1120 1211
1121sub invoke_size_allocate { 1212sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1213 my ($self, $w, $h) = @_;
1123 1214
… …
1125 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1126} 1217}
1127 1218
1128############################################################################# 1219#############################################################################
1129 1220
1130package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1131 1222
1132our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1133 1224
1134use CFPlus::OpenGL; 1225use DC::OpenGL;
1135 1226
1136sub new { 1227sub new {
1137 my $class = shift; 1228 my $class = shift;
1138 1229
1139 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1149 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1150 1241
1151 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1152 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1153 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1154
1155 glBegin GL_QUADS;
1156 glVertex 0 , 0;
1157 glVertex 0 , $h;
1158 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1159 glVertex $w, 0;
1160 glEnd;
1161
1162 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1163 } 1247 }
1164 1248
1165 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1166} 1250}
1167 1251
1168############################################################################# 1252#############################################################################
1169 1253
1170package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1171 1255
1172our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1173 1257
1174use CFPlus::OpenGL; 1258use DC::OpenGL;
1175 1259
1176sub new { 1260sub new {
1177 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1178 1262
1179 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1180 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1181 align => 1, 1265 align => 1,
1182 valign => 0, 1266 valign => 0.5,
1183 text => $arg{label}, 1267 text => $arg{label},
1184 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1185 } 1269 }
1186 1270
1187 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1188 # label => "", 1272 # label => "",
1189 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1190 border => 0.8, 1274 border => 0.8,
1191 style => 'single', 1275 style => 'single',
1192 %arg, 1276 %arg,
1193 ); 1277 );
1194 1278
… …
1197 1281
1198sub add { 1282sub add {
1199 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1200 1284
1201 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1202 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1203} 1287}
1204 1288
1205sub border { 1289sub border {
1206 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1207} 1291}
… …
1247 my $border = $self->border; 1331 my $border = $self->border;
1248 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1249 1333
1250 $child->draw; 1334 $child->draw;
1251 1335
1252 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1253 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1254 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1255 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1256 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1257 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1265 } 1349 }
1266} 1350}
1267 1351
1268############################################################################# 1352#############################################################################
1269 1353
1270package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1271 1355
1272our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1273 1357
1274use CFPlus::OpenGL; 1358use DC::OpenGL;
1275 1359
1276my $bg = 1360my $bg =
1277 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1278 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1279 1363
1280my @border = 1364my @border =
1281 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1282 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1366 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1367
1368my @icon =
1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1370 qw(x1_move.png x1_resize.png);
1283 1371
1284sub new { 1372sub new {
1285 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1286 1374
1287 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1288 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1289 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1290 border => 0.6, 1378 border => 0.8,
1291 can_events => 1, 1379 can_events => 1,
1292 min_w => 64, 1380 min_w => 64,
1293 min_h => 32, 1381 min_h => 32,
1294 %arg, 1382 %arg,
1295 ); 1383 );
1296 1384
1297 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1298 align => 0, 1386 align => 0.5,
1299 valign => 1, 1387 valign => 1,
1300 text => $self->{title}, 1388 text => $self->{title},
1301 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1302 if exists $self->{title}; 1390 if exists $self->{title};
1303 1391
1304 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1305 $self->{close_button} = 1393 $self->{close_button} =
1306 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1307 path => 'x1_close.png', 1395 path => 'x1_close.png',
1308 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1309 1397
1310 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1311 } 1399 }
1312 1400
1313 $self 1401 $self
1314} 1402}
1315 1403
1316sub add { 1404sub add {
1317 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1318 1406
1319 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1320 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1321 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1322} 1410}
1323 1411
1324sub border { 1412sub border {
1325 int $_[0]{border} * $::FONTSIZE 1413 int $_[0]{border} * $::FONTSIZE
1414}
1415
1416sub get_max_wh {
1417 my ($self) = @_;
1418
1419 return ($self->{w}, $self->{h})
1420 if $self->{visible} && $self->{w};
1421
1422 $self->SUPER::get_max_wh
1326} 1423}
1327 1424
1328sub size_request { 1425sub size_request {
1329 my ($self) = @_; 1426 my ($self) = @_;
1330 1427
… …
1455 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1457 1554
1458 my $border = $self->border; 1555 my $border = $self->border;
1459 1556
1557 if ($border) {
1460 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1461 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1462 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1463 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1464 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1563
1564 # move
1565 my $w2 = ($w - $border) * .5;
1566 my $h2 = ($h - $border) * .5;
1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1570
1571 # resize
1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1574 unless $self->{has_close_button};
1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1465 1578
1466 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1467 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1468 1581
1469 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1488 if $self->{close_button}; 1601 if $self->{close_button};
1489} 1602}
1490 1603
1491############################################################################# 1604#############################################################################
1492 1605
1493package CFPlus::UI::Table; 1606package DC::UI::Table;
1494 1607
1495our @ISA = CFPlus::UI::Base::; 1608our @ISA = DC::UI::Container::;
1496 1609
1497use List::Util qw(max sum); 1610use List::Util qw(max sum);
1498 1611
1499use CFPlus::OpenGL; 1612use DC::OpenGL;
1500 1613
1501sub new { 1614sub new {
1502 my $class = shift; 1615 my $class = shift;
1503 1616
1504 $class->SUPER::new ( 1617 $class->SUPER::new (
… …
1506 row_expand => [], 1619 row_expand => [],
1507 @_, 1620 @_,
1508 ) 1621 )
1509} 1622}
1510 1623
1511sub children {
1512 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1513}
1514
1515sub add { 1624sub add {
1625 my ($self, @widgets) = @_;
1626
1627 for my $child (@widgets) {
1628 $child->{c_rowspan} ||= 1;
1629 $child->{c_colspan} ||= 1;
1630 }
1631
1632 $self->SUPER::add (@widgets);
1633}
1634
1635sub add_at {
1516 my ($self) = shift; 1636 my $self = shift;
1637
1638 my @widgets;
1517 1639
1518 while (@_) { 1640 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1520 $child->set_parent ($self);
1521 $self->{children}[$y][$x] = $child;
1522 }
1523 1642
1524 $self->{force_realloc} = 1; 1643 $child->{c_row} = $row;
1525 $self->{force_size_alloc} = 1; 1644 $child->{c_col} = $col;
1526 $self->realloc;
1527}
1528 1645
1529sub remove { 1646 push @widgets, $child;
1647 }
1648
1649 $self->add (@widgets);
1650}
1651
1652sub get_wh {
1530 my ($self, $child) = @_; 1653 my ($self) = @_;
1531 1654
1532 # TODO: not yet implemented 1655 my (@w, @h);
1533}
1534
1535# TODO: move to container class maybe? send children a signal on removal?
1536sub clear {
1537 my ($self) = @_;
1538 1656
1539 my @children = $self->children; 1657 my @children = $self->children;
1540 delete $self->{children}; 1658
1659 # first pass, columns
1660 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1661 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1662
1663 my $sw = sum @w[$c .. $c + $cs - 1];
1664
1665 if ($w > $sw) {
1666 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1667 }
1541 1668 }
1542 for (@children) {
1543 delete $_->{parent};
1544 $_->hide;
1545 }
1546 1669
1547 $self->realloc; 1670 # second pass, rows
1548} 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1549
1550sub get_wh {
1551 my ($self) = @_;
1552
1553 my (@w, @h);
1554
1555 for my $y (0 .. $#{$self->{children}}) {
1556 my $row = $self->{children}[$y]
1557 or next;
1558
1559 for my $x (0 .. $#$row) {
1560 my $widget = $row->[$x]
1561 or next;
1562 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1563 1673
1564 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1565 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1566 } 1678 }
1567 } 1679 }
1568 1680
1569 (\@w, \@h) 1681 (\@w, \@h)
1570} 1682}
… …
1586 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1587 1699
1588 my $req_w = (sum @$ws) || 1; 1700 my $req_w = (sum @$ws) || 1;
1589 my $req_h = (sum @$hs) || 1; 1701 my $req_h = (sum @$hs) || 1;
1590 1702
1591 # TODO: nicer code 1703 # now linearly scale the rows/columns to the allocated size
1592 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1593 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1594 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1595 1707
1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1597 1709
1598 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1599 1711
1600 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1603 1715
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605 1717
1606 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1607 1719
1608 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1609 1722
1610 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1611 my $row = $self->{children}[$r] 1724 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1612 or next;
1613 1725
1614 my $x = 0; 1726 $widget->configure (
1615 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1616 1729 );
1617 for my $c (0 .. $#$row) { 1730 }
1618 my $col_w = $ws->[$c];
1619 1731
1620 if (my $widget = $row->[$c]) { 1732 1
1621 $widget->configure ($x, $y, $col_w, $row_h); 1733}
1622 }
1623 1734
1624 $x += $col_w; 1735#############################################################################
1736
1737package DC::UI::Fixed;
1738
1739use List::Util qw(min max);
1740
1741our @ISA = DC::UI::Container::;
1742
1743sub _scale($$$) {
1744 my ($rel, $val, $max) = @_;
1745
1746 $rel ? $val * $max : $val
1747}
1748
1749sub size_request {
1750 my ($self) = @_;
1751
1752 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1753
1754 # determine overall size by querying abs widgets
1755 for my $child ($self->visible_children) {
1756 unless ($child->{c_rel}) {
1757 my $x = $child->{c_x};
1758 my $y = $child->{c_y};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1625 } 1762 }
1763 }
1626 1764
1627 $y += $row_h; 1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 # now layout remaining widgets
1769 for my $child ($self->visible_children) {
1770 if ($child->{c_rel}) {
1771 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1772 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1776 }
1777 }
1778
1779 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1;
1781
1782 ($W, $H)
1783}
1784
1785sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_;
1787
1788 for my $child ($self->visible_children) {
1789 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1790 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1791
1792 $x += $child->{c_halign} * $child->{req_w};
1793 $y += $child->{c_valign} * $child->{req_h};
1794
1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1628 } 1796 }
1629 1797
1630 1 1798 1
1631} 1799}
1632 1800
1633sub find_widget {
1634 my ($self, $x, $y) = @_;
1635
1636 $x -= $self->{x};
1637 $y -= $self->{y};
1638
1639 my $res;
1640
1641 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1642 $res = $_->find_widget ($x, $y)
1643 and return $res;
1644 }
1645
1646 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1647}
1648
1649sub _draw {
1650 my ($self) = @_;
1651
1652 for (grep $_, @{$self->{children}}) {
1653 $_->draw for grep $_, @$_;
1654 }
1655}
1656
1657############################################################################# 1801#############################################################################
1658 1802
1659package CFPlus::UI::Box; 1803package DC::UI::Box;
1660 1804
1661our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1662 1806
1663sub size_request { 1807sub size_request {
1664 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1665 1811
1666 $self->{vertical} 1812 $self->{vertical}
1667 ? ( 1813 ? (
1668 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1669 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1670 ) 1816 )
1671 : ( 1817 : (
1672 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1673 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1674 ) 1820 )
1675} 1821}
1676 1822
1677sub invoke_size_allocate { 1823sub invoke_size_allocate {
1678 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1699 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1700 for 0 .. $#children; 1846 for 0 .. $#children;
1701 } 1847 }
1702 } 1848 }
1703 1849
1704 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1705 1851
1706 my $pos = 0; 1852 my $pos = 0;
1707 for (0 .. $#children) { 1853 for (0 .. $#children) {
1708 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1709 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1855 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1714 1 1860 1
1715} 1861}
1716 1862
1717############################################################################# 1863#############################################################################
1718 1864
1719package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1720 1866
1721our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1722 1868
1723sub new { 1869sub new {
1724 my $class = shift; 1870 my $class = shift;
1725 1871
1726 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1729 ) 1875 )
1730} 1876}
1731 1877
1732############################################################################# 1878#############################################################################
1733 1879
1734package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1735 1881
1736our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1737 1883
1738sub new { 1884sub new {
1739 my $class = shift; 1885 my $class = shift;
1740 1886
1741 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1744 ) 1890 )
1745} 1891}
1746 1892
1747############################################################################# 1893#############################################################################
1748 1894
1749package CFPlus::UI::Label; 1895package DC::UI::Label;
1750 1896
1751our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1752 1898
1753use CFPlus::OpenGL; 1899use DC::OpenGL;
1754 1900
1755sub new { 1901sub new {
1756 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1757 1903
1758 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1763 #text => initial text 1909 #text => initial text
1764 #markup => initial narkup 1910 #markup => initial narkup
1765 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1766 #style => 0, # render flags 1912 #style => 0, # render flags
1767 ellipsise => 3, # end 1913 ellipsise => 3, # end
1768 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1769 fontsize => 1, 1915 fontsize => 1,
1770 align => -1, 1916 align => 0.5,
1771 valign => -1, 1917 valign => 0.5,
1772 padding_x => 2, 1918 padding_x => 4,
1773 padding_y => 2, 1919 padding_y => 2,
1774 can_events => 0, 1920 can_events => 0,
1775 %arg 1921 %arg
1776 ); 1922 );
1777 1923
1778 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1779 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1780 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1781 $self->{template} = $layout; 1927 $self->{template} = $layout;
1782 } 1928 }
1783 1929
1784 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1802 1948
1803 delete $self->{ox}; 1949 delete $self->{ox};
1804 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1805} 1951}
1806 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1807sub set_text { 1959sub set_text {
1808 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1809 1961
1810 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1811 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
… …
1834 1986
1835sub size_request { 1987sub size_request {
1836 my ($self) = @_; 1988 my ($self) = @_;
1837 1989
1838 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1839 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1840 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1841 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1842 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1843 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1844 1998
1845 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1846 2000
1847 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1848 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
1849 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
1850 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1851 2005
1852 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1853 2007
1854 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
1910 2064
1911 [$self->{layout}->size] 2065 [$self->{layout}->size]
1912 }; 2066 };
1913 2067
1914 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
1915 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2069 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1916 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2070 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1917 : ($self->{w} - $size->[0]) * 0.5);
1918 2071
1919 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1920 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1921 : ($self->{h} - $size->[1]) * 0.5);
1922 }; 2073 };
1923 2074
1924 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2075# unless ($self->{list}) {
1925 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2076# $self->{list} = DC::OpenGL::glGenList;
1926 2077# DC::OpenGL::glNewList $self->{list};
1927 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2079# DC::OpenGL::glEndList;
2080# }
2081#
2082# DC::OpenGL::glCallList $self->{list};
2083
2084 $self->{layout}->draw;
1928} 2085}
2086
2087#sub destroy {
2088# my ($self) = @_;
2089#
2090# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2091#
2092# $self->SUPER::destroy;
2093#}
1929 2094
1930############################################################################# 2095#############################################################################
1931 2096
1932package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
1933 2098
1934our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
1935 2100
1936use CFPlus::OpenGL; 2101use DC::OpenGL;
1937 2102
1938sub new { 2103sub new {
1939 my $class = shift; 2104 my $class = shift;
1940 2105
1941 $class->SUPER::new ( 2106 $class->SUPER::new (
1942 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
1943 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
1944 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
1945 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
1946 can_hover => 1, 2113 can_hover => 1,
1947 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
1948 valign => 0, 2116 valign => 0.5,
1949 can_events => 1, 2117 can_events => 1,
1950 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
1951 #text => ... 2121 #text => ...
1952 #hidden => "*", 2122 #hidden => "*",
1953 @_ 2123 @_
1954 ) 2124 )
1955} 2125}
… …
2002 2172
2003 my $text = $self->get_text; 2173 my $text = $self->get_text;
2004 2174
2005 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2006 2176
2007 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2009 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2010 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2011 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2012 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2013 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2014 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2015 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2016 # what a hack 2186 # what a hack
2017 $self->{cursor} = 2187 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1 2189 ? length $1
2020 : 0; 2190 : 0;
2021 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2022 # uh, again 2192 # uh, again
2023 $self->{cursor} = 2193 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2025 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2026 : length $self->{text}; 2196 : length $self->{text};
… …
2090 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2091 } 2261 }
2092 2262
2093 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2094 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2095 glBegin GL_QUADS;
2096 glVertex 0 , 0;
2097 glVertex 0 , $self->{h};
2098 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2099 glVertex $self->{w}, 0;
2100 glEnd;
2101 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2102 2267
2103 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2104 2269
2105 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
2107 2272
2108 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
2109 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
2110 utf8::encode $text; 2275 utf8::encode $text;
2111 2276
2112 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2277 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2113 } 2278 }
2114 2279
2280 glColor_premultiply @{$self->{active_fg}};
2115 glBegin GL_LINES; 2281 glBegin GL_LINES;
2116 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2283 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2118 glEnd; 2284 glEnd;
2285
2286 glLineWidth 3;
2287 glColor @{$self->{active_outline}};
2288 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2289 glLineWidth 1;
2290
2291 } else {
2292 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2293 glBegin GL_LINE_STRIP;
2294 glVertex .5, $self->{h} * .5;
2295 glVertex .5, $self->{h} - 2.5;
2296 glVertex $self->{w} - .5, $self->{h} - 2.5;
2297 glVertex $self->{w} - .5, $self->{h} * .5;
2298 glEnd;
2119 } 2299 }
2120} 2300}
2121 2301
2122############################################################################# 2302#############################################################################
2123 2303
2124package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2125 2305
2126our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2127 2307
2128use CFPlus::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2129 2319
2130sub invoke_key_down { 2320sub invoke_key_down {
2131 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2132 2322
2133 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2139 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2140 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2141 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2142 $self->update; 2332 $self->update;
2143 2333
2144 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2145 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2146 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2147 } 2337 }
2148 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2149 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2151 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2152 } 2342 }
2153 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2154 } 2344 }
2155 2345
2156 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2157 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2159 2349
2160 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2161 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2162 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2163 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2164 } 2357 }
2165 2358
2166 } else { 2359 } else {
2167 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2168 } 2361 }
… …
2170 1 2363 1
2171} 2364}
2172 2365
2173############################################################################# 2366#############################################################################
2174 2367
2175package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2176 2369
2177our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2178 2371
2179use CFPlus::OpenGL; 2372use DC::OpenGL;
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 padding_y => 4,
2379
2380 @_
2381 )
2382}
2180 2383
2181sub move_cursor_ver { 2384sub move_cursor_ver {
2182 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2183 2386
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185 2388
2186 $y += $dy; 2389 $line += $dy;
2187 2390
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2391 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2189 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2190 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2191 $self->update; 2394 $self->update;
2192 return; 2395 return;
2193 } 2396 }
… …
2196sub invoke_key_down { 2399sub invoke_key_down {
2197 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2198 2401
2199 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2200 2403
2201 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2202 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2205 } else { 2408 } else {
2206 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2207 } 2410 }
2208 2411
2209 1 2412 1
2210} 2413}
2211 2414
2212############################################################################# 2415#############################################################################
2213 2416
2214package CFPlus::UI::Button; 2417package DC::UI::ButtonBin;
2215 2418
2216our @ISA = CFPlus::UI::Label::; 2419our @ISA = DC::UI::Bin::;
2217 2420
2218use CFPlus::OpenGL; 2421use DC::OpenGL;
2219 2422
2220my @tex = 2423my @tex =
2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2222 qw(b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2223 2426
2224sub new { 2427sub new {
2225 my $class = shift; 2428 my $class = shift;
2226 2429
2227 $class->SUPER::new ( 2430 $class->SUPER::new (
2228 padding_x => 4,
2229 padding_y => 4,
2230 fg => [1, 1, 1],
2231 active_fg => [0, 0, 1],
2232 can_hover => 1, 2431 can_hover => 1,
2233 align => 0, 2432 align => 0.5,
2234 valign => 0, 2433 valign => 0.5,
2235 can_events => 1, 2434 can_events => 1,
2236 @_ 2435 @_
2237 ) 2436 )
2238} 2437}
2239 2438
… …
2248} 2447}
2249 2448
2250sub _draw { 2449sub _draw {
2251 my ($self) = @_; 2450 my ($self) = @_;
2252 2451
2253 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2254
2255 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2257 glColor 0, 0, 0, 1; 2454 glColor 0, 0, 0, 1;
2258 2455
2456 my $tex = $tex[$GRAB == $self];
2259 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2260 2458
2261 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
2262 2460
2263 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2264} 2462}
2265 2463
2266############################################################################# 2464#############################################################################
2267 2465
2268package CFPlus::UI::CheckBox; 2466package DC::UI::Button;
2269 2467
2270our @ISA = CFPlus::UI::DrawBG::; 2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
2271 2471
2272my @tex = 2472my @tex =
2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2274 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2474 qw(b1_button_inactive.png b1_button_active.png);
2275
2276use CFPlus::OpenGL;
2277 2475
2278sub new { 2476sub new {
2279 my $class = shift; 2477 my $class = shift;
2280 2478
2281 $class->SUPER::new ( 2479 $class->SUPER::new (
2480 padding_x => 8,
2481 padding_y => 4,
2482 fg => [1.0, 1.0, 1.0],
2483 active_fg => [0.8, 0.8, 0.8],
2484 can_hover => 1,
2485 align => 0.5,
2486 valign => 0.5,
2487 can_events => 1,
2488 @_
2489 )
2490}
2491
2492sub invoke_button_up {
2493 my ($self, $ev, $x, $y) = @_;
2494
2495 $self->emit ("activate")
2496 if $x >= 0 && $x < $self->{w}
2497 && $y >= 0 && $y < $self->{h};
2498
2499 1
2500}
2501
2502sub _draw {
2503 my ($self) = @_;
2504
2505 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2506
2507 glEnable GL_TEXTURE_2D;
2508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2509 glColor 0, 0, 0, 1;
2510
2511 my $tex = $tex[$GRAB == $self];
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513
2514 glDisable GL_TEXTURE_2D;
2515
2516 $self->SUPER::_draw;
2517}
2518
2519#############################################################################
2520
2521package DC::UI::CheckBox;
2522
2523our @ISA = DC::UI::DrawBG::;
2524
2525my @tex =
2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2528
2529use DC::OpenGL;
2530
2531sub new {
2532 my $class = shift;
2533
2534 $class->SUPER::new (
2535 fontsize => 1,
2282 padding_x => 2, 2536 padding_x => 2,
2283 padding_y => 2, 2537 padding_y => 2,
2284 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2285 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2286 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2292} 2546}
2293 2547
2294sub size_request { 2548sub size_request {
2295 my ($self) = @_; 2549 my ($self) = @_;
2296 2550
2297 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2298} 2552}
2299 2553
2300sub toggle { 2554sub toggle {
2301 my ($self) = @_; 2555 my ($self) = @_;
2302 2556
… …
2321sub _draw { 2575sub _draw {
2322 my ($self) = @_; 2576 my ($self) = @_;
2323 2577
2324 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2325 2579
2326 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2327 2581
2328 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2329 2583
2330 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2584 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2331 2585
… …
2338 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2339} 2593}
2340 2594
2341############################################################################# 2595#############################################################################
2342 2596
2343package CFPlus::UI::Image; 2597package DC::UI::Image;
2344 2598
2345our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2346 2600
2347use CFPlus::OpenGL; 2601use DC::OpenGL;
2348 2602
2349our %texture_cache; 2603our %texture_cache;
2350 2604
2351sub new { 2605sub new {
2352 my $class = shift; 2606 my $class = shift;
2353 2607
2354 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2355 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2356 @_, 2611 @_,
2357 ); 2612 );
2358 2613
2359 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2360 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2361 2616
2362 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2364 2619
2365 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2366 2621
2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2368 2623
2369 $self 2624 $self
2370} 2625}
2371 2626
2372sub STORABLE_freeze { 2627sub STORABLE_freeze {
2373 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2374 2629
2375 $self->{path} 2630 $self->{path}
2376 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2377 2632
2378 $self->{path} 2633 $self->{path}
2379} 2634}
2380 2635
2381sub STORABLE_attach { 2636sub STORABLE_attach {
2382 my ($self, $cloning, $path) = @_; 2637 my ($self, $cloning, $path) = @_;
2383 2638
2384 $self->new (path => $path) 2639 $self->new (path => $path)
2385} 2640}
2386 2641
2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2647}
2648
2387sub size_request { 2649sub size_request {
2388 my ($self) = @_; 2650 my ($self) = @_;
2389 2651
2390 ($self->{tex}{w}, $self->{tex}{h}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2391} 2653}
2392 2654
2393sub _draw { 2655sub _draw {
2394 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2395 2659
2396 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2397 2661
2398 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2399 2663
… …
2405 } 2669 }
2406 2670
2407 glEnable GL_TEXTURE_2D; 2671 glEnable GL_TEXTURE_2D;
2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409 2673
2410 $tex->draw_quad (0, 0, $w, $h); 2674 $tex->draw_quad_alpha (0, 0, $w, $h);
2411 2675
2412 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2413} 2677}
2414 2678
2415############################################################################# 2679#############################################################################
2416 2680
2417package CFPlus::UI::ImageButton; 2681package DC::UI::ImageButton;
2418 2682
2419our @ISA = CFPlus::UI::Image::; 2683our @ISA = DC::UI::Image::;
2420 2684
2421use CFPlus::OpenGL; 2685use DC::OpenGL;
2422
2423my %textures;
2424 2686
2425sub new { 2687sub new {
2426 my $class = shift; 2688 my $class = shift;
2427 2689
2428 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2429 padding_x => 4, 2691 padding_x => 4,
2430 padding_y => 4, 2692 padding_y => 4,
2431 fg => [1, 1, 1], 2693 fg => [1, 1, 1],
2432 active_fg => [0, 0, 1], 2694 active_fg => [0, 0, 1],
2433 can_hover => 1, 2695 can_hover => 1,
2434 align => 0, 2696 align => 0.5,
2435 valign => 0, 2697 valign => 0.5,
2436 can_events => 1, 2698 can_events => 1,
2437 @_ 2699 @_
2438 ); 2700 );
2439} 2701}
2440 2702
2703sub invoke_button_down {
2704 my ($self, $ev, $x, $y) = @_;
2705
2706 1
2707}
2708
2441sub invoke_button_up { 2709sub invoke_button_up {
2442 my ($self, $ev, $x, $y) = @_; 2710 my ($self, $ev, $x, $y) = @_;
2443 2711
2444 $self->emit ("activate") 2712 $self->emit ("activate")
2445 if $x >= 0 && $x < $self->{w} 2713 if $x >= 0 && $x < $self->{w}
… …
2448 1 2716 1
2449} 2717}
2450 2718
2451############################################################################# 2719#############################################################################
2452 2720
2453package CFPlus::UI::VGauge; 2721package DC::UI::VGauge;
2454 2722
2455our @ISA = CFPlus::UI::Base::; 2723our @ISA = DC::UI::Base::;
2456 2724
2457use List::Util qw(min max); 2725use List::Util qw(min max);
2458 2726
2459use CFPlus::OpenGL; 2727use DC::OpenGL;
2460 2728
2461my %tex = ( 2729my %tex = (
2462 food => [ 2730 food => [
2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2465 ], 2733 ],
2466 grace => [ 2734 grace => [
2467 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2468 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2736 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2469 ], 2737 ],
2470 hp => [ 2738 hp => [
2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2473 ], 2741 ],
2474 mana => [ 2742 mana => [
2475 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2476 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2744 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2477 ], 2745 ],
2478); 2746);
2479 2747
2480# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2583 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2584} 2852}
2585 2853
2586############################################################################# 2854#############################################################################
2587 2855
2856package DC::UI::Progress;
2857
2858our @ISA = DC::UI::Label::;
2859
2860use DC::OpenGL;
2861
2862sub new {
2863 my ($class, %arg) = @_;
2864
2865 my $self = $class->SUPER::new (
2866 padding_x => 2,
2867 padding_y => 2,
2868 fg => [1, 1, 1],
2869 bg => [0, 0, 1, 0.2],
2870 bar => [0.7, 0.5, 0.1, 0.8],
2871 outline => [0.4, 0.3, 0],
2872 fontsize => 0.9,
2873 valign => 0.5,
2874 align => 0.5,
2875 can_events => 1,
2876 ellipsise => 1,
2877 label => "%d%%",
2878 %arg,
2879 );
2880
2881 $self->set_value ($arg{value} || -1);
2882
2883 $self
2884}
2885
2886sub set_label {
2887 my ($self, $label) = @_;
2888
2889 return if $self->{label} eq $label;
2890 $self->{label} = $label;
2891
2892 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2893}
2894
2895sub set_value {
2896 my ($self, $value) = @_;
2897
2898 if ($self->{value} ne $value) {
2899 $self->{value} = $value;
2900
2901 if ($value < 0) {
2902 $self->set_text ("-");
2903 } else {
2904 $self->set_text (sprintf $self->{label}, $value * 100);
2905 }
2906
2907 $self->update;
2908 }
2909}
2910
2911sub _draw {
2912 my ($self) = @_;
2913
2914 glEnable GL_BLEND;
2915 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2916
2917 my $px = $self->{padding_x};
2918 my $py = $self->{padding_y};
2919
2920 if ($self->{value} >= 0) {
2921 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2922
2923 glColor_premultiply @{$self->{bar}};
2924 glRect $px, $py, $s, $self->{h} - $py;
2925 glColor_premultiply @{$self->{bg}};
2926 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2927 }
2928
2929 glColor_premultiply @{$self->{outline}};
2930
2931 $px -= .5;
2932 $py -= .5;
2933
2934 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2935
2936 glDisable GL_BLEND;
2937
2938 {
2939 local $self->{bg}; # do not draw background
2940 $self->SUPER::_draw;
2941 }
2942}
2943
2944#############################################################################
2945
2946package DC::UI::ExperienceProgress;
2947
2948our @ISA = DC::UI::Progress::;
2949
2950sub new {
2951 my ($class, %arg) = @_;
2952
2953 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2954
2955 my $self = $class->SUPER::new (
2956 %arg,
2957 tooltip => sub {
2958 my ($self) = @_;
2959
2960 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2961 $tt,
2962 $self->{lvl},
2963 ::formsep ($self->{exp}),
2964 ::formsep ($self->{nxt}),
2965 ::formsep ($self->{nxt} - $self->{exp}),
2966 $self->_percent * 100,
2967 },
2968 );
2969
2970 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2971 if $::CONN;
2972
2973 $self
2974}
2975
2976sub DESTROY {
2977 my ($self) = @_;
2978
2979 delete $::CONN->{on_exp_update}{$self+0}
2980 if $::CONN;
2981
2982 $self->SUPER::DESTROY;
2983}
2984
2985sub _percent {
2986 my ($self) = @_;
2987
2988 my $table = $::CONN && $::CONN->{exp_table}
2989 or return -1;
2990
2991 my $l0 = $table->[$self->{lvl} - 1];
2992 my $l1 = $table->[$self->{lvl}];
2993
2994 $self->{nxt} = $l1;
2995
2996 ($self->{exp} - $l0) / ($l1 - $l0)
2997}
2998
2999sub set_value {
3000 my ($self, $lvl, $exp) = @_;
3001
3002 $self->{lvl} = $lvl;
3003 $self->{exp} = $exp;
3004
3005 $self->SUPER::set_value ($self->_percent);
3006}
3007
3008#############################################################################
3009
2588package CFPlus::UI::Gauge; 3010package DC::UI::Gauge;
2589 3011
2590our @ISA = CFPlus::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2591 3013
2592sub new { 3014sub new {
2593 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2594 3016
2595 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2597 can_hover => 1, 3019 can_hover => 1,
2598 can_events => 1, 3020 can_events => 1,
2599 %arg, 3021 %arg,
2600 ); 3022 );
2601 3023
2602 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3024 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2603 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3025 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2604 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3026 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2605 3027
2606 $self 3028 $self
2607} 3029}
2608 3030
2609sub set_fontsize { 3031sub set_fontsize {
… …
2630 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2631} 3053}
2632 3054
2633############################################################################# 3055#############################################################################
2634 3056
2635package CFPlus::UI::Slider; 3057package DC::UI::Slider;
2636 3058
2637use strict; 3059use common::sense;
2638 3060
2639use CFPlus::OpenGL; 3061use DC::OpenGL;
2640 3062
2641our @ISA = CFPlus::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2642 3064
2643my @tex = 3065my @tex =
2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2645 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2646 3068
2647sub new { 3069sub new {
2648 my $class = shift; 3070 my $class = shift;
2649 3071
… …
2686sub set_value { 3108sub set_value {
2687 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2688 3110
2689 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2690 3112
2691 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2692 3114
2693 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2694
2695 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2696 $value = $hi - $page if $value > $hi - $page;
2697 3117
2698 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2699 if $unit; 3119 if $unit;
2700 3120
2701 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2717 3137
2718 $self->SUPER::invoke_button_down ($ev, $x, $y); 3138 $self->SUPER::invoke_button_down ($ev, $x, $y);
2719 3139
2720 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3140 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2721 3141
2722 $self->invoke_mouse_motion ($ev, $x, $y) 3142 $self->invoke_mouse_motion ($ev, $x, $y);
3143
3144 1
2723} 3145}
2724 3146
2725sub invoke_mouse_motion { 3147sub invoke_mouse_motion {
2726 my ($self, $ev, $x, $y) = @_; 3148 my ($self, $ev, $x, $y) = @_;
2727 3149
2728 if ($GRAB == $self) { 3150 if ($GRAB == $self) {
2729 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3151 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2730 3152
2731 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3153 my (undef, $lo, $hi, $page) = @{$self->{range}};
2732 3154
2733 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3155 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2734 3156
2735 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3157 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2736 } else { 3158 } else {
2737 return 0; 3159 return 0;
2738 } 3160 }
… …
2743sub invoke_mouse_wheel { 3165sub invoke_mouse_wheel {
2744 my ($self, $ev) = @_; 3166 my ($self, $ev) = @_;
2745 3167
2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3168 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2747 3169
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3170 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2749 3171
2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3172 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751 3173
2752 ! ! $delta 3174 1
2753} 3175}
2754 3176
2755sub update { 3177sub update {
2756 my ($self) = @_; 3178 my ($self) = @_;
2757 3179
… …
2763 my ($self) = @_; 3185 my ($self) = @_;
2764 3186
2765 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
2766 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2767 3189
2768 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2769 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2770 3192
2771 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3193 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2772 3194
2773 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3195 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2774 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2775 3197
2776 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
… …
2806 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
2807} 3229}
2808 3230
2809############################################################################# 3231#############################################################################
2810 3232
2811package CFPlus::UI::ValSlider; 3233package DC::UI::ValSlider;
2812 3234
2813our @ISA = CFPlus::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
2814 3236
2815sub new { 3237sub new {
2816 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
2817 3239
2818 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
2819 3241
2820 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2823 to_value => sub { shift }, 3245 to_value => sub { shift },
2824 from_value => sub { shift }, 3246 from_value => sub { shift },
2825 %arg, 3247 %arg,
2826 ); 3248 );
2827 3249
… …
2847sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
2848sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
2849 3271
2850############################################################################# 3272#############################################################################
2851 3273
2852package CFPlus::UI::TextScroller; 3274package DC::UI::TextScroller;
2853 3275
2854our @ISA = CFPlus::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
2855 3277
2856use CFPlus::OpenGL; 3278use DC::OpenGL;
2857 3279
2858sub new { 3280sub new {
2859 my $class = shift; 3281 my $class = shift;
2860 3282
2861 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
… …
2863 can_events => 1, 3285 can_events => 1,
2864 indent => 0, 3286 indent => 0,
2865 #font => default_font 3287 #font => default_font
2866 @_, 3288 @_,
2867 3289
2868 layout => (new CFPlus::Layout), 3290 layout => (new DC::Layout),
2869 par => [], 3291 par => [],
2870 max_par => 0, 3292 max_par => 0,
2871 height => 0, 3293 height => 0,
2872 children => [ 3294 children => [
2873 (new CFPlus::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
2874 (new CFPlus::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
2875 ], 3297 ],
2876 ); 3298 );
2877 3299
2878 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
2879 3301
… …
2888} 3310}
2889 3311
2890sub size_request { 3312sub size_request {
2891 my ($self) = @_; 3313 my ($self) = @_;
2892 3314
2893 my ($empty, $slider) = @{ $self->{children} }; 3315 my ($empty, $slider) = $self->visible_children;
2894 3316
2895 local $self->{children} = [$empty, $slider]; 3317 local $self->{children} = [$empty, $slider];
2896 $self->SUPER::size_request 3318 $self->SUPER::size_request
2897} 3319}
2898 3320
… …
2935 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2936 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
2937 3359
2938 $layout->set_shapes ( 3360 $layout->set_shapes (
2939 map 3361 map
2940 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2941 @{$para->{widget}} 3363 @{$para->{widget}}
2942 ); 3364 );
2943 3365
2944 $layout 3366 $layout
2945} 3367}
… …
3062 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate; 3485 $self->force_uptodate;
3064 3486
3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3066 3488
3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3068 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
3069 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
3070 3492
3071 package CFPlus::UI::Base; 3493 package DC::UI::Base;
3072 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3494 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3073 (0, 0, $self->{w}, $self->{h}); 3495 (0, 0, $self->{w}, $self->{h});
3074 3496
3075 my $top = int $self->{children}[1]{range}[0]; 3497 my $top = int $self->{children}[1]{range}[0];
3076 3498
… …
3087 3509
3088 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
3089 my $layout = $self->get_layout ($para); 3511 my $layout = $self->get_layout ($para);
3090 3512
3091 $layout->render ($para->{indent}, $y - $y0); 3513 $layout->render ($para->{indent}, $y - $y0);
3514 $layout->draw;
3092 3515
3093 if (my @w = @{ $para->{widget} }) { 3516 if (my @w = @{ $para->{widget} }) {
3094 my @s = $layout->get_shapes; 3517 my @s = $layout->get_shapes;
3095 3518
3096 for (@w) { 3519 for (@w) {
… …
3134 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
3135} 3558}
3136 3559
3137############################################################################# 3560#############################################################################
3138 3561
3139package CFPlus::UI::Animator; 3562package DC::UI::Animator;
3140 3563
3141use CFPlus::OpenGL; 3564use DC::OpenGL;
3142 3565
3143our @ISA = CFPlus::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
3144 3567
3145sub moveto { 3568sub moveto {
3146 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
3147 3570
3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3176 glPopMatrix; 3599 glPopMatrix;
3177} 3600}
3178 3601
3179############################################################################# 3602#############################################################################
3180 3603
3181package CFPlus::UI::Flopper; 3604package DC::UI::Flopper;
3182 3605
3183our @ISA = CFPlus::UI::Button::; 3606our @ISA = DC::UI::Button::;
3184 3607
3185sub new { 3608sub new {
3186 my $class = shift; 3609 my $class = shift;
3187 3610
3188 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
… …
3200 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
3201} 3624}
3202 3625
3203############################################################################# 3626#############################################################################
3204 3627
3205package CFPlus::UI::Tooltip; 3628package DC::UI::Tooltip;
3206 3629
3207our @ISA = CFPlus::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
3208 3631
3209use CFPlus::OpenGL; 3632use DC::OpenGL;
3210 3633
3211sub new { 3634sub new {
3212 my $class = shift; 3635 my $class = shift;
3213 3636
3214 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
3218} 3641}
3219 3642
3220sub set_tooltip_from { 3643sub set_tooltip_from {
3221 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
3222 3645
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
3225
3226 my $tooltip = $widget->{tooltip}; 3646 my $tip = $widget->{tooltip};
3647 $tip = $tip->($widget) if "CODE" eq ref $tip;
3648
3649 $tip = DC::Pod::section_label tooltip => $1
3650 if $tip =~ /^#(.*)$/;
3227 3651
3228 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
3229 $tooltip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
3230 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3231 . "req $widget->{req_w} $widget->{req_h}\n" 3655 . "req $widget->{req_w} $widget->{req_h}\n"
3232 . "visible $widget->{visible}"; 3656 . "visible $widget->{visible}";
3233 } 3657 }
3234 3658
3235 $tooltip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
3236 $tooltip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
3237 3661
3238 $self->add (new CFPlus::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
3239 markup => $tooltip, 3664 markup => $tip,
3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
3241 fontsize => 0.8, 3667 fontsize => 0.8,
3242 style => 1, # FLAG_INVERSE 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3243 ellipsise => 0, 3669 ellipsise => 0,
3244 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
3245 ); 3671 );
3246} 3672}
3247 3673
… …
3282} 3708}
3283 3709
3284sub _draw { 3710sub _draw {
3285 my ($self) = @_; 3711 my ($self) = @_;
3286 3712
3287 glTranslate 0.375, 0.375;
3288
3289 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
3290 3714
3291 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
3292 glBegin GL_QUADS; 3716 glRect 0, 0, $w, $h;
3293 glVertex 0 , 0;
3294 glVertex 0 , $h;
3295 glVertex $w, $h;
3296 glVertex $w, 0;
3297 glEnd;
3298 3717
3299 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
3300 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
3301 glVertex 0 , 0;
3302 glVertex 0 , $h;
3303 glVertex $w, $h;
3304 glVertex $w, 0;
3305 glEnd;
3306 3720
3307 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
3308 3722
3309 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
3310} 3724}
3311 3725
3312############################################################################# 3726#############################################################################
3313 3727
3314package CFPlus::UI::Face; 3728package DC::UI::Face;
3315 3729
3316our @ISA = CFPlus::UI::DrawBG::; 3730our @ISA = DC::UI::DrawBG::;
3317 3731
3318use CFPlus::OpenGL; 3732use DC::OpenGL;
3319 3733
3320sub new { 3734sub new {
3321 my $class = shift; 3735 my $class = shift;
3322 3736
3323 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
3738 size_w => 32,
3739 size_h => 8,
3324 aspect => 1, 3740 aspect => 1,
3325 can_events => 0, 3741 can_events => 0,
3326 @_, 3742 @_,
3327 ); 3743 );
3328 3744
3329 if ($self->{anim} && $self->{animspeed}) { 3745 $self->update_anim;
3330 CFPlus::weaken (my $widget = $self);
3331
3332 $self->{timer} = Event->timer (
3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3334 hard => 1,
3335 interval => $self->{animspeed},
3336 cb => sub {
3337 ++$widget->{frame};
3338 $widget->update;
3339 },
3340 );
3341 }
3342 3746
3343 $self 3747 $self
3344} 3748}
3345 3749
3750sub update_timer {
3751 my ($self) = @_;
3752
3753 return unless $self->{timer};
3754
3755 if ($self->{visible}) {
3756 $self->{timer}->start;
3757 } else {
3758 $self->{timer}->stop;
3759 }
3760}
3761
3762sub update_face {
3763 my ($self) = @_;
3764
3765 if ($::CONN) {
3766 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3767 if ($anim && @$anim) {
3768 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3769 delete $self->{face_change_cb};
3770
3771 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3772 unless ($tex->{name} || $tex->{loading}) {
3773 $tex->upload (sub { $self->reconfigure });
3774 }
3775 }
3776 }
3777 }
3778 }
3779}
3780
3781sub update_anim {
3782 my ($self) = @_;
3783
3784 if ($self->{anim} && $self->{animspeed}) {
3785 DC::weaken (my $widget = $self);
3786
3787 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3788 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3789 return unless $::CONN;
3790
3791 my $w = $widget
3792 or return;
3793
3794 ++$w->{frame};
3795 $w->update_face;
3796
3797 # somehow, $widget can go away
3798 $w->update;
3799 $w->update_timer;
3800 };
3801
3802 $self->update_face;
3803 $self->update_timer;
3804 } else {
3805 delete $self->{timer};
3806 }
3807}
3808
3346sub size_request { 3809sub size_request {
3347 (32, 8) 3810 my ($self) = @_;
3811
3812 if ($::CONN) {
3813 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3814 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3815 if ($tex->{name}) {
3816 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3817 } elsif (!$tex->{loading}) {
3818 $tex->upload (sub { $self->reconfigure });
3819 }
3820 }
3821
3822 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3823 }
3824 }
3825
3826 ($self->{size_w} || 8, $self->{size_h} || 8)
3348} 3827}
3349 3828
3350sub update { 3829sub update {
3351 my ($self) = @_; 3830 my ($self) = @_;
3352 3831
3353 return unless $self->{visible}; 3832 return unless $self->{visible};
3354 3833
3355 $self->SUPER::update; 3834 $self->SUPER::update;
3356} 3835}
3357 3836
3837sub set_face {
3838 my ($self, $face) = @_;
3839
3840 $self->{face} = $face;
3841 $self->reconfigure;
3842}
3843
3844sub set_anim {
3845 my ($self, $anim) = @_;
3846
3847 $self->{anim} = $anim;
3848 $self->update_anim;
3849}
3850
3851sub set_animspeed {
3852 my ($self, $animspeed) = @_;
3853
3854 $self->{animspeed} = $animspeed;
3855 $self->update_anim;
3856}
3857
3858sub invoke_visibility_change {
3859 my ($self) = @_;
3860
3861 $self->update_timer;
3862
3863 0
3864}
3865
3358sub _draw { 3866sub _draw {
3359 my ($self) = @_; 3867 my ($self) = @_;
3360 3868
3361 return unless $::CONN;
3362
3363 $self->SUPER::_draw; 3869 $self->SUPER::_draw;
3364 3870
3365 my $face; 3871 if (my $tex = $self->{tex}) {
3366
3367 if ($self->{frame}) {
3368 my $anim = $::CONN->{anim}[$self->{anim}];
3369
3370 $face = $anim->[ $self->{frame} % @$anim ]
3371 if $anim && @$anim;
3372 }
3373
3374 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3375
3376 if ($tex) {
3377 glEnable GL_TEXTURE_2D; 3872 glEnable GL_TEXTURE_2D;
3378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3379 glColor 0, 0, 0, 1; 3874 glColor 0, 0, 0, 1;
3380 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3381 glDisable GL_TEXTURE_2D; 3876 glDisable GL_TEXTURE_2D;
… …
3383} 3878}
3384 3879
3385sub destroy { 3880sub destroy {
3386 my ($self) = @_; 3881 my ($self) = @_;
3387 3882
3388 $self->{timer}->cancel 3883 (delete $self->{timer})->cancel
3389 if $self->{timer}; 3884 if $self->{timer};
3390 3885
3391 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3392} 3887}
3393 3888
3394############################################################################# 3889#############################################################################
3395 3890
3396package CFPlus::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3397 3892
3398our @ISA = CFPlus::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3399 3894
3400# TODO: should actually wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3401 3896
3402############################################################################# 3897#############################################################################
3403 3898
3404package CFPlus::UI::Menu; 3899package DC::UI::Menu;
3405 3900
3406our @ISA = CFPlus::UI::Toplevel::; 3901our @ISA = DC::UI::Toplevel::;
3407 3902
3408use CFPlus::OpenGL; 3903use DC::OpenGL;
3409 3904
3410sub new { 3905sub new {
3411 my $class = shift; 3906 my $class = shift;
3412 3907
3413 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3414 items => [], 3909 items => [],
3415 z => 100, 3910 z => 100,
3416 @_, 3911 @_,
3417 ); 3912 );
3418 3913
3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3420 3915
3421 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3422 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3423 3918
3424 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3425 if (!ref $widget) { 3920 if (!ref $widget) {
3426 if ($widget =~ /\t/) { 3921 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2; 3922 my ($left, $right) = split /\t/, $widget, 2;
3428 3923
3429 $widget = new CFPlus::UI::HBox 3924 $widget = new DC::UI::HBox
3430 can_hover => 1, 3925 can_hover => 1,
3431 can_events => 1, 3926 can_events => 1,
3432 tooltip => $tooltip, 3927 tooltip => $tooltip,
3433 children => [ 3928 children => [
3434 (new CFPlus::UI::Label markup => $left, expand => 1), 3929 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3435 (new CFPlus::UI::Label markup => $right, align => +1), 3930 (new DC::UI::Label markup => $right, align => 1),
3436 ], 3931 ],
3437 ; 3932 ;
3438 3933
3439 } else { 3934 } else {
3440 $widget = new CFPlus::UI::Label 3935 $widget = new DC::UI::Label
3441 can_hover => 1, 3936 can_hover => 1,
3442 can_events => 1, 3937 can_events => 1,
3938 align => 0,
3443 markup => $widget, 3939 markup => $widget,
3444 tooltip => $tooltip; 3940 tooltip => $tooltip;
3445 } 3941 }
3446 } 3942 }
3447 3943
… …
3462 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3463 $GRAB = $self; 3959 $GRAB = $self;
3464 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3465 3961
3466 $self->show; 3962 $self->show;
3467 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3963
3964 my $x = $ev->{x};
3965 my $y = $ev->{y};
3966
3967 $self->{root}->on_post_alloc ($self => sub {
3968 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3969 });
3970
3971 1 # so it can be used inside event handlers
3468} 3972}
3469 3973
3470sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3471 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3472 3976
… …
3493 1 3997 1
3494} 3998}
3495 3999
3496############################################################################# 4000#############################################################################
3497 4001
3498package CFPlus::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3499 4003
3500our @ISA = CFPlus::UI::Container::; 4004our @ISA = DC::UI::Container::;
3501 4005
3502sub new { 4006sub new {
3503 my $class = shift; 4007 my $class = shift;
3504 4008
3505 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3506 @_, 4010 @_,
3507 ); 4011 );
3508 4012
3509 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3510 if @{ $self->{children} };
3511 4014
3512 $self 4015 $self
3513} 4016}
3514 4017
3515sub add { 4018sub add {
3516 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3517 4020
3518 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3519 4022
3520 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3521 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
3522} 4025}
3523 4026
3524sub get_current_page { 4027sub get_current_page {
3525 my ($self) = @_; 4028 my ($self) = @_;
3526 4029
… …
3532 4035
3533 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3534 ? $page_or_widget 4037 ? $page_or_widget
3535 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3536 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3537 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3538 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3539 4045
3540 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3541 4048
3542 $self->realloc; 4049 $self->realloc;
3543} 4050}
3544 4051
3545sub visible_children { 4052sub visible_children {
3546 $_[0]{current} 4053 $_[0]{current} || ()
3547} 4054}
3548 4055
3549sub size_request { 4056sub size_request {
3550 my ($self) = @_; 4057 my ($self) = @_;
3551 4058
4059 $self->{current}
3552 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3553} 4062}
3554 4063
3555sub invoke_size_allocate { 4064sub invoke_size_allocate {
3556 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3557 4066
3558 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3559 4069
3560 1 4070 1
3561} 4071}
3562 4072
3563sub _draw { 4073sub _draw {
3564 my ($self) = @_; 4074 my ($self) = @_;
3565 4075
3566 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3567} 4078}
3568 4079
3569############################################################################# 4080#############################################################################
3570 4081
3571package CFPlus::UI::Notebook; 4082package DC::UI::Notebook;
3572 4083
4084use DC::OpenGL;
4085
3573our @ISA = CFPlus::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3574 4087
3575sub new { 4088sub new {
3576 my $class = shift; 4089 my $class = shift;
3577 4090
3578 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3579 buttonbar => (new CFPlus::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
4094 active_outline => [.7, .7, 0.2],
3581 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3582 @_, 4096 @_,
3583 ); 4097 );
3584 4098
3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4099 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3586 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4100 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3587 4101
4102 {
4103 Scalar::Util::weaken (my $wself = $self);
4104
4105 $self->{multiplexer}->connect (c_add => sub {
4106 my ($mplex, $widgets) = @_;
4107
4108 for my $child (@$widgets) {
4109 Scalar::Util::weaken $child;
4110 $child->{c_tab_} ||= do {
4111 my $tab =
4112 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4113 ? $child->{c_tab}
4114 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4115
4116 $tab->connect (activate => sub {
4117 $wself->set_current_page ($child);
4118 });
4119
4120 $tab
4121 };
4122
4123 $self->{buttonbar}->add ($child->{c_tab_});
4124 }
4125 });
4126
4127 $self->{multiplexer}->connect (c_remove => sub {
4128 my ($mplex, $widgets) = @_;
4129
4130 for my $child (@$widgets) {
4131 $wself->{buttonbar}->remove ($child->{c_tab_});
4132 }
4133 });
4134 }
4135
3588 $self 4136 $self
3589} 4137}
3590 4138
3591sub add { 4139sub add {
4140 my ($self, @widgets) = @_;
4141
4142 $self->{multiplexer}->add (@widgets)
4143}
4144
4145sub remove {
4146 my ($self, @widgets) = @_;
4147
4148 $self->{multiplexer}->remove (@widgets)
4149}
4150
4151sub pages {
4152 my ($self) = @_;
4153 $self->{multiplexer}->children
4154}
4155
4156sub page_index {
4157 my ($self, $widget) = @_;
4158
4159 my $i = 0;
4160 for ($self->pages) {
4161 if ($_ eq $widget) { return $i };
4162 $i++;
4163 }
4164
4165 undef
4166}
4167
4168sub add_tab {
3592 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
3593 4170
3594 CFPlus::weaken $self; 4171 $title = [$title, $tooltip] unless ref $title;
4172 $widget->{c_tab} = $title;
3595 4173
3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3597 markup => $title,
3598 tooltip => $tooltip,
3599 on_activate => sub { $self->set_current_page ($widget) },
3600 );
3601
3602 $self->{multiplexer}->add ($widget); 4174 $self->add ($widget);
3603} 4175}
3604 4176
3605sub get_current_page { 4177sub get_current_page {
3606 my ($self) = @_; 4178 my ($self) = @_;
3607 4179
… …
3613 4185
3614 $self->{multiplexer}->set_current_page ($page); 4186 $self->{multiplexer}->set_current_page ($page);
3615 $self->emit (page_changed => $self->{multiplexer}{current}); 4187 $self->emit (page_changed => $self->{multiplexer}{current});
3616} 4188}
3617 4189
4190sub _draw {
4191 my ($self) = @_;
4192
4193 $self->SUPER::_draw ();
4194
4195 if (my $cur = $self->{multiplexer}{current}) {
4196 if ($cur = $cur->{c_tab_}) {
4197 glTranslate $self->{buttonbar}{x} + $cur->{x},
4198 $self->{buttonbar}{y} + $cur->{y};
4199 glLineWidth 3;
4200 #glEnable GL_BLEND;
4201 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4202 glColor @{$self->{active_outline}};
4203 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4204 glLineWidth 1;
4205 #glDisable GL_BLEND;
4206 }
4207 }
4208}
4209
3618############################################################################# 4210#############################################################################
3619 4211
3620package CFPlus::UI::Selector; 4212package DC::UI::Selector;
3621 4213
3622use utf8; 4214use utf8;
3623 4215
3624our @ISA = CFPlus::UI::Button::; 4216our @ISA = DC::UI::Button::;
3625 4217
3626sub new { 4218sub new {
3627 my $class = shift; 4219 my $class = shift;
3628 4220
3629 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
… …
3646 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
3647 4239
3648 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3649 } 4241 }
3650 4242
3651 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3652} 4244}
3653 4245
3654sub _set_value { 4246sub _set_value {
3655 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
3656 4248
3657 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4249 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4250 $item ||= $self->{options}[0]
3658 or return; 4251 or return;
3659 4252
3660 $self->{value} = $item->[0]; 4253 $self->{value} = $item->[0];
3661 $self->set_markup ("$item->[1] ⇓"); 4254 $self->set_markup ("$item->[1] ⇓");
3662 $self->set_tooltip ($item->[2]); 4255# $self->set_tooltip ($item->[2]);
3663} 4256}
3664 4257
3665sub set_value { 4258sub set_value {
3666 my ($self, $value) = @_; 4259 my ($self, $value) = @_;
3667 4260
… …
3669 4262
3670 $self->_set_value ($value); 4263 $self->_set_value ($value);
3671 $self->emit (changed => $value); 4264 $self->emit (changed => $value);
3672} 4265}
3673 4266
4267sub set_options {
4268 my ($self, $options) = @_;
4269
4270 $self->{options} = $options;
4271 $self->_set_value ($self->{value});
4272}
4273
3674############################################################################# 4274#############################################################################
3675 4275
3676package CFPlus::UI::Statusbox; 4276package DC::UI::Statusbox;
3677 4277
3678our @ISA = CFPlus::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
3679 4279
3680sub new { 4280sub new {
3681 my $class = shift; 4281 my $class = shift;
3682 4282
3683 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
3684 fontsize => 0.8, 4284 fontsize => 0.8,
3685 @_, 4285 @_,
3686 ); 4286 );
3687 4287
3688 CFPlus::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
3689 4289
3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3691 4291
3692 $self 4292 $self
3693} 4293}
3694 4294
3695sub reorder { 4295sub reorder {
3696 my ($self) = @_; 4296 my ($self) = @_;
3697 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
3698 4298
3699 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
3700 return if $CFPlus::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3702 values %{ $self->{item} }; 4302 values %{ $self->{item} };
3703 4303
3704 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
3705 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3706 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
3707 4309
3708 my @widgets; 4310 my @widgets;
3709 4311
3710 my @items = sort { 4312 my @items = sort {
3711 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
3712 or $b->{id} <=> $a->{id} 4314 or $b->{id} <=> $a->{id}
3713 } values %{ $self->{item} }; 4315 } values %{ $self->{item} };
3714
3715 $self->{timer}->interval (1);
3716 4316
3717 my $count = 10 + 1; 4317 my $count = 10 + 1;
3718 for my $item (@items) { 4318 for my $item (@items) {
3719 last unless --$count; 4319 last unless --$count;
3720 4320
… …
3727 for ($short) { 4327 for ($short) {
3728 s/^\s+//; 4328 s/^\s+//;
3729 s/\s+/ /g; 4329 s/\s+/ /g;
3730 } 4330 }
3731 4331
3732 new CFPlus::UI::Label 4332 new DC::UI::Label
3733 markup => $short, 4333 markup => $short,
3734 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
3735 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
3736 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
3737 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
3738 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
3739 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
3740 can_events => 1, 4341 can_events => 1,
3741 can_hover => 1 4342 can_hover => 1
3742 }; 4343 };
3743 4344
3744 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4345 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3745 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4346 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3746 $label->update; 4347 $label->update;
3747 $label->set_max_size (undef, $label->{req_h} * $diff) 4348 $label->set_max_size (undef, $label->{req_h} * $diff)
3748 if $diff < 1; 4349 if $diff < 1;
3749 $self->{timer}->interval (1/30); 4350 $self->{timer}->set (1/30, 1/30);
3750 } else { 4351 } else {
3751 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
3752 } 4353 }
3753 4354
3754 push @widgets, $label; 4355 push @widgets, $label;
3755 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
3756 4361
3757 $self->clear; 4362 $self->clear;
3758 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
3759} 4364}
3760 4365
… …
3816 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
3817} 4422}
3818 4423
3819############################################################################# 4424#############################################################################
3820 4425
3821package CFPlus::UI::Root; 4426package DC::UI::Root;
3822 4427
3823our @ISA = CFPlus::UI::Container::; 4428our @ISA = DC::UI::Container::;
3824 4429
3825use List::Util qw(min max); 4430use List::Util qw(min max);
3826 4431
3827use CFPlus::OpenGL; 4432use DC::OpenGL;
3828 4433
3829sub new { 4434sub new {
3830 my $class = shift; 4435 my $class = shift;
3831 4436
3832 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
3833 visible => 1, 4438 visible => 1,
3834 @_, 4439 @_,
3835 ); 4440 );
3836 4441
3837 CFPlus::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
3838 4443
3839 $self 4444 $self
3840} 4445}
3841 4446
3842sub size_request { 4447sub size_request {
… …
3890} 4495}
3891 4496
3892sub update { 4497sub update {
3893 my ($self) = @_; 4498 my ($self) = @_;
3894 4499
3895 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
3896} 4501}
3897 4502
3898sub add { 4503sub add {
3899 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
3900 4505
… …
3937 while ($self->{refresh_hook}) { 4542 while ($self->{refresh_hook}) {
3938 $_->() 4543 $_->()
3939 for values %{delete $self->{refresh_hook}}; 4544 for values %{delete $self->{refresh_hook}};
3940 } 4545 }
3941 4546
3942 if ($self->{realloc}) { 4547 while ($self->{realloc}) {
3943 my %queue; 4548 my %queue;
3944 my @queue; 4549 my @queue;
3945 my $widget; 4550 my $widget;
3946 4551
3947 outer: 4552 outer:
… …
3967 4572
3968 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
3969 4574
3970 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
3971 4576
3972 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
3973 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4578 $h += $widget->{padding_y} * 2;
4579
4580 $w = max $widget->{min_w}, $w;
4581 $h = max $widget->{min_h}, $h;
3974 4582
3975 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3976 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3977 4585
3978 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3994 } 4602 }
3995 } 4603 }
3996 4604
3997 delete $self->{realloc}{$widget+0}; 4605 delete $self->{realloc}{$widget+0};
3998 } 4606 }
3999 }
4000 4607
4001 while (my $size_alloc = delete $self->{size_alloc}) { 4608 while (my $size_alloc = delete $self->{size_alloc}) {
4002 my @queue = sort { $b->{visible} <=> $a->{visible} } 4609 my @queue = sort { $a->{visible} <=> $b->{visible} }
4003 values %$size_alloc; 4610 values %$size_alloc;
4004 4611
4005 while () { 4612 while () {
4006 my $widget = pop @queue || last; 4613 my $widget = pop @queue || last;
4007 4614
4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4615 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4009 4616
4010 $w = 0 if $w < 0;
4011 $h = 0 if $h < 0;
4012
4013 $w = max $widget->{min_w}, $w; 4617 $w = max $widget->{min_w}, $w;
4014 $h = max $widget->{min_h}, $h; 4618 $h = max $widget->{min_h}, $h;
4015 4619
4016# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4620# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4621# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018 4622
4019 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4623 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4624 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021 4625
4022 $w = int $w + 0.5; 4626 $w = int $w + 0.5;
4023 $h = int $h + 0.5; 4627 $h = int $h + 0.5;
4024 4628
4025 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4629 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4026 $widget->{old_w} = $widget->{w}; 4630 $widget->{old_w} = $widget->{w};
4027 $widget->{old_h} = $widget->{h}; 4631 $widget->{old_h} = $widget->{h};
4028 4632
4029 $widget->{w} = $w; 4633 $widget->{w} = $w;
4030 $widget->{h} = $h; 4634 $widget->{h} = $h;
4031 4635
4032 $widget->emit (size_allocate => $w, $h); 4636 $widget->emit (size_allocate => $w, $h);
4637 }
4033 } 4638 }
4034 } 4639 }
4035 } 4640 }
4036 4641
4037 while ($self->{post_alloc_hook}) { 4642 while ($self->{post_alloc_hook}) {
4038 $_->() 4643 $_->()
4039 for values %{delete $self->{post_alloc_hook}}; 4644 for values %{delete $self->{post_alloc_hook}};
4040 } 4645 }
4041
4042 4646
4043 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4647 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4044 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4648 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4045 glClear GL_COLOR_BUFFER_BIT; 4649 glClear GL_COLOR_BUFFER_BIT;
4046 4650
… …
4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4050 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
4051 glLoadIdentity; 4655 glLoadIdentity;
4052 4656
4053 { 4657 {
4054 package CFPlus::UI::Base; 4658 package DC::UI::Base;
4055 4659
4056 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4057 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
4058 4662
4059 $self->_draw; 4663 $self->_draw;
4060 } 4664 }
4061} 4665}
4062 4666
4063############################################################################# 4667#############################################################################
4064 4668
4065package CFPlus::UI; 4669package DC::UI;
4066 4670
4067$ROOT = new CFPlus::UI::Root; 4671$ROOT = new DC::UI::Root;
4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
4069 4673
40701 46741
4071

Diff Legend

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