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

Diff Legend

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