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

Diff Legend

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