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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFPlus; 8use Guard ();
9
10use DC;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Texture; 12use DC::Texture;
13 13
14our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
15 15
16our $LAYOUT; 16our $LAYOUT;
17our $ROOT; 17our $ROOT;
18our $TOOLTIP; 18our $TOOLTIP;
19our $BUTTON_STATE; 19our $BUTTON_STATE;
20 20
21our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
22 22
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
24 if (!$GRAB) { 26 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 31 $TOOLTIP->hide;
29 32
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 35
32 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
33 37
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 39 $TOOLTIP->show;
40 } 40 }
41 41
42 return; 42 return;
43 } 43 }
44 } 44 }
45 } 45 }
46 46
47 $TOOLTIP->hide; 47 $TOOLTIP->hide;
48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
49}); 50};
50 51
51sub get_layout { 52sub get_layout {
52 my $layout; 53 my $layout;
53 54
54 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
89 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
90 91
91 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
93 94
94 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
95 } 96 }
96} 97}
97 98
98sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
99 my ($ev) = @_; 100 my ($ev) = @_;
… …
105 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
106 107
107 $GRAB = $widget; 108 $GRAB = $widget;
108 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
109 110
110 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
111 } 112 }
112 113
113 if ($GRAB) { 114 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 116 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
119
120 $ev->{dx} = $shift ? $delta : 0;
121 $ev->{dy} = $shift ? 0 : $delta;
122
118 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
119 } else { 124 } else {
120 $GRAB->emit (button_down => $ev) 125 $GRAB->emit (button_down => $ev)
121 } 126 }
122 } 127 }
… …
136 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
137 $grab->update if $grab; 142 $grab->update if $grab;
138 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
139 144
140 check_hover $widget; 145 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
142 } 147 }
143} 148}
144 149
145sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
146 my ($ev) = @_; 151 my ($ev) = @_;
… …
186# call when resolution changes etc. 191# call when resolution changes etc.
187sub rescale_widgets { 192sub rescale_widgets {
188 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
189 194
190 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
191 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
192 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
193 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
194 199
195 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
196 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
208 reconfigure_widgets; 213 reconfigure_widgets;
209} 214}
210 215
211############################################################################# 216#############################################################################
212 217
213package CFPlus::UI::Event; 218package DC::UI::Event;
214 219
215sub xy { 220sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217} 222}
218 223
219############################################################################# 224#############################################################################
220 225
221package CFPlus::UI::Base; 226package DC::UI::Base;
222 227
223use strict; 228use strict;
224 229
225use CFPlus::OpenGL; 230use DC::OpenGL;
226 231
227sub new { 232sub new {
228 my $class = shift; 233 my $class = shift;
229 234
230 my $self = bless { 235 my $self = bless {
… …
235 h => undef, 240 h => undef,
236 can_events => 1, 241 can_events => 1,
237 @_ 242 @_
238 }, $class; 243 }, $class;
239 244
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
241 246
242 for (keys %$self) { 247 for (keys %$self) {
243 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
245 } 250 }
246 } 251 }
247 252
248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
253 258
254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
256 261
257 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
266 $self->hide; 271 $self->hide;
267 $self->emit ("destroy"); 272 $self->emit ("destroy");
268 %$self = (); 273 %$self = ();
269} 274}
270 275
276sub TO_JSON {
277 { "\fw" => $_[0]{s_id} }
278}
279
271sub show { 280sub show {
272 my ($self) = @_; 281 my ($self) = @_;
273 282
274 return if $self->{parent}; 283 return if $self->{parent};
275 284
276 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
277} 286}
278 287
279sub set_visible { 288sub set_visible {
280 my ($self) = @_; 289 my ($self) = @_;
281 290
282 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
283 295
284 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
285 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
286 298
287 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
288 300
289 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
290 302
291 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
292} 304}
293 305
294sub set_invisible { 306sub set_invisible {
295 my ($self) = @_; 307 my ($self) = @_;
296 308
… …
302 delete $self->{root}; 314 delete $self->{root};
303 315
304 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
305 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
306 318
307 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
308 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
309 321
310 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
311 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
312} 324}
… …
314sub set_visibility { 326sub set_visibility {
315 my ($self, $visible) = @_; 327 my ($self, $visible) = @_;
316 328
317 return if $self->{visible} == $visible; 329 return if $self->{visible} == $visible;
318 330
319 $visible ? $self->hide 331 $visible ? $self->show
320 : $self->show; 332 : $self->hide;
321} 333}
322 334
323sub toggle_visibility { 335sub toggle_visibility {
324 my ($self) = @_; 336 my ($self) = @_;
325 337
… …
331sub hide { 343sub hide {
332 my ($self) = @_; 344 my ($self) = @_;
333 345
334 $self->set_invisible; 346 $self->set_invisible;
335 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
336 $self->{parent}->remove ($self) 351 $parent->remove ($self);
337 if $self->{parent}; 352 }
338} 353}
339 354
340sub move_abs { 355sub move_abs {
341 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
342 357
… …
354 $self->{force_h} = $h; 369 $self->{force_h} = $h;
355 370
356 $self->realloc; 371 $self->realloc;
357} 372}
358 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
359sub size_request { 392sub size_request {
360 require Carp; 393 require Carp;
361 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
362} 395}
363 396
… …
369 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
370 403
371 if ($self->{aspect}) { 404 if ($self->{aspect}) {
372 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
373 406
374 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
375 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
376 409
377 # use alignment to adjust x, y 410 # use alignment to adjust x, y
378 411
379 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
380 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
421 454
422 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
423 456
424 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
425 458
426 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
427 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
428 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
429 } 462 }
430} 463}
431 464
432# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
433sub coord2local { 466sub coord2local {
434 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
435 468
436 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
437 470
438 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
439} 472}
440 473
441# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
442sub coord2global { 475sub coord2global {
443 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
444 477
445 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
446 479
447 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
448} 481}
449 482
450sub invoke_focus_in { 483sub invoke_focus_in {
… …
499sub connect { 532sub connect {
500 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
501 534
502 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
503 536
504 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
505 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
506 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
507 } 540 }
508} 541}
509 542
… …
530 ? $args[0]->xy ($self) 563 ? $args[0]->xy ($self)
531 : (); 564 : ();
532 565
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 566 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 567
535 #d##TODO# stop propagating at first true, do not use sum 568 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 569 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 570 ($self->can ("invoke_$signal") || sub { 1 }), # closure
571 ) {
572 return $cb->($self, @args, @append) || next;
573 }
574
575 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 576 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 577}
540 578
541sub find_widget { 579#sub find_widget {
542 my ($self, $x, $y) = @_; 580# in .xs
543
544 return () unless $self->{can_events};
545
546 return $self
547 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550 ()
551}
552 581
553sub set_parent { 582sub set_parent {
554 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
555 584
556 Scalar::Util::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
558} 587}
559 588
560sub realloc { 589sub realloc {
561 my ($self) = @_; 590 my ($self) = @_;
… …
587 616
588# using global variables seems a bit hacky, but passing through all drawing 617# using global variables seems a bit hacky, but passing through all drawing
589# functions seems pointless. 618# functions seems pointless.
590our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 619our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
591 620
592sub draw { 621#sub draw {
593 my ($self) = @_; 622#CFPlus.xs
594
595 return unless $self->{h} && $self->{w};
596
597 # update screen rectangle
598 local $draw_x = $draw_x + $self->{x};
599 local $draw_y = $draw_y + $self->{y};
600
601 # skip widgets that are entirely outside the drawing area
602 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
603 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
604
605 glPushMatrix;
606 glTranslate $self->{x}, $self->{y}, 0;
607
608 if ($self == $HOVER && $self->{can_hover}) {
609 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
610 glEnable GL_BLEND;
611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glBegin GL_QUADS;
613 glVertex 0 , 0;
614 glVertex $self->{w}, 0;
615 glVertex $self->{w}, $self->{h};
616 glVertex 0 , $self->{h};
617 glEnd;
618 glDisable GL_BLEND;
619 }
620
621 if ($ENV{CFPLUS_DEBUG} & 1) {
622 glPushMatrix;
623 glColor 1, 1, 0, 1;
624 glTranslate 0.375, 0.375;
625 glBegin GL_LINE_LOOP;
626 glVertex 0 , 0;
627 glVertex $self->{w} - 1, 0;
628 glVertex $self->{w} - 1, $self->{h} - 1;
629 glVertex 0 , $self->{h} - 1;
630 glEnd;
631 glPopMatrix;
632 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
633 }
634
635 $self->_draw;
636 glPopMatrix;
637}
638 623
639sub _draw { 624sub _draw {
640 my ($self) = @_; 625 my ($self) = @_;
641 626
642 warn "no draw defined for $self\n"; 627 warn "no draw defined for $self\n";
643} 628}
644 629
645sub DESTROY { 630sub DESTROY {
646 my ($self) = @_; 631 my ($self) = @_;
647 632
648 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
649 634
635 local $@;
650 eval { $self->destroy }; 636 eval { $self->destroy };
651 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652 638
653 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
654} 640}
655 641
656############################################################################# 642#############################################################################
657 643
658package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
659 645
660our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
661 647
662use strict; 648use strict;
663use CFPlus::OpenGL; 649use DC::OpenGL;
664 650
665sub new { 651sub new {
666 my $class = shift; 652 my $class = shift;
667
668 # range [value, low, high, page]
669 653
670 $class->SUPER::new ( 654 $class->SUPER::new (
671 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
672 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
673 @_ 657 @_
674 ) 658 )
675} 659}
676 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
677sub _draw { 668sub _draw {
678 my ($self) = @_; 669 my ($self) = @_;
679 670
680 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self && $self->{active_bg}
681 ? $self->{active_bg} 672 ? $self->{active_bg}
… …
685 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
686 677
687 glEnable GL_BLEND; 678 glEnable GL_BLEND;
688 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
689 glColor_premultiply @$color; 680 glColor_premultiply @$color;
690
691 glBegin GL_QUADS;
692 glVertex 0 , 0;
693 glVertex 0 , $h;
694 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
695 glVertex $w, 0;
696 glEnd;
697
698 glDisable GL_BLEND; 682 glDisable GL_BLEND;
699 } 683 }
700} 684}
701 685
702############################################################################# 686#############################################################################
703 687
704package CFPlus::UI::Empty; 688package DC::UI::Empty;
705 689
706our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
707 691
708sub new { 692sub new {
709 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
710 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
711} 695}
… …
718 702
719sub draw { } 703sub draw { }
720 704
721############################################################################# 705#############################################################################
722 706
723package CFPlus::UI::Container; 707package DC::UI::Container;
724 708
725our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
726 710
727sub new { 711sub new {
728 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
729 713
730 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
734 can_events => 0, 718 can_events => 0,
735 %arg, 719 %arg,
736 ); 720 );
737 721
738 $self->add (@$children) 722 $self->add (@$children)
739 if $children; 723 if $children && @$children;
740 724
741 $self 725 $self
742} 726}
743 727
744sub realloc { 728sub realloc {
… …
753 my ($self, @widgets) = @_; 737 my ($self, @widgets) = @_;
754 738
755 $_->set_parent ($self) 739 $_->set_parent ($self)
756 for @widgets; 740 for @widgets;
757 741
742 # TODO: only do this in widgets that need it, e.g. root, fixed
758 use sort 'stable'; 743 use sort 'stable';
759 744
760 $self->{children} = [ 745 $self->{children} = [
761 sort { $a->{z} <=> $b->{z} } 746 sort { $a->{z} <=> $b->{z} }
762 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
763 ]; 748 ];
764 749
765 $self->realloc; 750 $self->realloc;
751
752 $self->emit (c_add => \@widgets);
753
754 map $_+0, @widgets
766} 755}
767 756
768sub children { 757sub children {
769 @{ $_[0]{children} } 758 @{ $_[0]{children} }
770} 759}
771 760
772sub remove { 761sub remove {
773 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
774 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
775 delete $child->{parent}; 767 delete $child->{parent};
776 $child->hide; 768 $child->hide;
777
778 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
779 771
780 $self->realloc; 772 $self->realloc;
781} 773}
782 774
783sub clear { 775sub clear {
784 my ($self) = @_; 776 my ($self) = @_;
785 777
786 my $children = delete $self->{children}; 778 my $children = $self->{children};
787 $self->{children} = []; 779 $self->{children} = [];
788 780
789 for (@$children) { 781 for (@$children) {
790 delete $_->{parent}; 782 delete $_->{parent};
791 $_->hide; 783 $_->hide;
… …
811} 803}
812 804
813sub _draw { 805sub _draw {
814 my ($self) = @_; 806 my ($self) = @_;
815 807
816 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
817} 809}
818 810
819############################################################################# 811#############################################################################
820 812
821package CFPlus::UI::Bin; 813package DC::UI::Bin;
822 814
823our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
824 816
825sub new { 817sub new {
826 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
827 819
828 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
829 821
830 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
831} 823}
832 824
833sub add { 825sub add {
834 my ($self, $child) = @_; 826 my ($self, $child) = @_;
835 827
836 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
837 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
838} 830}
839 831
840sub remove { 832sub remove {
841 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
842 834
843 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
844 836
845 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
846 unless @{$self->{children}}; 838 unless @{$self->{children}};
847} 839}
848 840
849sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
850 842
… …
859 851
860 1 852 1
861} 853}
862 854
863############################################################################# 855#############################################################################
864
865# back-buffered drawing area 856# back-buffered drawing area
866 857
867package CFPlus::UI::Window; 858package DC::UI::Window;
868 859
869our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
870 861
871use CFPlus::OpenGL; 862use DC::OpenGL;
872 863
873sub new { 864sub new {
874 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
875 866
876 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
898} 889}
899 890
900sub render_child { 891sub render_child {
901 my ($self) = @_; 892 my ($self) = @_;
902 893
903 $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 {
904 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
905 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
906 897
907 { 898 {
908 package CFPlus::UI::Base; 899 package DC::UI::Base;
909 900
910 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
911 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
912 903
913 $self->_render; 904 $self->_render;
… …
930 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
931} 922}
932 923
933############################################################################# 924#############################################################################
934 925
935package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
936 927
928use List::Util qw(min max);
929
937our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
938 931
939sub new { 932sub new {
940 my $class = shift; 933 my $class = shift;
941 934
942 $class->SUPER::new ( 935 $class->SUPER::new (
… …
949sub size_request { 942sub size_request {
950 my ($self) = @_; 943 my ($self) = @_;
951 944
952 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953 946
954 $w = 10 if $self->{scroll_x}; 947 $w = 1 if $self->{scroll_x};
955 $h = 10 if $self->{scroll_y}; 948 $h = 1 if $self->{scroll_y};
956 949
957 ($w, $h) 950 ($w, $h)
958} 951}
959 952
960sub invoke_size_allocate { 953sub invoke_size_allocate {
… …
972} 965}
973 966
974sub set_offset { 967sub set_offset {
975 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
976 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}) {
977 $self->{view_x} = int $x; 974 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 975 $self->{view_y} = $y;
979 976
977 $self->emit (changed => $x, $y);
980 $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 }
981} 998}
982 999
983# 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
984sub coord2local { 1001sub coord2local {
985 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
1000 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1001 1018
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 1021 ) {
1005 $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})
1006 } else { 1023 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1008 } 1025 }
1009} 1026}
1010 1027
1011sub _render { 1028sub _render {
1012 my ($self) = @_; 1029 my ($self) = @_;
1013 1030
1014 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};
1015 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};
1016 1033
1017 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1018 1035
1019 $self->SUPER::_render; 1036 $self->SUPER::_render;
1020} 1037}
1021 1038
1022############################################################################# 1039#############################################################################
1023 1040
1024package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1025 1042
1026our @ISA = CFPlus::UI::HBox::; 1043our @ISA = DC::UI::Table::;
1027 1044
1028sub new { 1045sub new {
1029 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1030 1047
1031 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1032 1049
1033 my $self; 1050 my $self;
1034 1051
1035 my $slider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1053 c_col => 0,
1054 c_row => 1,
1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub {
1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 },
1061 ;
1062
1063 my $vslider = new DC::UI::Slider
1064 c_col => 1,
1065 c_row => 0,
1036 vertical => 1, 1066 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1068 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1071 },
1041 ; 1072 ;
1042 1073
1043 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1045 can_events => 1, 1077 can_events => 1,
1046 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1047 %arg, 1082 %arg,
1048 ); 1083 );
1049 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
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
1051 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1052 1109
1053 $self 1110 $self
1054} 1111}
1055
1056#TODO# update range on size_allocate depending on child
1057 1112
1058sub add { 1113sub add {
1059 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1060 1115
1061 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1062} 1117}
1063 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
1064sub invoke_mouse_wheel { 1171sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1172 my ($self, $ev) = @_;
1066 1173
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->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};
1070 1176
1071 1 1177 1
1072} 1178}
1073 1179
1074sub update_slider { 1180sub invoke_button_down {
1075 my ($self) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1076 1182
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1183 if ($ev->{button} == 2) {
1078} 1184 $self->start_dragging ($ev);
1185 return 1;
1186 }
1079 1187
1080sub update { 1188 0
1081 my ($self) = @_; 1189}
1082 1190
1083 $self->SUPER::update; 1191sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_;
1084 1193
1085 $self->update_slider; 1194 if (delete $self->{motion}) {
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
1086} 1210}
1087 1211
1088sub invoke_size_allocate { 1212sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1213 my ($self, $w, $h) = @_;
1090 1214
1091 $self->update_slider; 1215 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1217}
1095 1218
1096############################################################################# 1219#############################################################################
1097 1220
1098package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1099 1222
1100our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1101 1224
1102use CFPlus::OpenGL; 1225use DC::OpenGL;
1103 1226
1104sub new { 1227sub new {
1105 my $class = shift; 1228 my $class = shift;
1106 1229
1107 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1117 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1118 1241
1119 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1120 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1121 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1122
1123 glBegin GL_QUADS;
1124 glVertex 0 , 0;
1125 glVertex 0 , $h;
1126 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1127 glVertex $w, 0;
1128 glEnd;
1129
1130 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1131 } 1247 }
1132 1248
1133 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1134} 1250}
1135 1251
1136############################################################################# 1252#############################################################################
1137 1253
1138package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1139 1255
1140our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1141 1257
1142use CFPlus::OpenGL; 1258use DC::OpenGL;
1143 1259
1144sub new { 1260sub new {
1145 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1146 1262
1147 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1148 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1149 align => 1, 1265 align => 1,
1150 valign => 0, 1266 valign => 0.5,
1151 text => $arg{label}, 1267 text => $arg{label},
1152 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1153 } 1269 }
1154 1270
1155 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1156 # label => "", 1272 # label => "",
1157 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1158 border => 0.8, 1274 border => 0.8,
1159 style => 'single', 1275 style => 'single',
1160 %arg, 1276 %arg,
1161 ); 1277 );
1162 1278
… …
1165 1281
1166sub add { 1282sub add {
1167 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1168 1284
1169 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1170 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1171} 1287}
1172 1288
1173sub border { 1289sub border {
1174 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1175} 1291}
… …
1215 my $border = $self->border; 1331 my $border = $self->border;
1216 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1217 1333
1218 $child->draw; 1334 $child->draw;
1219 1335
1220 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1221 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1222 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1223 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1224 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;
1225 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;
… …
1233 } 1349 }
1234} 1350}
1235 1351
1236############################################################################# 1352#############################################################################
1237 1353
1238package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1239 1355
1240our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1241 1357
1242use CFPlus::OpenGL; 1358use DC::OpenGL;
1243 1359
1244my $bg = 1360my $bg =
1245 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1246 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1247 1363
1248my @border = 1364my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1250 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);
1251 1371
1252sub new { 1372sub new {
1253 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1254 1374
1255 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1256 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1257 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1258 border => 0.6, 1378 border => 0.8,
1259 can_events => 1, 1379 can_events => 1,
1260 min_w => 64, 1380 min_w => 64,
1261 min_h => 32, 1381 min_h => 32,
1262 %arg, 1382 %arg,
1263 ); 1383 );
1264 1384
1265 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1266 align => 0, 1386 align => 0.5,
1267 valign => 1, 1387 valign => 1,
1268 text => $self->{title}, 1388 text => $self->{title},
1269 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1270 if exists $self->{title}; 1390 if exists $self->{title};
1271 1391
1272 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1273 $self->{close_button} = 1393 $self->{close_button} =
1274 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1275 path => 'x1_close.png', 1395 path => 'x1_close.png',
1276 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1277 1397
1278 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1279 } 1399 }
1280 1400
1281 $self 1401 $self
1282} 1402}
1283 1403
1284sub add { 1404sub add {
1285 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1286 1406
1287 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1288 $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};
1289 $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};
1290} 1410}
1291 1411
1292sub border { 1412sub border {
1293 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
1294} 1423}
1295 1424
1296sub size_request { 1425sub size_request {
1297 my ($self) = @_; 1426 my ($self) = @_;
1298 1427
… …
1423 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1554
1426 my $border = $self->border; 1555 my $border = $self->border;
1427 1556
1557 if ($border) {
1428 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $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 }
1433 1578
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1436 1581
1437 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1456 if $self->{close_button}; 1601 if $self->{close_button};
1457} 1602}
1458 1603
1459############################################################################# 1604#############################################################################
1460 1605
1461package CFPlus::UI::Table; 1606package DC::UI::Table;
1462 1607
1463our @ISA = CFPlus::UI::Base::; 1608our @ISA = DC::UI::Container::;
1464 1609
1465use List::Util qw(max sum); 1610use List::Util qw(max sum);
1466 1611
1467use CFPlus::OpenGL; 1612use DC::OpenGL;
1468 1613
1469sub new { 1614sub new {
1470 my $class = shift; 1615 my $class = shift;
1471 1616
1472 $class->SUPER::new ( 1617 $class->SUPER::new (
1473 col_expand => [], 1618 col_expand => [],
1619 row_expand => [],
1474 @_, 1620 @_,
1475 ) 1621 )
1476} 1622}
1477 1623
1478sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480}
1481
1482sub 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 {
1483 my ($self) = shift; 1636 my $self = shift;
1637
1638 my @widgets;
1484 1639
1485 while (@_) { 1640 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1641 my ($col, $row, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child;
1489 }
1490 1642
1491 $self->{force_realloc} = 1; 1643 $child->{c_row} = $row;
1492 $self->{force_size_alloc} = 1; 1644 $child->{c_col} = $col;
1493 $self->realloc;
1494}
1495 1645
1496sub remove { 1646 push @widgets, $child;
1647 }
1648
1649 $self->add (@widgets);
1650}
1651
1652sub get_wh {
1497 my ($self, $child) = @_; 1653 my ($self) = @_;
1498 1654
1499 # TODO: not yet implemented 1655 my (@w, @h);
1500}
1501
1502# TODO: move to container class maybe? send children a signal on removal?
1503sub clear {
1504 my ($self) = @_;
1505 1656
1506 my @children = $self->children; 1657 my @children = $self->children;
1507 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 }
1508 1668 }
1509 for (@children) {
1510 delete $_->{parent};
1511 $_->hide;
1512 }
1513 1669
1514 $self->realloc; 1670 # second pass, rows
1515} 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1516
1517sub get_wh {
1518 my ($self) = @_;
1519
1520 my (@w, @h);
1521
1522 for my $y (0 .. $#{$self->{children}}) {
1523 my $row = $self->{children}[$y]
1524 or next;
1525
1526 for my $x (0 .. $#$row) {
1527 my $widget = $row->[$x]
1528 or next;
1529 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1530 1673
1531 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1532 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1533 } 1678 }
1534 } 1679 }
1535 1680
1536 (\@w, \@h) 1681 (\@w, \@h)
1537} 1682}
… …
1553 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1554 1699
1555 my $req_w = (sum @$ws) || 1; 1700 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1701 my $req_h = (sum @$hs) || 1;
1557 1702
1558 # TODO: nicer code && do row_expand 1703 # now linearly scale the rows/columns to the allocated size
1559 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1562 1707
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1709
1567 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1711
1712 my @row_expand = @{$self->{row_expand}};
1713 @row_expand = (1) x @$ws unless @row_expand;
1714 my $row_expand = (sum @row_expand) || 1;
1715
1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1717
1568 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1569 1719
1570 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571 1722
1572 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1573 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)};
1574 or next;
1575 1725
1576 my $x = 0; 1726 $widget->configure (
1577 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578 1729 );
1579 for my $c (0 .. $#$row) { 1730 }
1580 my $col_w = $ws->[$c];
1581 1731
1582 if (my $widget = $row->[$c]) { 1732 1
1583 $widget->configure ($x, $y, $col_w, $row_h); 1733}
1584 }
1585 1734
1586 $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};
1587 } 1762 }
1763 }
1588 1764
1589 $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});
1590 } 1796 }
1591 1797
1592 1 1798 1
1593} 1799}
1594 1800
1595sub find_widget {
1596 my ($self, $x, $y) = @_;
1597
1598 $x -= $self->{x};
1599 $y -= $self->{y};
1600
1601 my $res;
1602
1603 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1604 $res = $_->find_widget ($x, $y)
1605 and return $res;
1606 }
1607
1608 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1609}
1610
1611sub _draw {
1612 my ($self) = @_;
1613
1614 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_;
1616 }
1617}
1618
1619############################################################################# 1801#############################################################################
1620 1802
1621package CFPlus::UI::Box; 1803package DC::UI::Box;
1622 1804
1623our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1624 1806
1625sub size_request { 1807sub size_request {
1626 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1627 1811
1628 $self->{vertical} 1812 $self->{vertical}
1629 ? ( 1813 ? (
1630 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1631 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1632 ) 1816 )
1633 : ( 1817 : (
1634 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1635 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1636 ) 1820 )
1637} 1821}
1638 1822
1639sub invoke_size_allocate { 1823sub invoke_size_allocate {
1640 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1661 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1662 for 0 .. $#children; 1846 for 0 .. $#children;
1663 } 1847 }
1664 } 1848 }
1665 1849
1666 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1667 1851
1668 my $pos = 0; 1852 my $pos = 0;
1669 for (0 .. $#children) { 1853 for (0 .. $#children) {
1670 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1671 $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));
… …
1676 1 1860 1
1677} 1861}
1678 1862
1679############################################################################# 1863#############################################################################
1680 1864
1681package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1682 1866
1683our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1684 1868
1685sub new { 1869sub new {
1686 my $class = shift; 1870 my $class = shift;
1687 1871
1688 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1691 ) 1875 )
1692} 1876}
1693 1877
1694############################################################################# 1878#############################################################################
1695 1879
1696package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1697 1881
1698our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1699 1883
1700sub new { 1884sub new {
1701 my $class = shift; 1885 my $class = shift;
1702 1886
1703 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1706 ) 1890 )
1707} 1891}
1708 1892
1709############################################################################# 1893#############################################################################
1710 1894
1711package CFPlus::UI::Label; 1895package DC::UI::Label;
1712 1896
1713our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1714 1898
1715use CFPlus::OpenGL; 1899use DC::OpenGL;
1716 1900
1717sub new { 1901sub new {
1718 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1719 1903
1720 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1725 #text => initial text 1909 #text => initial text
1726 #markup => initial narkup 1910 #markup => initial narkup
1727 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1728 #style => 0, # render flags 1912 #style => 0, # render flags
1729 ellipsise => 3, # end 1913 ellipsise => 3, # end
1730 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1731 fontsize => 1, 1915 fontsize => 1,
1732 align => -1, 1916 align => 0.5,
1733 valign => -1, 1917 valign => 0.5,
1734 padding_x => 2, 1918 padding_x => 4,
1735 padding_y => 2, 1919 padding_y => 2,
1736 can_events => 0, 1920 can_events => 0,
1737 %arg 1921 %arg
1738 ); 1922 );
1739 1923
1740 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1741 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1742 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1743 $self->{template} = $layout; 1927 $self->{template} = $layout;
1744 } 1928 }
1745 1929
1746 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1764 1948
1765 delete $self->{ox}; 1949 delete $self->{ox};
1766 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1767} 1951}
1768 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1769sub set_text { 1959sub set_text {
1770 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1771 1961
1772 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1773 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
… …
1796 1986
1797sub size_request { 1987sub size_request {
1798 my ($self) = @_; 1988 my ($self) = @_;
1799 1989
1800 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1801 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1802 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1803 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1804 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1805 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1806 1998
1807 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1808 2000
1809 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1810 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
1811 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
1812 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 2005
1814 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1815 2007
1816 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
1872 2064
1873 [$self->{layout}->size] 2065 [$self->{layout}->size]
1874 }; 2066 };
1875 2067
1876 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
1877 $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);
1878 : $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);
1879 : ($self->{w} - $size->[0]) * 0.5);
1880 2071
1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1883 : ($self->{h} - $size->[1]) * 0.5);
1884 }; 2073 };
1885 2074
1886 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2075# unless ($self->{list}) {
1887 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2076# $self->{list} = DC::OpenGL::glGenList;
1888 2077# DC::OpenGL::glNewList $self->{list};
1889 $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;
1890} 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#}
1891 2094
1892############################################################################# 2095#############################################################################
1893 2096
1894package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
1895 2098
1896our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
1897 2100
1898use CFPlus::OpenGL; 2101use DC::OpenGL;
1899 2102
1900sub new { 2103sub new {
1901 my $class = shift; 2104 my $class = shift;
1902 2105
1903 $class->SUPER::new ( 2106 $class->SUPER::new (
1904 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
1905 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
1906 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
1907 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
1908 can_hover => 1, 2113 can_hover => 1,
1909 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
1910 valign => 0, 2116 valign => 0.5,
1911 can_events => 1, 2117 can_events => 1,
1912 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
1913 #text => ... 2121 #text => ...
1914 #hidden => "*", 2122 #hidden => "*",
1915 @_ 2123 @_
1916 ) 2124 )
1917} 2125}
… …
1962 my $sym = $ev->{sym}; 2170 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2171 my $uni = $ev->{unicode};
1964 2172
1965 my $text = $self->get_text; 2173 my $text = $self->get_text;
1966 2174
1967 if ($uni == 8) { 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2176
2177 if ($sym == DC::SDLK_BACKSPACE) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
1970 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2186 # what a hack
1976 $self->{cursor} = 0; 2187 $self->{cursor} =
2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2189 ? length $1
2190 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2192 # uh, again
2193 $self->{cursor} =
2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2195 ? $self->{cursor} + length $1
2196 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2197 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2198 $text = "";
1981 $self->{cursor} = 0; 2199 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2200 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2201 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2202 } elsif ($uni == 0x0d) {
2203 substr $text, $self->{cursor}++, 0, "\012";
2204 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2205 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2206 } else {
1987 return 0; 2207 return 0;
1988 } 2208 }
1989 2209
… …
2040 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
2041 } 2261 }
2042 2262
2043 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
2044 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2045 glBegin GL_QUADS;
2046 glVertex 0 , 0;
2047 glVertex 0 , $self->{h};
2048 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
2049 glVertex $self->{w}, 0;
2050 glEnd;
2051 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
2052 2267
2053 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
2054 2269
2055 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
2057 2272
2058 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
2059 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
2060 utf8::encode $text; 2275 utf8::encode $text;
2061 2276
2062 @$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);
2063 } 2278 }
2064 2279
2280 glColor_premultiply @{$self->{active_fg}};
2065 glBegin GL_LINES; 2281 glBegin GL_LINES;
2066 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};
2067 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};
2068 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;
2069 } 2299 }
2070} 2300}
2071 2301
2072############################################################################# 2302#############################################################################
2073 2303
2074package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2075 2305
2076our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2077 2307
2078use 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
2079 2319
2080sub invoke_key_down { 2320sub invoke_key_down {
2081 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2082 2322
2083 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2089 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2090 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2091 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2092 $self->update; 2332 $self->update;
2093 2333
2094 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2095 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2096 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2097 } 2337 }
2098 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2099 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2101 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2102 } 2342 }
2103 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2104 } 2344 }
2105 2345
2106 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2107 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2108 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2109 2349
2110 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2111 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2112 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2113 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2114 } 2357 }
2115 2358
2116 } else { 2359 } else {
2117 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2118 } 2361 }
… …
2120 1 2363 1
2121} 2364}
2122 2365
2123############################################################################# 2366#############################################################################
2124 2367
2125package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2126 2369
2127our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2128 2371
2129use 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}
2130 2383
2131sub move_cursor_ver { 2384sub move_cursor_ver {
2132 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2133 2386
2134 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2135 2388
2136 $y += $dy; 2389 $line += $dy;
2137 2390
2138 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))) {
2139 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2140 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2141 $self->update; 2394 $self->update;
2142 return; 2395 return;
2143 } 2396 }
… …
2146sub invoke_key_down { 2399sub invoke_key_down {
2147 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2148 2401
2149 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2150 2403
2151 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2152 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2153 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2154 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2155 } else { 2408 } else {
2156 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2157 } 2410 }
2158 2411
2159 1 2412 1
2160} 2413}
2161 2414
2162############################################################################# 2415#############################################################################
2163 2416
2164package CFPlus::UI::Button; 2417package DC::UI::ButtonBin;
2165 2418
2166our @ISA = CFPlus::UI::Label::; 2419our @ISA = DC::UI::Bin::;
2167 2420
2168use CFPlus::OpenGL; 2421use DC::OpenGL;
2169 2422
2170my @tex = 2423my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2173 2426
2174sub new { 2427sub new {
2175 my $class = shift; 2428 my $class = shift;
2176 2429
2177 $class->SUPER::new ( 2430 $class->SUPER::new (
2178 padding_x => 4,
2179 padding_y => 4,
2180 fg => [1, 1, 1],
2181 active_fg => [0, 0, 1],
2182 can_hover => 1, 2431 can_hover => 1,
2183 align => 0, 2432 align => 0.5,
2184 valign => 0, 2433 valign => 0.5,
2185 can_events => 1, 2434 can_events => 1,
2186 @_ 2435 @_
2187 ) 2436 )
2188} 2437}
2189 2438
… …
2198} 2447}
2199 2448
2200sub _draw { 2449sub _draw {
2201 my ($self) = @_; 2450 my ($self) = @_;
2202 2451
2203 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2204
2205 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2454 glColor 0, 0, 0, 1;
2208 2455
2456 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2458
2211 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
2212 2460
2213 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2214} 2462}
2215 2463
2216############################################################################# 2464#############################################################################
2217 2465
2218package CFPlus::UI::CheckBox; 2466package DC::UI::Button;
2219 2467
2220our @ISA = CFPlus::UI::DrawBG::; 2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
2221 2471
2222my @tex = 2472my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2224 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2474 qw(b1_button_inactive.png b1_button_active.png);
2225
2226use CFPlus::OpenGL;
2227 2475
2228sub new { 2476sub new {
2229 my $class = shift; 2477 my $class = shift;
2230 2478
2231 $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,
2232 padding_x => 2, 2536 padding_x => 2,
2233 padding_y => 2, 2537 padding_y => 2,
2234 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2235 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2236 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2242} 2546}
2243 2547
2244sub size_request { 2548sub size_request {
2245 my ($self) = @_; 2549 my ($self) = @_;
2246 2550
2247 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2248} 2552}
2249 2553
2250sub toggle { 2554sub toggle {
2251 my ($self) = @_; 2555 my ($self) = @_;
2252 2556
… …
2271sub _draw { 2575sub _draw {
2272 my ($self) = @_; 2576 my ($self) = @_;
2273 2577
2274 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2275 2579
2276 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2277 2581
2278 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2279 2583
2280 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;
2281 2585
… …
2288 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2289} 2593}
2290 2594
2291############################################################################# 2595#############################################################################
2292 2596
2293package CFPlus::UI::Image; 2597package DC::UI::Image;
2294 2598
2295our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::Base::;
2296 2600
2297use CFPlus::OpenGL; 2601use DC::OpenGL;
2298 2602
2299our %texture_cache; 2603our %texture_cache;
2300 2604
2301sub new { 2605sub new {
2302 my $class = shift; 2606 my $class = shift;
2303 2607
2304 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2305 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2306 @_, 2611 @_,
2307 ); 2612 );
2308 2613
2309 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2310 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2311 2616
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2314 2619
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2316 2621
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2623
2319 $self 2624 $self
2320} 2625}
2321 2626
2322sub STORABLE_freeze { 2627sub STORABLE_freeze {
2323 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2324 2629
2325 $self->{path} 2630 $self->{path}
2326 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";
2327 2632
2328 $self->{path} 2633 $self->{path}
2329} 2634}
2330 2635
2331sub STORABLE_attach { 2636sub STORABLE_attach {
… …
2335} 2640}
2336 2641
2337sub size_request { 2642sub size_request {
2338 my ($self) = @_; 2643 my ($self) = @_;
2339 2644
2340 ($self->{tex}{w}, $self->{tex}{h}) 2645 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2341} 2646}
2342 2647
2343sub _draw { 2648sub _draw {
2344 my ($self) = @_; 2649 my ($self) = @_;
2345 2650
… …
2355 } 2660 }
2356 2661
2357 glEnable GL_TEXTURE_2D; 2662 glEnable GL_TEXTURE_2D;
2358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2359 2664
2360 $tex->draw_quad (0, 0, $w, $h); 2665 $tex->draw_quad_alpha (0, 0, $w, $h);
2361 2666
2362 glDisable GL_TEXTURE_2D; 2667 glDisable GL_TEXTURE_2D;
2363} 2668}
2364 2669
2365############################################################################# 2670#############################################################################
2366 2671
2367package CFPlus::UI::ImageButton; 2672package DC::UI::ImageButton;
2368 2673
2369our @ISA = CFPlus::UI::Image::; 2674our @ISA = DC::UI::Image::;
2370 2675
2371use CFPlus::OpenGL; 2676use DC::OpenGL;
2372 2677
2373my %textures; 2678my %textures;
2374 2679
2375sub new { 2680sub new {
2376 my $class = shift; 2681 my $class = shift;
… …
2379 padding_x => 4, 2684 padding_x => 4,
2380 padding_y => 4, 2685 padding_y => 4,
2381 fg => [1, 1, 1], 2686 fg => [1, 1, 1],
2382 active_fg => [0, 0, 1], 2687 active_fg => [0, 0, 1],
2383 can_hover => 1, 2688 can_hover => 1,
2384 align => 0, 2689 align => 0.5,
2385 valign => 0, 2690 valign => 0.5,
2386 can_events => 1, 2691 can_events => 1,
2387 @_ 2692 @_
2388 ); 2693 );
2389} 2694}
2390 2695
2696sub invoke_button_down {
2697 my ($self, $ev, $x, $y) = @_;
2698
2699 1
2700}
2701
2391sub invoke_button_up { 2702sub invoke_button_up {
2392 my ($self, $ev, $x, $y) = @_; 2703 my ($self, $ev, $x, $y) = @_;
2393 2704
2394 $self->emit ("activate") 2705 $self->emit ("activate")
2395 if $x >= 0 && $x < $self->{w} 2706 if $x >= 0 && $x < $self->{w}
… …
2398 1 2709 1
2399} 2710}
2400 2711
2401############################################################################# 2712#############################################################################
2402 2713
2403package CFPlus::UI::VGauge; 2714package DC::UI::VGauge;
2404 2715
2405our @ISA = CFPlus::UI::Base::; 2716our @ISA = DC::UI::Base::;
2406 2717
2407use List::Util qw(min max); 2718use List::Util qw(min max);
2408 2719
2409use CFPlus::OpenGL; 2720use DC::OpenGL;
2410 2721
2411my %tex = ( 2722my %tex = (
2412 food => [ 2723 food => [
2413 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2414 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2725 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2415 ], 2726 ],
2416 grace => [ 2727 grace => [
2417 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2728 map { new_from_resource DC::Texture $_, mipmap => 1 }
2418 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2729 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2419 ], 2730 ],
2420 hp => [ 2731 hp => [
2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2422 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2733 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2423 ], 2734 ],
2424 mana => [ 2735 mana => [
2425 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2426 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2737 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2427 ], 2738 ],
2428); 2739);
2429 2740
2430# eg. VGauge->new (gauge => 'food'), default gauge: food 2741# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2533 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2534} 2845}
2535 2846
2536############################################################################# 2847#############################################################################
2537 2848
2849package DC::UI::Progress;
2850
2851our @ISA = DC::UI::Label::;
2852
2853use DC::OpenGL;
2854
2855sub new {
2856 my ($class, %arg) = @_;
2857
2858 my $self = $class->SUPER::new (
2859 padding_x => 2,
2860 padding_y => 2,
2861 fg => [1, 1, 1],
2862 bg => [0, 0, 1, 0.2],
2863 bar => [0.7, 0.5, 0.1, 0.8],
2864 outline => [0.4, 0.3, 0],
2865 fontsize => 0.9,
2866 valign => 0.5,
2867 align => 0.5,
2868 can_events => 1,
2869 ellipsise => 1,
2870 label => "%d%%",
2871 %arg,
2872 );
2873
2874 $self->set_value ($arg{value} || -1);
2875
2876 $self
2877}
2878
2879sub set_label {
2880 my ($self, $label) = @_;
2881
2882 return if $self->{label} eq $label;
2883 $self->{label} = $label;
2884
2885 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2886}
2887
2888sub set_value {
2889 my ($self, $value) = @_;
2890
2891 if ($self->{value} ne $value) {
2892 $self->{value} = $value;
2893
2894 if ($value < 0) {
2895 $self->set_text ("-");
2896 } else {
2897 $self->set_text (sprintf $self->{label}, $value * 100);
2898 }
2899
2900 $self->update;
2901 }
2902}
2903
2904sub _draw {
2905 my ($self) = @_;
2906
2907 glEnable GL_BLEND;
2908 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2909
2910 my $px = $self->{padding_x};
2911 my $py = $self->{padding_y};
2912
2913 if ($self->{value} >= 0) {
2914 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2915
2916 glColor_premultiply @{$self->{bar}};
2917 glRect $px, $py, $s, $self->{h} - $py;
2918 glColor_premultiply @{$self->{bg}};
2919 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2920 }
2921
2922 glColor_premultiply @{$self->{outline}};
2923
2924 $px -= .5;
2925 $py -= .5;
2926
2927 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2928
2929 glDisable GL_BLEND;
2930
2931 {
2932 local $self->{bg}; # do not draw background
2933 $self->SUPER::_draw;
2934 }
2935}
2936
2937#############################################################################
2938
2939package DC::UI::ExperienceProgress;
2940
2941our @ISA = DC::UI::Progress::;
2942
2943sub new {
2944 my ($class, %arg) = @_;
2945
2946 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2947
2948 my $self = $class->SUPER::new (
2949 %arg,
2950 tooltip => sub {
2951 my ($self) = @_;
2952
2953 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2954 $tt,
2955 $self->{lvl},
2956 ::formsep ($self->{exp}),
2957 ::formsep ($self->{nxt}),
2958 ::formsep ($self->{nxt} - $self->{exp}),
2959 $self->_percent * 100,
2960 },
2961 );
2962
2963 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2964 if $::CONN;
2965
2966 $self
2967}
2968
2969sub DESTROY {
2970 my ($self) = @_;
2971
2972 delete $::CONN->{on_exp_update}{$self+0}
2973 if $::CONN;
2974
2975 $self->SUPER::DESTROY;
2976}
2977
2978sub _percent {
2979 my ($self) = @_;
2980
2981 my $table = $::CONN && $::CONN->{exp_table}
2982 or return -1;
2983
2984 my $l0 = $table->[$self->{lvl} - 1];
2985 my $l1 = $table->[$self->{lvl}];
2986
2987 $self->{nxt} = $l1;
2988
2989 ($self->{exp} - $l0) / ($l1 - $l0)
2990}
2991
2992sub set_value {
2993 my ($self, $lvl, $exp) = @_;
2994
2995 $self->{lvl} = $lvl;
2996 $self->{exp} = $exp;
2997
2998 $self->SUPER::set_value ($self->_percent);
2999}
3000
3001#############################################################################
3002
2538package CFPlus::UI::Gauge; 3003package DC::UI::Gauge;
2539 3004
2540our @ISA = CFPlus::UI::VBox::; 3005our @ISA = DC::UI::VBox::;
2541 3006
2542sub new { 3007sub new {
2543 my ($class, %arg) = @_; 3008 my ($class, %arg) = @_;
2544 3009
2545 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
… …
2547 can_hover => 1, 3012 can_hover => 1,
2548 can_events => 1, 3013 can_events => 1,
2549 %arg, 3014 %arg,
2550 ); 3015 );
2551 3016
2552 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3017 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2553 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3018 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2554 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3019 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2555 3020
2556 $self 3021 $self
2557} 3022}
2558 3023
2559sub set_fontsize { 3024sub set_fontsize {
… …
2580 $self->{value}->set_text ($val); 3045 $self->{value}->set_text ($val);
2581} 3046}
2582 3047
2583############################################################################# 3048#############################################################################
2584 3049
2585package CFPlus::UI::Slider; 3050package DC::UI::Slider;
2586 3051
2587use strict; 3052use strict;
2588 3053
2589use CFPlus::OpenGL; 3054use DC::OpenGL;
2590 3055
2591our @ISA = CFPlus::UI::DrawBG::; 3056our @ISA = DC::UI::DrawBG::;
2592 3057
2593my @tex = 3058my @tex =
2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3059 map { new_from_resource DC::Texture $_ }
2595 qw(s1_slider.png s1_slider_bg.png); 3060 qw(s1_slider.png s1_slider_bg.png);
2596 3061
2597sub new { 3062sub new {
2598 my $class = shift; 3063 my $class = shift;
2599 3064
… …
2636sub set_value { 3101sub set_value {
2637 my ($self, $value) = @_; 3102 my ($self, $value) = @_;
2638 3103
2639 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3104 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2640 3105
2641 $hi = $lo + 1 if $hi <= $lo; 3106 $hi = $lo if $hi < $lo;
2642 3107
2643 $page = $hi - $lo if $page > $hi - $lo; 3108 $value = $hi - $page if $value > $hi - $page;
2644
2645 $value = $lo if $value < $lo; 3109 $value = $lo if $value < $lo;
2646 $value = $hi - $page if $value > $hi - $page;
2647 3110
2648 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3111 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2649 if $unit; 3112 if $unit;
2650 3113
2651 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3114 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2667 3130
2668 $self->SUPER::invoke_button_down ($ev, $x, $y); 3131 $self->SUPER::invoke_button_down ($ev, $x, $y);
2669 3132
2670 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3133 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2671 3134
2672 $self->invoke_mouse_motion ($ev, $x, $y) 3135 $self->invoke_mouse_motion ($ev, $x, $y);
3136
3137 1
2673} 3138}
2674 3139
2675sub invoke_mouse_motion { 3140sub invoke_mouse_motion {
2676 my ($self, $ev, $x, $y) = @_; 3141 my ($self, $ev, $x, $y) = @_;
2677 3142
… …
2693sub invoke_mouse_wheel { 3158sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 3159 my ($self, $ev) = @_;
2695 3160
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3161 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 3162
3163 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3164
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3165 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 3166
2700 ! ! $delta 3167 1
2701} 3168}
2702 3169
2703sub update { 3170sub update {
2704 my ($self) = @_; 3171 my ($self) = @_;
2705 3172
… …
2711 my ($self) = @_; 3178 my ($self) = @_;
2712 3179
2713 unless ($self->{knob_w}) { 3180 unless ($self->{knob_w}) {
2714 $self->set_value ($self->{range}[0]); 3181 $self->set_value ($self->{range}[0]);
2715 3182
2716 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3183 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2717 my $range = ($hi - $page - $lo) || 1e-100; 3184 my $range = ($hi - $page - $lo) || 1e-10;
2718 3185
2719 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3186 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2720 3187
2721 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3188 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2722 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3189 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2723 3190
2724 $value = ($value - $lo) / $range; 3191 $value = ($value - $lo) / $range;
… …
2754 glDisable GL_TEXTURE_2D; 3221 glDisable GL_TEXTURE_2D;
2755} 3222}
2756 3223
2757############################################################################# 3224#############################################################################
2758 3225
2759package CFPlus::UI::ValSlider; 3226package DC::UI::ValSlider;
2760 3227
2761our @ISA = CFPlus::UI::HBox::; 3228our @ISA = DC::UI::HBox::;
2762 3229
2763sub new { 3230sub new {
2764 my ($class, %arg) = @_; 3231 my ($class, %arg) = @_;
2765 3232
2766 my $range = delete $arg{range}; 3233 my $range = delete $arg{range};
2767 3234
2768 my $self = $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
2769 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3236 slider => (new DC::UI::Slider expand => 1, range => $range),
2770 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3237 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2771 to_value => sub { shift }, 3238 to_value => sub { shift },
2772 from_value => sub { shift }, 3239 from_value => sub { shift },
2773 %arg, 3240 %arg,
2774 ); 3241 );
2775 3242
… …
2795sub set_range { shift->{slider}->set_range (@_) } 3262sub set_range { shift->{slider}->set_range (@_) }
2796sub set_value { shift->{slider}->set_value (@_) } 3263sub set_value { shift->{slider}->set_value (@_) }
2797 3264
2798############################################################################# 3265#############################################################################
2799 3266
2800package CFPlus::UI::TextScroller; 3267package DC::UI::TextScroller;
2801 3268
2802our @ISA = CFPlus::UI::HBox::; 3269our @ISA = DC::UI::HBox::;
2803 3270
2804use CFPlus::OpenGL; 3271use DC::OpenGL;
2805 3272
2806sub new { 3273sub new {
2807 my $class = shift; 3274 my $class = shift;
2808 3275
2809 my $self = $class->SUPER::new ( 3276 my $self = $class->SUPER::new (
… …
2811 can_events => 1, 3278 can_events => 1,
2812 indent => 0, 3279 indent => 0,
2813 #font => default_font 3280 #font => default_font
2814 @_, 3281 @_,
2815 3282
2816 layout => (new CFPlus::Layout), 3283 layout => (new DC::Layout),
2817 par => [], 3284 par => [],
3285 max_par => 0,
2818 height => 0, 3286 height => 0,
2819 children => [ 3287 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3288 (new DC::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3289 (new DC::UI::Slider vertical => 1),
2822 ], 3290 ],
2823 ); 3291 );
2824 3292
2825 $self->{children}[1]->connect (changed => sub { $self->update }); 3293 $self->{children}[1]->connect (changed => sub { $self->update });
2826 3294
… …
2835} 3303}
2836 3304
2837sub size_request { 3305sub size_request {
2838 my ($self) = @_; 3306 my ($self) = @_;
2839 3307
2840 my ($empty, $slider) = @{ $self->{children} }; 3308 my ($empty, $slider) = $self->visible_children;
2841 3309
2842 local $self->{children} = [$empty, $slider]; 3310 local $self->{children} = [$empty, $slider];
2843 $self->SUPER::size_request 3311 $self->SUPER::size_request
2844} 3312}
2845 3313
… …
2882 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3350 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2883 $layout->set_markup ($para->{markup}); 3351 $layout->set_markup ($para->{markup});
2884 3352
2885 $layout->set_shapes ( 3353 $layout->set_shapes (
2886 map 3354 map
2887 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3355 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2888 @{$para->{widget}} 3356 @{$para->{widget}}
2889 ); 3357 );
2890 3358
2891 $layout 3359 $layout
2892} 3360}
… …
2947 3415
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3416 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3417 push @{$self->{par}}, $para;
2950 } 3418 }
2951 3419
3420 if (my $max = $self->{max_par}) {
3421 shift @{$self->{par}} while @{$self->{par}} > $max;
3422 }
3423
2952 $self->{need_reflow}++; 3424 $self->{need_reflow}++;
2953 $self->update; 3425 $self->update;
2954} 3426}
2955 3427
2956sub scroll_to_bottom { 3428sub scroll_to_bottom {
… …
3005 $ROOT->on_post_alloc ($self => sub { 3477 $ROOT->on_post_alloc ($self => sub {
3006 $self->force_uptodate; 3478 $self->force_uptodate;
3007 3479
3008 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3480 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3009 3481
3010 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3482 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3011 glClearColor 0, 0, 0, 0; 3483 glClearColor 0, 0, 0, 0;
3012 glClear GL_COLOR_BUFFER_BIT; 3484 glClear GL_COLOR_BUFFER_BIT;
3013 3485
3014 package CFPlus::UI::Base; 3486 package DC::UI::Base;
3015 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3487 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3016 (0, 0, $self->{w}, $self->{h}); 3488 (0, 0, $self->{w}, $self->{h});
3017 3489
3018 my $top = int $self->{children}[1]{range}[0]; 3490 my $top = int $self->{children}[1]{range}[0];
3019 3491
… …
3030 3502
3031 if ($y0 < $y + $h && $y < $y1) { 3503 if ($y0 < $y + $h && $y < $y1) {
3032 my $layout = $self->get_layout ($para); 3504 my $layout = $self->get_layout ($para);
3033 3505
3034 $layout->render ($para->{indent}, $y - $y0); 3506 $layout->render ($para->{indent}, $y - $y0);
3507 $layout->draw;
3035 3508
3036 if (my @w = @{ $para->{widget} }) { 3509 if (my @w = @{ $para->{widget} }) {
3037 my @s = $layout->get_shapes; 3510 my @s = $layout->get_shapes;
3038 3511
3039 for (@w) { 3512 for (@w) {
… …
3077 $self->{children}[1]->draw; 3550 $self->{children}[1]->draw;
3078} 3551}
3079 3552
3080############################################################################# 3553#############################################################################
3081 3554
3082package CFPlus::UI::Animator; 3555package DC::UI::Animator;
3083 3556
3084use CFPlus::OpenGL; 3557use DC::OpenGL;
3085 3558
3086our @ISA = CFPlus::UI::Bin::; 3559our @ISA = DC::UI::Bin::;
3087 3560
3088sub moveto { 3561sub moveto {
3089 my ($self, $x, $y) = @_; 3562 my ($self, $x, $y) = @_;
3090 3563
3091 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3564 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3119 glPopMatrix; 3592 glPopMatrix;
3120} 3593}
3121 3594
3122############################################################################# 3595#############################################################################
3123 3596
3124package CFPlus::UI::Flopper; 3597package DC::UI::Flopper;
3125 3598
3126our @ISA = CFPlus::UI::Button::; 3599our @ISA = DC::UI::Button::;
3127 3600
3128sub new { 3601sub new {
3129 my $class = shift; 3602 my $class = shift;
3130 3603
3131 my $self = $class->SUPER::new ( 3604 my $self = $class->SUPER::new (
… …
3143 $self->{other}->toggle_visibility; 3616 $self->{other}->toggle_visibility;
3144} 3617}
3145 3618
3146############################################################################# 3619#############################################################################
3147 3620
3148package CFPlus::UI::Tooltip; 3621package DC::UI::Tooltip;
3149 3622
3150our @ISA = CFPlus::UI::Bin::; 3623our @ISA = DC::UI::Bin::;
3151 3624
3152use CFPlus::OpenGL; 3625use DC::OpenGL;
3153 3626
3154sub new { 3627sub new {
3155 my $class = shift; 3628 my $class = shift;
3156 3629
3157 $class->SUPER::new ( 3630 $class->SUPER::new (
… …
3161} 3634}
3162 3635
3163sub set_tooltip_from { 3636sub set_tooltip_from {
3164 my ($self, $widget) = @_; 3637 my ($self, $widget) = @_;
3165 3638
3166 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3167 if $widget->{tooltip} =~ /^#(.*)$/;
3168
3169 my $tooltip = $widget->{tooltip}; 3639 my $tip = $widget->{tooltip};
3640 $tip = $tip->($widget) if "CODE" eq ref $tip;
3641
3642 $tip = DC::Pod::section_label tooltip => $1
3643 if $tip =~ /^#(.*)$/;
3170 3644
3171 if ($ENV{CFPLUS_DEBUG} & 2) { 3645 if ($ENV{CFPLUS_DEBUG} & 2) {
3172 $tooltip .= "\n\n" . (ref $widget) . "\n" 3646 $tip .= "\n\n" . (ref $widget) . "\n"
3173 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3647 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3174 . "req $widget->{req_w} $widget->{req_h}\n" 3648 . "req $widget->{req_w} $widget->{req_h}\n"
3175 . "visible $widget->{visible}"; 3649 . "visible $widget->{visible}";
3176 } 3650 }
3177 3651
3178 $tooltip =~ s/^\n+//; 3652 $tip =~ s/^\n+//;
3179 $tooltip =~ s/\n+$//; 3653 $tip =~ s/\n+$//;
3180 3654
3181 $self->add (new CFPlus::UI::Label 3655 $self->add (new DC::UI::Label
3656 fg => $DC::THEME{tooltip_fg},
3182 markup => $tooltip, 3657 markup => $tip,
3183 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3658 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3659 align => 0,
3184 fontsize => 0.8, 3660 fontsize => 0.8,
3185 style => 1, # FLAG_INVERSE 3661 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3186 ellipsise => 0, 3662 ellipsise => 0,
3187 font => ($widget->{tooltip_font} || $::FONT_PROP), 3663 font => ($widget->{tooltip_font} || $::FONT_PROP),
3188 ); 3664 );
3189} 3665}
3190 3666
… …
3225} 3701}
3226 3702
3227sub _draw { 3703sub _draw {
3228 my ($self) = @_; 3704 my ($self) = @_;
3229 3705
3230 glTranslate 0.375, 0.375;
3231
3232 my ($w, $h) = @$self{qw(w h)}; 3706 my ($w, $h) = @$self{qw(w h)};
3233 3707
3234 glColor 1, 0.8, 0.4; 3708 glColor @{ $DC::THEME{tooltip_bg} };
3235 glBegin GL_QUADS; 3709 glRect 0, 0, $w, $h;
3236 glVertex 0 , 0;
3237 glVertex 0 , $h;
3238 glVertex $w, $h;
3239 glVertex $w, 0;
3240 glEnd;
3241 3710
3242 glColor 0, 0, 0; 3711 glColor @{ $DC::THEME{tooltip_border} };
3243 glBegin GL_LINE_LOOP; 3712 glRect_lineloop .5, .5, $w + .5, $h + .5;
3244 glVertex 0 , 0;
3245 glVertex 0 , $h;
3246 glVertex $w, $h;
3247 glVertex $w, 0;
3248 glEnd;
3249 3713
3250 glTranslate 2 - 0.375, 2 - 0.375; 3714 glTranslate 2, 2;
3251 3715
3252 $self->SUPER::_draw; 3716 $self->SUPER::_draw;
3253} 3717}
3254 3718
3255############################################################################# 3719#############################################################################
3256 3720
3257package CFPlus::UI::Face; 3721package DC::UI::Face;
3258 3722
3259our @ISA = CFPlus::UI::DrawBG::; 3723our @ISA = DC::UI::DrawBG::;
3260 3724
3261use CFPlus::OpenGL; 3725use DC::OpenGL;
3262 3726
3263sub new { 3727sub new {
3264 my $class = shift; 3728 my $class = shift;
3265 3729
3266 my $self = $class->SUPER::new ( 3730 my $self = $class->SUPER::new (
3731 size_w => 32,
3732 size_h => 8,
3267 aspect => 1, 3733 aspect => 1,
3268 can_events => 0, 3734 can_events => 0,
3269 @_, 3735 @_,
3270 ); 3736 );
3271 3737
3272 if ($self->{anim} && $self->{animspeed}) { 3738 $self->update_anim;
3273 Scalar::Util::weaken (my $widget = $self);
3274
3275 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1,
3278 interval => $self->{animspeed},
3279 cb => sub {
3280 ++$widget->{frame};
3281 $widget->update;
3282 },
3283 );
3284 }
3285 3739
3286 $self 3740 $self
3287} 3741}
3288 3742
3743sub update_timer {
3744 my ($self) = @_;
3745
3746 return unless $self->{timer};
3747
3748 if ($self->{visible}) {
3749 $self->{timer}->start;
3750 } else {
3751 $self->{timer}->stop;
3752 }
3753}
3754
3755sub update_face {
3756 my ($self) = @_;
3757
3758 if ($::CONN) {
3759 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3760 if ($anim && @$anim) {
3761 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3762 delete $self->{face_change_cb};
3763
3764 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3765 unless ($tex->{name} || $tex->{loading}) {
3766 $tex->upload (sub { $self->reconfigure });
3767 }
3768 }
3769 }
3770 }
3771 }
3772}
3773
3774sub update_anim {
3775 my ($self) = @_;
3776
3777 if ($self->{anim} && $self->{animspeed}) {
3778 DC::weaken (my $widget = $self);
3779
3780 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3781 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3782 return unless $::CONN;
3783
3784 my $w = $widget
3785 or return;
3786
3787 ++$w->{frame};
3788 $w->update_face;
3789
3790 # somehow, $widget can go away
3791 $w->update;
3792 $w->update_timer;
3793 };
3794
3795 $self->update_face;
3796 $self->update_timer;
3797 } else {
3798 delete $self->{timer};
3799 }
3800}
3801
3289sub size_request { 3802sub size_request {
3290 (32, 8) 3803 my ($self) = @_;
3804
3805 if ($::CONN) {
3806 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3807 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3808 if ($tex->{name}) {
3809 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3810 } elsif (!$tex->{loading}) {
3811 $tex->upload (sub { $self->reconfigure });
3812 }
3813 }
3814
3815 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3816 }
3817 }
3818
3819 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3820}
3292 3821
3293sub update { 3822sub update {
3294 my ($self) = @_; 3823 my ($self) = @_;
3295 3824
3296 return unless $self->{visible}; 3825 return unless $self->{visible};
3297 3826
3298 $self->SUPER::update; 3827 $self->SUPER::update;
3299} 3828}
3300 3829
3830sub set_face {
3831 my ($self, $face) = @_;
3832
3833 $self->{face} = $face;
3834 $self->reconfigure;
3835}
3836
3837sub set_anim {
3838 my ($self, $anim) = @_;
3839
3840 $self->{anim} = $anim;
3841 $self->update_anim;
3842}
3843
3844sub set_animspeed {
3845 my ($self, $animspeed) = @_;
3846
3847 $self->{animspeed} = $animspeed;
3848 $self->update_anim;
3849}
3850
3851sub invoke_visibility_change {
3852 my ($self) = @_;
3853
3854 $self->update_timer;
3855
3856 0
3857}
3858
3301sub _draw { 3859sub _draw {
3302 my ($self) = @_; 3860 my ($self) = @_;
3303 3861
3304 return unless $::CONN;
3305
3306 $self->SUPER::_draw; 3862 $self->SUPER::_draw;
3307 3863
3308 my $face; 3864 if (my $tex = $self->{tex}) {
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}];
3312
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3318
3319 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3865 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3867 glColor 0, 0, 0, 1;
3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3868 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324 glDisable GL_TEXTURE_2D; 3869 glDisable GL_TEXTURE_2D;
… …
3326} 3871}
3327 3872
3328sub destroy { 3873sub destroy {
3329 my ($self) = @_; 3874 my ($self) = @_;
3330 3875
3331 $self->{timer}->cancel 3876 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3877 if $self->{timer};
3333 3878
3334 $self->SUPER::destroy; 3879 $self->SUPER::destroy;
3335} 3880}
3336 3881
3337############################################################################# 3882#############################################################################
3338 3883
3339package CFPlus::UI::Buttonbar; 3884package DC::UI::Buttonbar;
3340 3885
3341our @ISA = CFPlus::UI::HBox::; 3886our @ISA = DC::UI::HBox::;
3342 3887
3343# TODO: should actually wrap buttons and other goodies. 3888# TODO: should actually wrap buttons and other goodies.
3344 3889
3345############################################################################# 3890#############################################################################
3346 3891
3347package CFPlus::UI::Menu; 3892package DC::UI::Menu;
3348 3893
3349our @ISA = CFPlus::UI::Toplevel::; 3894our @ISA = DC::UI::Toplevel::;
3350 3895
3351use CFPlus::OpenGL; 3896use DC::OpenGL;
3352 3897
3353sub new { 3898sub new {
3354 my $class = shift; 3899 my $class = shift;
3355 3900
3356 my $self = $class->SUPER::new ( 3901 my $self = $class->SUPER::new (
3357 items => [], 3902 items => [],
3358 z => 100, 3903 z => 100,
3359 @_, 3904 @_,
3360 ); 3905 );
3361 3906
3362 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3907 $self->add ($self->{vbox} = new DC::UI::VBox);
3363 3908
3364 for my $item (@{ $self->{items} }) { 3909 for my $item (@{ $self->{items} }) {
3365 my ($widget, $cb, $tooltip) = @$item; 3910 my ($widget, $cb, $tooltip) = @$item;
3366 3911
3367 # handle various types of items, only text for now 3912 # handle various types of items, only text for now
3368 if (!ref $widget) { 3913 if (!ref $widget) {
3369 if ($widget =~ /\t/) { 3914 if ($widget =~ /\t/) {
3370 my ($left, $right) = split /\t/, $widget, 2; 3915 my ($left, $right) = split /\t/, $widget, 2;
3371 3916
3372 $widget = new CFPlus::UI::HBox 3917 $widget = new DC::UI::HBox
3373 can_hover => 1, 3918 can_hover => 1,
3374 can_events => 1, 3919 can_events => 1,
3375 tooltip => $tooltip, 3920 tooltip => $tooltip,
3376 children => [ 3921 children => [
3377 (new CFPlus::UI::Label markup => $left, expand => 1), 3922 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3378 (new CFPlus::UI::Label markup => $right, align => +1), 3923 (new DC::UI::Label markup => $right, align => 1),
3379 ], 3924 ],
3380 ; 3925 ;
3381 3926
3382 } else { 3927 } else {
3383 $widget = new CFPlus::UI::Label 3928 $widget = new DC::UI::Label
3384 can_hover => 1, 3929 can_hover => 1,
3385 can_events => 1, 3930 can_events => 1,
3931 align => 0,
3386 markup => $widget, 3932 markup => $widget,
3387 tooltip => $tooltip; 3933 tooltip => $tooltip;
3388 } 3934 }
3389 } 3935 }
3390 3936
… …
3405 # maybe save $GRAB? must be careful about events... 3951 # maybe save $GRAB? must be careful about events...
3406 $GRAB = $self; 3952 $GRAB = $self;
3407 $self->{button} = $ev->{button}; 3953 $self->{button} = $ev->{button};
3408 3954
3409 $self->show; 3955 $self->show;
3410 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3956
3957 my $x = $ev->{x};
3958 my $y = $ev->{y};
3959
3960 $self->{root}->on_post_alloc ($self => sub {
3961 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3962 });
3963
3964 1 # so it can be used inside event handlers
3411} 3965}
3412 3966
3413sub invoke_mouse_motion { 3967sub invoke_mouse_motion {
3414 my ($self, $ev, $x, $y) = @_; 3968 my ($self, $ev, $x, $y) = @_;
3415 3969
… …
3436 1 3990 1
3437} 3991}
3438 3992
3439############################################################################# 3993#############################################################################
3440 3994
3441package CFPlus::UI::Multiplexer; 3995package DC::UI::Multiplexer;
3442 3996
3443our @ISA = CFPlus::UI::Container::; 3997our @ISA = DC::UI::Container::;
3444 3998
3445sub new { 3999sub new {
3446 my $class = shift; 4000 my $class = shift;
3447 4001
3448 my $self = $class->SUPER::new ( 4002 my $self = $class->SUPER::new (
3449 @_, 4003 @_,
3450 ); 4004 );
3451 4005
3452 $self->{current} = $self->{children}[0] 4006 $self->set_current_page (0);
3453 if @{ $self->{children} };
3454 4007
3455 $self 4008 $self
3456} 4009}
3457 4010
3458sub add { 4011sub add {
3459 my ($self, @widgets) = @_; 4012 my ($self, @widgets) = @_;
3460 4013
3461 $self->SUPER::add (@widgets); 4014 $self->SUPER::add (@widgets);
3462 4015
3463 $self->{current} = $self->{children}[0] 4016 $self->set_current_page (0)
3464 if @{ $self->{children} }; 4017 if @widgets == @{ $self->{children} };
3465} 4018}
3466 4019
3467sub get_current_page { 4020sub get_current_page {
3468 my ($self) = @_; 4021 my ($self) = @_;
3469 4022
… …
3475 4028
3476 my $widget = ref $page_or_widget 4029 my $widget = ref $page_or_widget
3477 ? $page_or_widget 4030 ? $page_or_widget
3478 : $self->{children}[$page_or_widget]; 4031 : $self->{children}[$page_or_widget];
3479 4032
4033 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4034
3480 $self->{current} = $widget; 4035 if (($self->{current} = $widget)) {
4036 $self->{current}->set_visible if $self->{current} && $self->{visible};
3481 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4037 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3482 4038
3483 $self->emit (page_changed => $self->{current}); 4039 $self->emit (page_changed => $self->{current});
4040 }
3484 4041
3485 $self->realloc; 4042 $self->realloc;
3486} 4043}
3487 4044
3488sub visible_children { 4045sub visible_children {
3489 $_[0]{current} 4046 $_[0]{current} || ()
3490} 4047}
3491 4048
3492sub size_request { 4049sub size_request {
3493 my ($self) = @_; 4050 my ($self) = @_;
3494 4051
4052 $self->{current}
3495 $self->{current}->size_request 4053 ? $self->{current}->size_request
4054 : (0, 0)
3496} 4055}
3497 4056
3498sub invoke_size_allocate { 4057sub invoke_size_allocate {
3499 my ($self, $w, $h) = @_; 4058 my ($self, $w, $h) = @_;
3500 4059
3501 $self->{current}->configure (0, 0, $w, $h); 4060 $self->{current}->configure (0, 0, $w, $h)
4061 if $self->{current};
3502 4062
3503 1 4063 1
3504} 4064}
3505 4065
3506sub _draw { 4066sub _draw {
3507 my ($self) = @_; 4067 my ($self) = @_;
3508 4068
3509 $self->{current}->draw; 4069 $self->{current}->draw
4070 if $self->{current};
3510} 4071}
3511 4072
3512############################################################################# 4073#############################################################################
3513 4074
3514package CFPlus::UI::Notebook; 4075package DC::UI::Notebook;
3515 4076
4077use DC::OpenGL;
4078
3516our @ISA = CFPlus::UI::VBox::; 4079our @ISA = DC::UI::VBox::;
3517 4080
3518sub new { 4081sub new {
3519 my $class = shift; 4082 my $class = shift;
3520 4083
3521 my $self = $class->SUPER::new ( 4084 my $self = $class->SUPER::new (
3522 buttonbar => (new CFPlus::UI::Buttonbar), 4085 buttonbar => (new DC::UI::Buttonbar),
3523 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4086 multiplexer => (new DC::UI::Multiplexer expand => 1),
4087 active_outline => [.7, .7, 0.2],
3524 # filter => # will be put between multiplexer and $self 4088 # filter => # will be put between multiplexer and $self
3525 @_, 4089 @_,
3526 ); 4090 );
3527 4091
3528 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4092 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3529 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4093 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3530 4094
4095 {
4096 Scalar::Util::weaken (my $wself = $self);
4097
4098 $self->{multiplexer}->connect (c_add => sub {
4099 my ($mplex, $widgets) = @_;
4100
4101 for my $child (@$widgets) {
4102 Scalar::Util::weaken $child;
4103 $child->{c_tab_} ||= do {
4104 my $tab =
4105 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4106 ? $child->{c_tab}
4107 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4108
4109 $tab->connect (activate => sub {
4110 $wself->set_current_page ($child);
4111 });
4112
4113 $tab
4114 };
4115
4116 $self->{buttonbar}->add ($child->{c_tab_});
4117 }
4118 });
4119
4120 $self->{multiplexer}->connect (c_remove => sub {
4121 my ($mplex, $widgets) = @_;
4122
4123 for my $child (@$widgets) {
4124 $wself->{buttonbar}->remove ($child->{c_tab_});
4125 }
4126 });
4127 }
4128
3531 $self 4129 $self
3532} 4130}
3533 4131
3534sub add { 4132sub add {
4133 my ($self, @widgets) = @_;
4134
4135 $self->{multiplexer}->add (@widgets)
4136}
4137
4138sub remove {
4139 my ($self, @widgets) = @_;
4140
4141 $self->{multiplexer}->remove (@widgets)
4142}
4143
4144sub pages {
4145 my ($self) = @_;
4146 $self->{multiplexer}->children
4147}
4148
4149sub page_index {
4150 my ($self, $widget) = @_;
4151
4152 my $i = 0;
4153 for ($self->pages) {
4154 if ($_ eq $widget) { return $i };
4155 $i++;
4156 }
4157
4158 undef
4159}
4160
4161sub add_tab {
3535 my ($self, $title, $widget, $tooltip) = @_; 4162 my ($self, $title, $widget, $tooltip) = @_;
3536 4163
3537 Scalar::Util::weaken $self; 4164 $title = [$title, $tooltip] unless ref $title;
4165 $widget->{c_tab} = $title;
3538 4166
3539 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title,
3541 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) },
3543 );
3544
3545 $self->{multiplexer}->add ($widget); 4167 $self->add ($widget);
3546} 4168}
3547 4169
3548sub get_current_page { 4170sub get_current_page {
3549 my ($self) = @_; 4171 my ($self) = @_;
3550 4172
… …
3556 4178
3557 $self->{multiplexer}->set_current_page ($page); 4179 $self->{multiplexer}->set_current_page ($page);
3558 $self->emit (page_changed => $self->{multiplexer}{current}); 4180 $self->emit (page_changed => $self->{multiplexer}{current});
3559} 4181}
3560 4182
4183sub _draw {
4184 my ($self) = @_;
4185
4186 $self->SUPER::_draw ();
4187
4188 if (my $cur = $self->{multiplexer}{current}) {
4189 if ($cur = $cur->{c_tab_}) {
4190 glTranslate $self->{buttonbar}{x} + $cur->{x},
4191 $self->{buttonbar}{y} + $cur->{y};
4192 glLineWidth 3;
4193 #glEnable GL_BLEND;
4194 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4195 glColor @{$self->{active_outline}};
4196 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4197 glLineWidth 1;
4198 #glDisable GL_BLEND;
4199 }
4200 }
4201}
4202
3561############################################################################# 4203#############################################################################
3562 4204
3563package CFPlus::UI::Selector; 4205package DC::UI::Selector;
3564 4206
3565use utf8; 4207use utf8;
3566 4208
3567our @ISA = CFPlus::UI::Button::; 4209our @ISA = DC::UI::Button::;
3568 4210
3569sub new { 4211sub new {
3570 my $class = shift; 4212 my $class = shift;
3571 4213
3572 my $self = $class->SUPER::new ( 4214 my $self = $class->SUPER::new (
… …
3589 my ($value, $title, $tooltip) = @$_; 4231 my ($value, $title, $tooltip) = @$_;
3590 4232
3591 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4233 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3592 } 4234 }
3593 4235
3594 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4236 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3595} 4237}
3596 4238
3597sub _set_value { 4239sub _set_value {
3598 my ($self, $value) = @_; 4240 my ($self, $value) = @_;
3599 4241
3600 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4242 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4243 $item ||= $self->{options}[0]
3601 or return; 4244 or return;
3602 4245
3603 $self->{value} = $item->[0]; 4246 $self->{value} = $item->[0];
3604 $self->set_markup ("$item->[1] ⇓"); 4247 $self->set_markup ("$item->[1] ⇓");
3605 $self->set_tooltip ($item->[2]); 4248# $self->set_tooltip ($item->[2]);
3606} 4249}
3607 4250
3608sub set_value { 4251sub set_value {
3609 my ($self, $value) = @_; 4252 my ($self, $value) = @_;
3610 4253
… …
3612 4255
3613 $self->_set_value ($value); 4256 $self->_set_value ($value);
3614 $self->emit (changed => $value); 4257 $self->emit (changed => $value);
3615} 4258}
3616 4259
4260sub set_options {
4261 my ($self, $options) = @_;
4262
4263 $self->{options} = $options;
4264 $self->_set_value ($self->{value});
4265}
4266
3617############################################################################# 4267#############################################################################
3618 4268
3619package CFPlus::UI::Statusbox; 4269package DC::UI::Statusbox;
3620 4270
3621our @ISA = CFPlus::UI::VBox::; 4271our @ISA = DC::UI::VBox::;
3622 4272
3623sub new { 4273sub new {
3624 my $class = shift; 4274 my $class = shift;
3625 4275
3626 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 4277 fontsize => 0.8,
3628 @_, 4278 @_,
3629 ); 4279 );
3630 4280
3631 Scalar::Util::weaken (my $this = $self); 4281 DC::weaken (my $this = $self);
3632 4282
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4283 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3634 4284
3635 $self 4285 $self
3636} 4286}
3637 4287
3638sub reorder { 4288sub reorder {
3639 my ($self) = @_; 4289 my ($self) = @_;
3640 my $NOW = Time::HiRes::time; 4290 my $NOW = EV::time;
3641 4291
3642 # freeze display when hovering over any label 4292 # freeze display when hovering over any label
3643 return if $CFPlus::UI::TOOLTIP->{owner} 4293 return if $DC::UI::TOOLTIP->{owner}
3644 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4294 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3645 values %{ $self->{item} }; 4295 values %{ $self->{item} };
3646 4296
3647 while (my ($k, $v) = each %{ $self->{item} }) { 4297 while (my ($k, $v) = each %{ $self->{item} }) {
3648 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4298 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3649 } 4299 }
4300
4301 $self->{timer}->set (1, 1);
3650 4302
3651 my @widgets; 4303 my @widgets;
3652 4304
3653 my @items = sort { 4305 my @items = sort {
3654 $a->{pri} <=> $b->{pri} 4306 $a->{pri} <=> $b->{pri}
3655 or $b->{id} <=> $a->{id} 4307 or $b->{id} <=> $a->{id}
3656 } values %{ $self->{item} }; 4308 } values %{ $self->{item} };
3657
3658 $self->{timer}->interval (1);
3659 4309
3660 my $count = 10 + 1; 4310 my $count = 10 + 1;
3661 for my $item (@items) { 4311 for my $item (@items) {
3662 last unless --$count; 4312 last unless --$count;
3663 4313
… …
3670 for ($short) { 4320 for ($short) {
3671 s/^\s+//; 4321 s/^\s+//;
3672 s/\s+/ /g; 4322 s/\s+/ /g;
3673 } 4323 }
3674 4324
3675 new CFPlus::UI::Label 4325 new DC::UI::Label
3676 markup => $short, 4326 markup => $short,
3677 tooltip => $item->{tooltip}, 4327 tooltip => $item->{tooltip},
3678 tooltip_font => $::FONT_PROP, 4328 tooltip_font => $::FONT_PROP,
3679 tooltip_width => 0.67, 4329 tooltip_width => 0.67,
3680 fontsize => $item->{fontsize} || $self->{fontsize}, 4330 fontsize => $item->{fontsize} || $self->{fontsize},
3681 max_w => $::WIDTH * 0.44, 4331 max_w => $::WIDTH * 0.44,
4332 align => 0,
3682 fg => [@{ $item->{fg} }], 4333 fg => [@{ $item->{fg} }],
3683 can_events => 1, 4334 can_events => 1,
3684 can_hover => 1 4335 can_hover => 1
3685 }; 4336 };
3686 4337
3687 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4338 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3688 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4339 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3689 $label->update; 4340 $label->update;
3690 $label->set_max_size (undef, $label->{req_h} * $diff) 4341 $label->set_max_size (undef, $label->{req_h} * $diff)
3691 if $diff < 1; 4342 if $diff < 1;
3692 $self->{timer}->interval (1/30); 4343 $self->{timer}->set (1/30, 1/30);
3693 } else { 4344 } else {
3694 $label->{fg}[3] = $item->{fg}[3] || 1; 4345 $label->{fg}[3] = $item->{fg}[3] || 1;
3695 } 4346 }
3696 4347
3697 push @widgets, $label; 4348 push @widgets, $label;
3698 } 4349 }
4350
4351 my $hash = join ",", @widgets;
4352 return if $hash eq $self->{last_widget_hash};
4353 $self->{last_widget_hash} = $hash;
3699 4354
3700 $self->clear; 4355 $self->clear;
3701 $self->SUPER::add (reverse @widgets); 4356 $self->SUPER::add (reverse @widgets);
3702} 4357}
3703 4358
… …
3759 $self->SUPER::destroy; 4414 $self->SUPER::destroy;
3760} 4415}
3761 4416
3762############################################################################# 4417#############################################################################
3763 4418
3764package CFPlus::UI::Root; 4419package DC::UI::Root;
3765 4420
3766our @ISA = CFPlus::UI::Container::; 4421our @ISA = DC::UI::Container::;
3767 4422
3768use List::Util qw(min max); 4423use List::Util qw(min max);
3769 4424
3770use CFPlus::OpenGL; 4425use DC::OpenGL;
3771 4426
3772sub new { 4427sub new {
3773 my $class = shift; 4428 my $class = shift;
3774 4429
3775 my $self = $class->SUPER::new ( 4430 my $self = $class->SUPER::new (
3776 visible => 1, 4431 visible => 1,
3777 @_, 4432 @_,
3778 ); 4433 );
3779 4434
3780 Scalar::Util::weaken ($self->{root} = $self); 4435 DC::weaken ($self->{root} = $self);
3781 4436
3782 $self 4437 $self
3783} 4438}
3784 4439
3785sub size_request { 4440sub size_request {
… …
3833} 4488}
3834 4489
3835sub update { 4490sub update {
3836 my ($self) = @_; 4491 my ($self) = @_;
3837 4492
3838 $::WANT_REFRESH++; 4493 $::WANT_REFRESH = 1;
3839} 4494}
3840 4495
3841sub add { 4496sub add {
3842 my ($self, @children) = @_; 4497 my ($self, @children) = @_;
3843 4498
… …
3880 while ($self->{refresh_hook}) { 4535 while ($self->{refresh_hook}) {
3881 $_->() 4536 $_->()
3882 for values %{delete $self->{refresh_hook}}; 4537 for values %{delete $self->{refresh_hook}};
3883 } 4538 }
3884 4539
3885 if ($self->{realloc}) { 4540 while ($self->{realloc}) {
3886 my %queue; 4541 my %queue;
3887 my @queue; 4542 my @queue;
3888 my $widget; 4543 my $widget;
3889 4544
3890 outer: 4545 outer:
… …
3910 4565
3911 delete $queue{$widget+0}; 4566 delete $queue{$widget+0};
3912 4567
3913 my ($w, $h) = $widget->size_request; 4568 my ($w, $h) = $widget->size_request;
3914 4569
3915 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4570 $w += $widget->{padding_x} * 2;
3916 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4571 $h += $widget->{padding_y} * 2;
4572
4573 $w = max $widget->{min_w}, $w;
4574 $h = max $widget->{min_h}, $h;
3917 4575
3918 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4576 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3919 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4577 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3920 4578
3921 $w = $widget->{force_w} if exists $widget->{force_w}; 4579 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3937 } 4595 }
3938 } 4596 }
3939 4597
3940 delete $self->{realloc}{$widget+0}; 4598 delete $self->{realloc}{$widget+0};
3941 } 4599 }
3942 }
3943 4600
3944 while (my $size_alloc = delete $self->{size_alloc}) { 4601 while (my $size_alloc = delete $self->{size_alloc}) {
3945 my @queue = sort { $b->{visible} <=> $a->{visible} } 4602 my @queue = sort { $a->{visible} <=> $b->{visible} }
3946 values %$size_alloc; 4603 values %$size_alloc;
3947 4604
3948 while () { 4605 while () {
3949 my $widget = pop @queue || last; 4606 my $widget = pop @queue || last;
3950 4607
3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4608 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3952 4609
3953 $w = 0 if $w < 0;
3954 $h = 0 if $h < 0;
3955
3956 $w = max $widget->{min_w}, $w; 4610 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h; 4611 $h = max $widget->{min_h}, $h;
3958 4612
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4613# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4614# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961 4615
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4616 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4617 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964 4618
3965 $w = int $w + 0.5; 4619 $w = int $w + 0.5;
3966 $h = int $h + 0.5; 4620 $h = int $h + 0.5;
3967 4621
3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4622 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3969 $widget->{old_w} = $widget->{w}; 4623 $widget->{old_w} = $widget->{w};
3970 $widget->{old_h} = $widget->{h}; 4624 $widget->{old_h} = $widget->{h};
3971 4625
3972 $widget->{w} = $w; 4626 $widget->{w} = $w;
3973 $widget->{h} = $h; 4627 $widget->{h} = $h;
3974 4628
3975 $widget->emit (size_allocate => $w, $h); 4629 $widget->emit (size_allocate => $w, $h);
4630 }
3976 } 4631 }
3977 } 4632 }
3978 } 4633 }
3979 4634
3980 while ($self->{post_alloc_hook}) { 4635 while ($self->{post_alloc_hook}) {
3981 $_->() 4636 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4637 for values %{delete $self->{post_alloc_hook}};
3983 } 4638 }
3984
3985 4639
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4640 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4641 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4642 glClear GL_COLOR_BUFFER_BIT;
3989 4643
… …
3992 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4646 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3993 glMatrixMode GL_MODELVIEW; 4647 glMatrixMode GL_MODELVIEW;
3994 glLoadIdentity; 4648 glLoadIdentity;
3995 4649
3996 { 4650 {
3997 package CFPlus::UI::Base; 4651 package DC::UI::Base;
3998 4652
3999 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4653 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4000 (0, 0, $self->{w}, $self->{h}); 4654 (0, 0, $self->{w}, $self->{h});
4001 4655
4002 $self->_draw; 4656 $self->_draw;
4003 } 4657 }
4004} 4658}
4005 4659
4006############################################################################# 4660#############################################################################
4007 4661
4008package CFPlus::UI; 4662package DC::UI;
4009 4663
4010$ROOT = new CFPlus::UI::Root; 4664$ROOT = new DC::UI::Root;
4011$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4665$TOOLTIP = new DC::UI::Tooltip z => 900;
4012 4666
40131 46671
4014

Diff Legend

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