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.365 by root, Thu Apr 12 07:53:31 2007 UTC vs.
Revision 1.473 by root, Sun Jan 11 03:19:47 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines