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.418 by elmex, Tue Jul 24 18:39:39 2007 UTC vs.
Revision 1.487 by root, Fri Nov 23 12:14:02 2012 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Event; 7use AnyEvent ();
8use Guard ();
8 9
9use CFPlus; 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) {
57 my $win = $layout->{$_->{name}} = { }; 56 my $win = $layout->{$_->{name}} = { };
58 57
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 58 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 59 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 60 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 61 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63 62
72 71
73 $LAYOUT = $layout; 72 $LAYOUT = $layout;
74} 73}
75 74
76# class methods for events 75# class methods for events
77sub feed_sdl_key_down_event { 76sub feed_sdl_key_down_event {
78 $FOCUS->emit (key_down => $_[0]) 77 $FOCUS->emit (key_down => $_[0])
79 if $FOCUS; 78 if $FOCUS;
80} 79}
81 80
82sub feed_sdl_key_up_event { 81sub feed_sdl_key_up_event {
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 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $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.]+$/;
199 $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.]+$/;
200 199
201 $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.]+$/;
202 $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};
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use common::sense;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $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};
256 $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};
257 $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};
258 $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};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __w_ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 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);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
358} 363}
359 364
360sub set_size { 365sub set_size {
361 my ($self, $w, $h) = @_; 366 my ($self, $w, $h) = @_;
362 367
363 $self->{force_w} = $w; 368 $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
364 $self->{force_h} = $h; 369 $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
365 370
366 $self->realloc; 371 $self->realloc;
372}
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)
367} 390}
368 391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
605} 628}
606 629
607sub DESTROY { 630sub DESTROY {
608 my ($self) = @_; 631 my ($self) = @_;
609 632
610 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
611 634
635 local $@;
612 eval { $self->destroy }; 636 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 638
615 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
616} 640}
617 641
618############################################################################# 642#############################################################################
619 643
620package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
621 645
622our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
623 647
624use strict; 648use common::sense;
649
625use CFPlus::OpenGL; 650use DC::OpenGL;
626 651
627sub new { 652sub new {
628 my $class = shift; 653 my $class = shift;
629
630 # range [value, low, high, page]
631 654
632 $class->SUPER::new ( 655 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 656 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
635 @_ 658 @_
636 ) 659 )
637} 660}
638 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
639sub _draw { 669sub _draw {
640 my ($self) = @_; 670 my ($self) = @_;
641 671
642 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
643 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
644 : $self->{bg}; 674 : $self->{bg};
645 675
646 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
647 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
648 678
649 glEnable GL_BLEND; 679 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 681 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 682 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 683 glDisable GL_BLEND;
661 } 684 }
662} 685}
663 686
664############################################################################# 687#############################################################################
665 688
666package CFPlus::UI::Empty; 689package DC::UI::Empty;
667 690
668our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
669 692
670sub new { 693sub new {
671 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
673} 696}
680 703
681sub draw { } 704sub draw { }
682 705
683############################################################################# 706#############################################################################
684 707
685package CFPlus::UI::Container; 708package DC::UI::Container;
686 709
687our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
688 711
689sub new { 712sub new {
690 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
691 714
692 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
786 $_->draw for $self->visible_children; 809 $_->draw for $self->visible_children;
787} 810}
788 811
789############################################################################# 812#############################################################################
790 813
791package CFPlus::UI::Bin; 814package DC::UI::Bin;
792 815
793our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
794 817
795sub new { 818sub new {
796 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
797 820
798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
799 822
800 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
801} 824}
802 825
803sub add { 826sub add {
810sub remove { 833sub remove {
811 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
812 835
813 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
814 837
815 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
816 unless @{$self->{children}}; 839 unless @{$self->{children}};
817} 840}
818 841
819sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
820 843
829 852
830 1 853 1
831} 854}
832 855
833############################################################################# 856#############################################################################
834
835# back-buffered drawing area 857# back-buffered drawing area
836 858
837package CFPlus::UI::Window; 859package DC::UI::Window;
838 860
839our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
840 862
841use CFPlus::OpenGL; 863use DC::OpenGL;
842 864
843sub new { 865sub new {
844 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
845 867
846 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
868} 890}
869 891
870sub render_child { 892sub render_child {
871 my ($self) = @_; 893 my ($self) = @_;
872 894
873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
874 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
875 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
876 898
877 { 899 {
878 package CFPlus::UI::Base; 900 package DC::UI::Base;
879 901
880 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
881 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
882 904
883 $self->_render; 905 $self->_render;
900 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
901} 923}
902 924
903############################################################################# 925#############################################################################
904 926
905package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
906 928
907use List::Util qw(min max); 929use List::Util qw(min max);
908 930
909our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
910 932
911sub new { 933sub new {
912 my $class = shift; 934 my $class = shift;
913 935
914 $class->SUPER::new ( 936 $class->SUPER::new (
998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
999 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1000 ) { 1022 ) {
1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1002 } else { 1024 } else {
1003 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
1004 } 1026 }
1005} 1027}
1006 1028
1007sub _render { 1029sub _render {
1008 my ($self) = @_; 1030 my ($self) = @_;
1009 1031
1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1012 1034
1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1014 1036
1015 $self->SUPER::_render; 1037 $self->SUPER::_render;
1016} 1038}
1017 1039
1018############################################################################# 1040#############################################################################
1019 1041
1020package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
1021 1043
1022our @ISA = CFPlus::UI::Table::; 1044our @ISA = DC::UI::Table::;
1023 1045
1024sub new { 1046sub new {
1025 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1026 1048
1027 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1028 1050
1029 my $self; 1051 my $self;
1030 1052
1031 my $hslider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1032 col => 0, 1054 c_col => 0,
1033 row => 1, 1055 c_row => 1,
1034 vertical => 0, 1056 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1058 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1059 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1061 },
1040 ; 1062 ;
1041 1063
1042 my $vslider = new CFPlus::UI::Slider 1064 my $vslider = new DC::UI::Slider
1043 col => 1, 1065 c_col => 1,
1044 row => 0, 1066 c_row => 0,
1045 vertical => 1, 1067 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1069 on_changed => sub {
1048 $self->{vpos} = $_[1]; 1070 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 col_expand => [1, 0], 1081 col_expand => [1, 0],
1060 row_expand => [1, 0], 1082 row_expand => [1, 0],
1061 %arg, 1083 %arg,
1062 ); 1084 );
1063 1085
1064 $self->{vp} = new CFPlus::UI::ViewPort 1086 $self->{vp} = new DC::UI::ViewPort
1065 col => 0, 1087 c_col => 0,
1066 row => 0, 1088 c_row => 0,
1067 expand => 1, 1089 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1090 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1091 scroll_y => $self->{scroll_y},
1070 on_changed => sub { 1092 on_changed => sub {
1071 my ($vp, $x, $y) = @_; 1093 my ($vp, $x, $y) = @_;
1134 1156
1135 $self->grab_focus; 1157 $self->grab_focus;
1136 1158
1137 my $ox = $self->{vp}{view_x}; 1159 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y}; 1160 my $oy = $self->{vp}{view_y};
1139 1161
1140 $self->{motion} = sub { 1162 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
1142 1164
1143 $ox -= $ev->{xrel}; 1165 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel}; 1166 $oy -= $ev->{yrel};
1195 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1196} 1218}
1197 1219
1198############################################################################# 1220#############################################################################
1199 1221
1200package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1201 1223
1202our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1203 1225
1204use CFPlus::OpenGL; 1226use DC::OpenGL;
1205 1227
1206sub new { 1228sub new {
1207 my $class = shift; 1229 my $class = shift;
1208 1230
1209 $class->SUPER::new ( 1231 $class->SUPER::new (
1219 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1220 1242
1221 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1233 } 1248 }
1234 1249
1235 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1236} 1251}
1237 1252
1238############################################################################# 1253#############################################################################
1239 1254
1240package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1241 1256
1242our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1243 1258
1244use CFPlus::OpenGL; 1259use DC::OpenGL;
1245 1260
1246sub new { 1261sub new {
1247 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1248 1263
1249 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1251 align => 1, 1266 align => 1,
1252 valign => 0, 1267 valign => 0.5,
1253 text => $arg{label}, 1268 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1255 } 1270 }
1256 1271
1257 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1258 # label => "", 1273 # label => "",
1259 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1260 border => 0.8, 1275 border => 0.8,
1261 style => 'single', 1276 style => 'single',
1262 %arg, 1277 %arg,
1263 ); 1278 );
1264 1279
1267 1282
1268sub add { 1283sub add {
1269 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1270 1285
1271 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273} 1288}
1274 1289
1275sub border { 1290sub border {
1276 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1277} 1292}
1317 my $border = $self->border; 1332 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1319 1334
1320 $child->draw; 1335 $child->draw;
1321 1336
1322 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1323 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 } 1350 }
1336} 1351}
1337 1352
1338############################################################################# 1353#############################################################################
1339 1354
1340package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1341 1356
1342our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1343 1358
1344use CFPlus::OpenGL; 1359use DC::OpenGL;
1345 1360
1346my $bg = 1361my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1348 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1349 1364
1350my @border = 1365my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 map { new_from_resource DC::Texture $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353 1368
1354my @icon = 1369my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png); 1371 qw(x1_move.png x1_resize.png);
1357 1372
1358sub new { 1373sub new {
1359 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1360 1375
1361 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1362 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1363 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1364 border => 0.6, 1379 border => 0.8,
1365 can_events => 1, 1380 can_events => 1,
1366 min_w => 64, 1381 min_w => 64,
1367 min_h => 32, 1382 min_h => 32,
1368 %arg, 1383 %arg,
1369 ); 1384 );
1370 1385
1371 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1372 align => 0, 1387 align => 0.5,
1373 valign => 1, 1388 valign => 1,
1374 text => $self->{title}, 1389 text => $self->{title},
1375 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1376 if exists $self->{title}; 1391 if exists $self->{title};
1377 1392
1378 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1379 $self->{close_button} = 1394 $self->{close_button} =
1380 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1381 path => 'x1_close.png', 1396 path => 'x1_close.png',
1382 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1383 1398
1384 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1385 } 1400 }
1386 1401
1387 $self 1402 $self
1388} 1403}
1389 1404
1390sub add { 1405sub add {
1391 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1392 1407
1393 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1396} 1411}
1397 1412
1398sub border { 1413sub border {
1399 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1415}
1416
1417sub get_max_wh {
1418 my ($self) = @_;
1419
1420 return ($self->{w}, $self->{h})
1421 if $self->{visible} && $self->{w};
1422
1423 $self->SUPER::get_max_wh
1400} 1424}
1401 1425
1402sub size_request { 1426sub size_request {
1403 my ($self) = @_; 1427 my ($self) = @_;
1404 1428
1440 1464
1441sub invoke_delete { 1465sub invoke_delete {
1442 my ($self) = @_; 1466 my ($self) = @_;
1443 1467
1444 $self->hide; 1468 $self->hide;
1445 1469
1446 1 1470 1
1447} 1471}
1448 1472
1449sub invoke_button_down { 1473sub invoke_button_down {
1450 my ($self, $ev, $x, $y) = @_; 1474 my ($self, $ev, $x, $y) = @_;
1451 1475
1452 my ($w, $h) = @$self{qw(w h)}; 1476 my ($w, $h) = @$self{qw(w h)};
1453 my $border = $self->border; 1477 my $border = $self->border;
1454 1478
1455 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); 1479 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
1456 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); 1480 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
1457 1481
1458 if ($lr & $td) { 1482 if ($lr & $td) { # corners
1459 my ($wx, $wy) = ($self->{x}, $self->{y}); 1483 my ($wx, $wy) = ($self->{x}, $self->{y});
1460 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1484 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1461 my ($bw, $bh) = ($self->{w}, $self->{h}); 1485 my ($bw, $bh) = ($self->{w}, $self->{h});
1462 1486
1463 my $mx = $x < $border; 1487 my $mx = $x < $border;
1467 my ($ev, $x, $y) = @_; 1491 my ($ev, $x, $y) = @_;
1468 1492
1469 my $dx = $ev->{x} - $ox; 1493 my $dx = $ev->{x} - $ox;
1470 my $dy = $ev->{y} - $oy; 1494 my $dy = $ev->{y} - $oy;
1471 1495
1496 $self->set_size (
1472 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1497 $bw + $dx * ($mx ? -1 : 1),
1473 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1498 $bh + $dy * ($my ? -1 : 1),
1499 );
1474 1500
1475 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); 1501 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1476 $self->realloc; 1502 $self->realloc;
1477 }; 1503 };
1478 1504
1479 } elsif ($lr ^ $td) { 1505 } elsif ($lr ^ $td) { # edges
1480 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1506 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1481 my ($bx, $by) = ($self->{x}, $self->{y}); 1507 my ($bx, $by) = ($self->{x}, $self->{y});
1482 1508
1483 $self->{motion} = sub { 1509 $self->{motion} = sub {
1484 my ($ev, $x, $y) = @_; 1510 my ($ev, $x, $y) = @_;
1529 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 1557
1532 my $border = $self->border; 1558 my $border = $self->border;
1533 1559
1560 if ($border) {
1534 glColor @{ $self->{border_bg} }; 1561 glColor @{ $self->{border_bg} };
1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1562 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1563 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1564 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1565 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539 1566
1540 # move 1567 # move
1541 my $w2 = ($w - $border) * .5; 1568 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5; 1569 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1570 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1571 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1572 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546 1573
1547 # resize 1574 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1576 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button}; 1577 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1578 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1579 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1580 }
1553 1581
1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1582 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1555 glColor @{ $self->{bg} }; 1583 glColor @{ $self->{bg} };
1556 1584
1557 # TODO: repeat texture not scale 1585 # TODO: repeat texture not scale
1576 if $self->{close_button}; 1604 if $self->{close_button};
1577} 1605}
1578 1606
1579############################################################################# 1607#############################################################################
1580 1608
1581package CFPlus::UI::Table; 1609package DC::UI::Table;
1582 1610
1583our @ISA = CFPlus::UI::Container::; 1611our @ISA = DC::UI::Container::;
1584 1612
1585use List::Util qw(max sum); 1613use List::Util qw(max sum);
1586 1614
1587use CFPlus::OpenGL; 1615use DC::OpenGL;
1588 1616
1589sub new { 1617sub new {
1590 my $class = shift; 1618 my $class = shift;
1591 1619
1592 $class->SUPER::new ( 1620 $class->SUPER::new (
1598 1626
1599sub add { 1627sub add {
1600 my ($self, @widgets) = @_; 1628 my ($self, @widgets) = @_;
1601 1629
1602 for my $child (@widgets) { 1630 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1; 1631 $child->{c_rowspan} ||= 1;
1604 $child->{colspan} ||= 1; 1632 $child->{c_colspan} ||= 1;
1605 } 1633 }
1606 1634
1607 $self->SUPER::add (@widgets); 1635 $self->SUPER::add (@widgets);
1608} 1636}
1609 1637
1613 my @widgets; 1641 my @widgets;
1614 1642
1615 while (@_) { 1643 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, (); 1644 my ($col, $row, $child) = splice @_, 0, 3, ();
1617 1645
1618 $child->{row} = $row; 1646 $child->{c_row} = $row;
1619 $child->{col} = $col; 1647 $child->{c_col} = $col;
1620 1648
1621 push @widgets, $child; 1649 push @widgets, $child;
1622 } 1650 }
1623 1651
1624 $self->add (@widgets); 1652 $self->add (@widgets);
1630 my (@w, @h); 1658 my (@w, @h);
1631 1659
1632 my @children = $self->children; 1660 my @children = $self->children;
1633 1661
1634 # first pass, columns 1662 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1663 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1664 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1665
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1666 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1667
1640 if ($w > $sw) { 1668 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1669 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1670 }
1643 } 1671 }
1644 1672
1645 # second pass, rows 1673 # second pass, rows
1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1674 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1675 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1676
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1677 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1678
1651 if ($h > $sh) { 1679 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1680 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1653 } 1681 }
1654 } 1682 }
1655 1683
1656 (\@w, \@h) 1684 (\@w, \@h)
1657} 1685}
1680 @col_expand = (1) x @$ws unless @col_expand; 1708 @col_expand = (1) x @$ws unless @col_expand;
1681 my $col_expand = (sum @col_expand) || 1; 1709 my $col_expand = (sum @col_expand) || 1;
1682 1710
1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1711 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1684 1712
1685 CFPlus::UI::harmonize $ws; 1713 DC::UI::harmonize $ws;
1686 1714
1687 my @row_expand = @{$self->{row_expand}}; 1715 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand; 1716 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1; 1717 my $row_expand = (sum @row_expand) || 1;
1690 1718
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1719 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692 1720
1693 CFPlus::UI::harmonize $hs; 1721 DC::UI::harmonize $hs;
1694 1722
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1723 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1724 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1725
1698 for my $widget ($self->children) { 1726 for my $widget ($self->children) {
1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1727 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1700 1728
1701 $widget->configure ( 1729 $widget->configure (
1702 $x[$c], $y[$r], 1730 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1731 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1704 ); 1732 );
1707 1 1735 1
1708} 1736}
1709 1737
1710############################################################################# 1738#############################################################################
1711 1739
1712package CFPlus::UI::Fixed; 1740package DC::UI::Fixed;
1713 1741
1714use List::Util qw(min max); 1742use List::Util qw(min max);
1715 1743
1716our @ISA = CFPlus::UI::Container::; 1744our @ISA = DC::UI::Container::;
1717 1745
1718sub _scale($$$) { 1746sub _scale($$$) {
1719 my ($rel, $val, $max) = @_; 1747 my ($rel, $val, $max) = @_;
1720 1748
1721 $rel ? $val * $max : $val 1749 $rel ? $val * $max : $val
1773 1 1801 1
1774} 1802}
1775 1803
1776############################################################################# 1804#############################################################################
1777 1805
1778package CFPlus::UI::Box; 1806package DC::UI::Box;
1779 1807
1780our @ISA = CFPlus::UI::Container::; 1808our @ISA = DC::UI::Container::;
1781 1809
1782sub size_request { 1810sub size_request {
1783 my ($self) = @_; 1811 my ($self) = @_;
1784 1812
1785 my @children = $self->visible_children; 1813 my @children = $self->visible_children;
1812 if ($req > $space) { 1840 if ($req > $space) {
1813 # ah well, not enough space 1841 # ah well, not enough space
1814 $_ *= $space / $req for @req; 1842 $_ *= $space / $req for @req;
1815 } else { 1843 } else {
1816 my $expand = (List::Util::sum map $_->{expand}, @children) || 1; 1844 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1817 1845
1818 $space = ($space - $req) / $expand; # remaining space to give away 1846 $space = ($space - $req) / $expand; # remaining space to give away
1819 1847
1820 $req[$_] += $space * $children[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1821 for 0 .. $#children; 1849 for 0 .. $#children;
1822 } 1850 }
1823 } 1851 }
1824 1852
1825 CFPlus::UI::harmonize \@req; 1853 DC::UI::harmonize \@req;
1826 1854
1827 my $pos = 0; 1855 my $pos = 0;
1828 for (0 .. $#children) { 1856 for (0 .. $#children) {
1829 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1835 1 1863 1
1836} 1864}
1837 1865
1838############################################################################# 1866#############################################################################
1839 1867
1840package CFPlus::UI::HBox; 1868package DC::UI::HBox;
1841 1869
1842our @ISA = CFPlus::UI::Box::; 1870our @ISA = DC::UI::Box::;
1843 1871
1844sub new { 1872sub new {
1845 my $class = shift; 1873 my $class = shift;
1846 1874
1847 $class->SUPER::new ( 1875 $class->SUPER::new (
1850 ) 1878 )
1851} 1879}
1852 1880
1853############################################################################# 1881#############################################################################
1854 1882
1855package CFPlus::UI::VBox; 1883package DC::UI::VBox;
1856 1884
1857our @ISA = CFPlus::UI::Box::; 1885our @ISA = DC::UI::Box::;
1858 1886
1859sub new { 1887sub new {
1860 my $class = shift; 1888 my $class = shift;
1861 1889
1862 $class->SUPER::new ( 1890 $class->SUPER::new (
1865 ) 1893 )
1866} 1894}
1867 1895
1868############################################################################# 1896#############################################################################
1869 1897
1870package CFPlus::UI::Label; 1898package DC::UI::Label;
1871 1899
1872our @ISA = CFPlus::UI::DrawBG::; 1900our @ISA = DC::UI::DrawBG::;
1873 1901
1874use CFPlus::OpenGL; 1902use DC::OpenGL;
1875 1903
1876sub new { 1904sub new {
1877 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1878 1906
1879 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
1884 #text => initial text 1912 #text => initial text
1885 #markup => initial narkup 1913 #markup => initial narkup
1886 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1887 #style => 0, # render flags 1915 #style => 0, # render flags
1888 ellipsise => 3, # end 1916 ellipsise => 3, # end
1889 layout => (new CFPlus::Layout), 1917 layout => (new DC::Layout),
1890 fontsize => 1, 1918 fontsize => 1,
1891 align => -1, 1919 align => 0.5,
1892 valign => -1, 1920 valign => 0.5,
1893 padding_x => 2, 1921 padding_x => 4,
1894 padding_y => 2, 1922 padding_y => 2,
1895 can_events => 0, 1923 can_events => 0,
1896 %arg 1924 %arg
1897 ); 1925 );
1898 1926
1899 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1900 my $layout = new CFPlus::Layout; 1928 my $layout = new DC::Layout;
1901 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1902 $self->{template} = $layout; 1930 $self->{template} = $layout;
1903 } 1931 }
1904 1932
1905 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
1923 1951
1924 delete $self->{ox}; 1952 delete $self->{ox};
1925 $self->SUPER::realloc; 1953 $self->SUPER::realloc;
1926} 1954}
1927 1955
1956sub clear {
1957 my ($self) = @_;
1958
1959 $self->set_text ("");
1960}
1961
1928sub set_text { 1962sub set_text {
1929 my ($self, $text) = @_; 1963 my ($self, $text) = @_;
1930 1964
1931 return if $self->{text} eq "T$text"; 1965 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1966 $self->{text} = "T$text";
1955 1989
1956sub size_request { 1990sub size_request {
1957 my ($self) = @_; 1991 my ($self) = @_;
1958 1992
1959 $self->{size_req} ||= do { 1993 $self->{size_req} ||= do {
1994 my ($max_w, $max_h) = $self->get_max_wh;
1995
1960 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1996 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_width ($self->{max_w} || -1); 1997 $self->{layout}->set_width ($max_w);
1962 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1998 $self->{layout}->set_ellipsise ($self->{ellipsise});
1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1999 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2000 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1965 2001
1966 my ($w, $h) = $self->{layout}->size; 2002 my ($w, $h) = $self->{layout}->size;
1967 2003
1968 if (exists $self->{template}) { 2004 if (exists $self->{template}) {
1969 $self->{template}->set_font ($self->{font}) if $self->{font}; 2005 $self->{template}->set_font ($self->{font}) if $self->{font};
1970 $self->{template}->set_width ($self->{max_w} || -1); 2006 $self->{template}->set_width ($max_w);
1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1972 2008
1973 my ($w2, $h2) = $self->{template}->size; 2009 my ($w2, $h2) = $self->{template}->size;
1974 2010
1975 $w = List::Util::max $w, $w2; 2011 $w = List::Util::max $w, $w2;
2031 2067
2032 [$self->{layout}->size] 2068 [$self->{layout}->size]
2033 }; 2069 };
2034 2070
2035 unless (exists $self->{ox}) { 2071 unless (exists $self->{ox}) {
2036 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2072 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2037 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2073 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2038 : ($self->{w} - $size->[0]) * 0.5);
2039 2074
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2075 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5);
2043 }; 2076 };
2044 2077
2045# unless ($self->{list}) { 2078# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2079# $self->{list} = DC::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2080# DC::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2081# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList; 2082# DC::OpenGL::glEndList;
2050# } 2083# }
2051# 2084#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2085# DC::OpenGL::glCallList $self->{list};
2053 2086
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2087 $self->{layout}->draw;
2055} 2088}
2056 2089
2057#sub destroy { 2090#sub destroy {
2058# my ($self) = @_; 2091# my ($self) = @_;
2059# 2092#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2093# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061# 2094#
2062# $self->SUPER::destroy; 2095# $self->SUPER::destroy;
2063#} 2096#}
2064 2097
2065############################################################################# 2098#############################################################################
2066 2099
2067package CFPlus::UI::EntryBase; 2100package DC::UI::EntryBase;
2068 2101
2069our @ISA = CFPlus::UI::Label::; 2102our @ISA = DC::UI::Label::;
2070 2103
2071use CFPlus::OpenGL; 2104use DC::OpenGL;
2072 2105
2073sub new { 2106sub new {
2074 my $class = shift; 2107 my $class = shift;
2075 2108
2076 $class->SUPER::new ( 2109 $class->SUPER::new (
2077 fg => [1, 1, 1], 2110 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2111 bg => [0, 0, 0, 0.2],
2112 outline => undef,
2079 active_bg => [0, 0, 1, .2], 2113 active_bg => [0, 0, 1, .2],
2080 active_fg => [1, 1, 1], 2114 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0], 2115 active_outline => [1, 1, 0],
2082 can_hover => 1, 2116 can_hover => 1,
2083 can_focus => 1, 2117 can_focus => 1,
2118 align => 0,
2084 valign => 0, 2119 valign => 0.5,
2085 can_events => 1, 2120 can_events => 1,
2086 ellipsise => 0, 2121 ellipsise => 0,
2122 padding_x => 4,
2123 padding_y => 2,
2087 #text => ... 2124 #text => ...
2088 #hidden => "*", 2125 #hidden => "*",
2089 @_ 2126 @_
2090 ) 2127 )
2091} 2128}
2138 2175
2139 my $text = $self->get_text; 2176 my $text = $self->get_text;
2140 2177
2141 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2178 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2142 2179
2143 if ($uni == 8) { 2180 if ($sym == DC::SDLK_BACKSPACE) {
2144 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2181 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2145 } elsif ($uni == 127) { 2182 } elsif ($sym == DC::SDLK_DELETE) {
2146 substr $text, $self->{cursor}, 1, ""; 2183 substr $text, $self->{cursor}, 1, "";
2147 } elsif ($sym == CFPlus::SDLK_LEFT) { 2184 } elsif ($sym == DC::SDLK_LEFT) {
2148 --$self->{cursor} if $self->{cursor}; 2185 --$self->{cursor} if $self->{cursor};
2149 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2186 } elsif ($sym == DC::SDLK_RIGHT) {
2150 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2187 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2151 } elsif ($sym == CFPlus::SDLK_HOME) { 2188 } elsif ($sym == DC::SDLK_HOME) {
2152 # what a hack 2189 # what a hack
2153 $self->{cursor} = 2190 $self->{cursor} =
2154 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2191 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2155 ? length $1 2192 ? length $1
2156 : 0; 2193 : 0;
2157 } elsif ($sym == CFPlus::SDLK_END) { 2194 } elsif ($sym == DC::SDLK_END) {
2158 # uh, again 2195 # uh, again
2159 $self->{cursor} = 2196 $self->{cursor} =
2160 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2197 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2161 ? $self->{cursor} + length $1 2198 ? $self->{cursor} + length $1
2162 : length $self->{text}; 2199 : length $self->{text};
2201 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text; 2238 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
2202 $self->{cursor} = length $text; 2239 $self->{cursor} = length $text;
2203 2240
2204 $self->_set_text ($self->{text}); 2241 $self->_set_text ($self->{text});
2205 $self->update; 2242 $self->update;
2206 2243
2207 1 2244 1
2208} 2245}
2209 2246
2210sub invoke_mouse_motion { 2247sub invoke_mouse_motion {
2211 my ($self, $ev, $x, $y) = @_; 2248 my ($self, $ev, $x, $y) = @_;
2226 glColor_premultiply @{$self->{bg}}; 2263 glColor_premultiply @{$self->{bg}};
2227 } 2264 }
2228 2265
2229 glEnable GL_BLEND; 2266 glEnable GL_BLEND;
2230 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2267 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2231 glBegin GL_QUADS;
2232 glVertex 0 , 0;
2233 glVertex 0 , $self->{h};
2234 glVertex $self->{w}, $self->{h}; 2268 glRect 0, 0, $self->{w}, $self->{h};
2235 glVertex $self->{w}, 0;
2236 glEnd;
2237 glDisable GL_BLEND; 2269 glDisable GL_BLEND;
2238 2270
2239 $self->SUPER::_draw; 2271 $self->SUPER::_draw;
2240 2272
2241 #TODO: force update every cursor change :( 2273 #TODO: force update every cursor change :(
2248 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2280 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2249 } 2281 }
2250 2282
2251 glColor_premultiply @{$self->{active_fg}}; 2283 glColor_premultiply @{$self->{active_fg}};
2252 glBegin GL_LINES; 2284 glBegin GL_LINES;
2253 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2285 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2286 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2255 glEnd; 2287 glEnd;
2256 2288
2257 glLineWidth 3; 2289 glLineWidth 3;
2258 glColor @{$self->{active_outline}}; 2290 glColor @{$self->{active_outline}};
2259 glTranslate -.375, -.375; 2291 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2292 glLineWidth 1;
2293
2294 } else {
2295 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2260 glBegin GL_LINE_LOOP; 2296 glBegin GL_LINE_STRIP;
2261 glVertex 0, 0; 2297 glVertex .5, $self->{h} * .5;
2262 glVertex $self->{w}, 0; 2298 glVertex .5, $self->{h} - 2.5;
2263 glVertex $self->{w}, $self->{h}; 2299 glVertex $self->{w} - .5, $self->{h} - 2.5;
2264 glVertex 0, $self->{h}; 2300 glVertex $self->{w} - .5, $self->{h} * .5;
2265 glEnd; 2301 glEnd;
2266 glLineWidth 1;
2267 } 2302 }
2268} 2303}
2269 2304
2270############################################################################# 2305#############################################################################
2271 2306
2272package CFPlus::UI::Entry; 2307package DC::UI::Entry;
2273 2308
2274our @ISA = CFPlus::UI::EntryBase::; 2309our @ISA = DC::UI::EntryBase::;
2275 2310
2276use CFPlus::OpenGL; 2311use DC::OpenGL;
2312
2313sub new {
2314 my $class = shift;
2315
2316 $class->SUPER::new (
2317 history_pointer => -1,
2318 @_
2319 )
2320}
2321
2277 2322
2278sub invoke_key_down { 2323sub invoke_key_down {
2279 my ($self, $ev) = @_; 2324 my ($self, $ev) = @_;
2280 2325
2281 my $sym = $ev->{sym}; 2326 my $sym = $ev->{sym};
2287 $self->{history_pointer} = -1; 2332 $self->{history_pointer} = -1;
2288 $self->{history_saveback} = ''; 2333 $self->{history_saveback} = '';
2289 $self->emit (activate => $txt); 2334 $self->emit (activate => $txt);
2290 $self->update; 2335 $self->update;
2291 2336
2292 } elsif ($sym == CFPlus::SDLK_UP) { 2337 } elsif ($sym == DC::SDLK_UP) {
2293 if ($self->{history_pointer} < 0) { 2338 if ($self->{history_pointer} < 0) {
2294 $self->{history_saveback} = $self->get_text; 2339 $self->{history_saveback} = $self->get_text;
2295 } 2340 }
2296 if (@{$self->{history} || []} > 0) { 2341 if (@{$self->{history} || []} > 0) {
2297 $self->{history_pointer}++; 2342 $self->{history_pointer}++;
2299 $self->{history_pointer} = @{$self->{history} || []} - 1; 2344 $self->{history_pointer} = @{$self->{history} || []} - 1;
2300 } 2345 }
2301 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2346 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2302 } 2347 }
2303 2348
2304 } elsif ($sym == CFPlus::SDLK_DOWN) { 2349 } elsif ($sym == DC::SDLK_DOWN) {
2305 $self->{history_pointer}--; 2350 $self->{history_pointer}--;
2306 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2351 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2307 2352
2308 if ($self->{history_pointer} >= 0) { 2353 if ($self->{history_pointer} >= 0) {
2309 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2354 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2310 } else { 2355 } else {
2356 if (defined $self->{history_saveback}) {
2311 $self->set_text ($self->{history_saveback}); 2357 $self->set_text ($self->{history_saveback});
2358 $self->{history_saveback} = undef;
2359 }
2312 } 2360 }
2313 2361
2314 } else { 2362 } else {
2315 return $self->SUPER::invoke_key_down ($ev) 2363 return $self->SUPER::invoke_key_down ($ev)
2316 } 2364 }
2318 1 2366 1
2319} 2367}
2320 2368
2321############################################################################# 2369#############################################################################
2322 2370
2323package CFPlus::UI::TextEdit; 2371package DC::UI::TextEdit;
2324 2372
2325our @ISA = CFPlus::UI::EntryBase::; 2373our @ISA = DC::UI::EntryBase::;
2326 2374
2327use CFPlus::OpenGL; 2375use DC::OpenGL;
2376
2377sub new {
2378 my $class = shift;
2379
2380 $class->SUPER::new (
2381 padding_y => 4,
2382
2383 @_
2384 )
2385}
2328 2386
2329sub move_cursor_ver { 2387sub move_cursor_ver {
2330 my ($self, $dy) = @_; 2388 my ($self, $dy) = @_;
2331 2389
2332 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2390 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2333 2391
2334 $y += $dy; 2392 $line += $dy;
2335 2393
2336 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2394 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2337 $self->{cursor} = $index; 2395 $self->{cursor} = $index;
2338 delete $self->{cur_h}; 2396 delete $self->{cur_h};
2339 $self->update; 2397 $self->update;
2340 return; 2398 return;
2341 } 2399 }
2344sub invoke_key_down { 2402sub invoke_key_down {
2345 my ($self, $ev) = @_; 2403 my ($self, $ev) = @_;
2346 2404
2347 my $sym = $ev->{sym}; 2405 my $sym = $ev->{sym};
2348 2406
2349 if ($sym == CFPlus::SDLK_UP) { 2407 if ($sym == DC::SDLK_UP) {
2350 $self->move_cursor_ver (-1); 2408 $self->move_cursor_ver (-1);
2351 } elsif ($sym == CFPlus::SDLK_DOWN) { 2409 } elsif ($sym == DC::SDLK_DOWN) {
2352 $self->move_cursor_ver (+1); 2410 $self->move_cursor_ver (+1);
2353 } else { 2411 } else {
2354 return $self->SUPER::invoke_key_down ($ev) 2412 return $self->SUPER::invoke_key_down ($ev)
2355 } 2413 }
2356 2414
2357 1 2415 1
2358} 2416}
2359 2417
2360############################################################################# 2418#############################################################################
2361 2419
2362package CFPlus::UI::ButtonBin; 2420package DC::UI::ButtonBin;
2363 2421
2364our @ISA = CFPlus::UI::Bin::; 2422our @ISA = DC::UI::Bin::;
2365 2423
2366use CFPlus::OpenGL; 2424use DC::OpenGL;
2367 2425
2368my @tex = 2426my @tex =
2369 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2427 map { new_from_resource DC::Texture $_, mipmap => 1 }
2370 qw(b1_button_inactive.png b1_button_active.png); 2428 qw(b1_button_inactive.png b1_button_active.png);
2371 2429
2372sub new { 2430sub new {
2373 my $class = shift; 2431 my $class = shift;
2374 2432
2375 $class->SUPER::new ( 2433 $class->SUPER::new (
2376 can_hover => 1, 2434 can_hover => 1,
2377 align => 0, 2435 align => 0.5,
2378 valign => 0, 2436 valign => 0.5,
2379 can_events => 1, 2437 can_events => 1,
2380 @_ 2438 @_
2381 ) 2439 )
2382} 2440}
2383 2441
2406 $self->SUPER::_draw; 2464 $self->SUPER::_draw;
2407} 2465}
2408 2466
2409############################################################################# 2467#############################################################################
2410 2468
2411package CFPlus::UI::Button; 2469package DC::UI::Button;
2412 2470
2413our @ISA = CFPlus::UI::Label::; 2471our @ISA = DC::UI::Label::;
2414 2472
2415use CFPlus::OpenGL; 2473use DC::OpenGL;
2416 2474
2417my @tex = 2475my @tex =
2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2476 map { new_from_resource DC::Texture $_, mipmap => 1 }
2419 qw(b1_button_inactive.png b1_button_active.png); 2477 qw(b1_button_inactive.png b1_button_active.png);
2420 2478
2421sub new { 2479sub new {
2422 my $class = shift; 2480 my $class = shift;
2423 2481
2424 $class->SUPER::new ( 2482 $class->SUPER::new (
2425 padding_x => 4, 2483 padding_x => 8,
2426 padding_y => 4, 2484 padding_y => 4,
2427 fg => [1.0, 1.0, 1.0], 2485 fg => [1.0, 1.0, 1.0],
2428 active_fg => [0.8, 0.8, 0.8], 2486 active_fg => [0.8, 0.8, 0.8],
2429 can_hover => 1, 2487 can_hover => 1,
2430 align => 0, 2488 align => 0.5,
2431 valign => 0, 2489 valign => 0.5,
2432 can_events => 1, 2490 can_events => 1,
2433 @_ 2491 @_
2434 ) 2492 )
2435} 2493}
2436 2494
2461 $self->SUPER::_draw; 2519 $self->SUPER::_draw;
2462} 2520}
2463 2521
2464############################################################################# 2522#############################################################################
2465 2523
2466package CFPlus::UI::CheckBox; 2524package DC::UI::CheckBox;
2467 2525
2468our @ISA = CFPlus::UI::DrawBG::; 2526our @ISA = DC::UI::DrawBG::;
2469 2527
2470my @tex = 2528my @tex =
2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2529 map { new_from_resource DC::Texture $_, mipmap => 1 }
2472 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2530 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2473 2531
2474use CFPlus::OpenGL; 2532use DC::OpenGL;
2475 2533
2476sub new { 2534sub new {
2477 my $class = shift; 2535 my $class = shift;
2478 2536
2479 $class->SUPER::new ( 2537 $class->SUPER::new (
2538 fontsize => 1,
2480 padding_x => 2, 2539 padding_x => 2,
2481 padding_y => 2, 2540 padding_y => 2,
2482 fg => [1, 1, 1], 2541 fg => [1, 1, 1],
2483 active_fg => [1, 1, 0], 2542 active_fg => [1, 1, 0],
2484 bg => [0, 0, 0, 0.2], 2543 bg => [0, 0, 0, 0.2],
2490} 2549}
2491 2550
2492sub size_request { 2551sub size_request {
2493 my ($self) = @_; 2552 my ($self) = @_;
2494 2553
2495 (6) x 2 2554 ($self->{fontsize} * $::FONTSIZE) x 2
2496} 2555}
2497 2556
2498sub toggle { 2557sub toggle {
2499 my ($self) = @_; 2558 my ($self) = @_;
2500 2559
2519sub _draw { 2578sub _draw {
2520 my ($self) = @_; 2579 my ($self) = @_;
2521 2580
2522 $self->SUPER::_draw; 2581 $self->SUPER::_draw;
2523 2582
2524 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2583 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2525 2584
2526 my ($w, $h) = @$self{qw(w h)}; 2585 my ($w, $h) = @$self{qw(w h)};
2527 2586
2528 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2587 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2529 2588
2536 glDisable GL_TEXTURE_2D; 2595 glDisable GL_TEXTURE_2D;
2537} 2596}
2538 2597
2539############################################################################# 2598#############################################################################
2540 2599
2541package CFPlus::UI::Image; 2600package DC::UI::Image;
2542 2601
2543our @ISA = CFPlus::UI::Base::; 2602our @ISA = DC::UI::DrawBG::;
2544 2603
2545use CFPlus::OpenGL; 2604use DC::OpenGL;
2546 2605
2547our %texture_cache; 2606our %texture_cache;
2548 2607
2549sub new { 2608sub new {
2550 my $class = shift; 2609 my $class = shift;
2557 2616
2558 $self->{path} || $self->{tex} 2617 $self->{path} || $self->{tex}
2559 or Carp::croak "'path' or 'tex' attributes required"; 2618 or Carp::croak "'path' or 'tex' attributes required";
2560 2619
2561 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2620 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2562 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2621 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2563 2622
2564 CFPlus::weaken $texture_cache{$self->{path}}; 2623 DC::weaken $texture_cache{$self->{path}};
2565 2624
2566 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2625 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2567 2626
2568 $self 2627 $self
2569} 2628}
2570 2629
2571sub STORABLE_freeze { 2630sub STORABLE_freeze {
2572 my ($self, $cloning) = @_; 2631 my ($self, $cloning) = @_;
2573 2632
2574 $self->{path} 2633 $self->{path}
2575 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2634 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2576 2635
2577 $self->{path} 2636 $self->{path}
2578} 2637}
2579 2638
2580sub STORABLE_attach { 2639sub STORABLE_attach {
2581 my ($self, $cloning, $path) = @_; 2640 my ($self, $cloning, $path) = @_;
2582 2641
2583 $self->new (path => $path) 2642 $self->new (path => $path)
2584} 2643}
2585 2644
2645sub set_texture {
2646 my ($self, $tex) = @_;
2647
2648 $self->{tex} = $tex;
2649 $self->update;
2650}
2651
2586sub size_request { 2652sub size_request {
2587 my ($self) = @_; 2653 my ($self) = @_;
2588 2654
2589 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale}) 2655 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2590} 2656}
2591 2657
2592sub _draw { 2658sub _draw {
2593 my ($self) = @_; 2659 my ($self) = @_;
2660
2661 $self->SUPER::_draw;
2594 2662
2595 my $tex = $self->{tex}; 2663 my $tex = $self->{tex};
2596 2664
2597 my ($w, $h) = ($self->{w}, $self->{h}); 2665 my ($w, $h) = ($self->{w}, $self->{h});
2598 2666
2611 glDisable GL_TEXTURE_2D; 2679 glDisable GL_TEXTURE_2D;
2612} 2680}
2613 2681
2614############################################################################# 2682#############################################################################
2615 2683
2616package CFPlus::UI::ImageButton; 2684package DC::UI::ImageButton;
2617 2685
2618our @ISA = CFPlus::UI::Image::; 2686our @ISA = DC::UI::Image::;
2619 2687
2620use CFPlus::OpenGL; 2688use DC::OpenGL;
2621
2622my %textures;
2623 2689
2624sub new { 2690sub new {
2625 my $class = shift; 2691 my $class = shift;
2626 2692
2627 my $self = $class->SUPER::new ( 2693 my $self = $class->SUPER::new (
2628 padding_x => 4, 2694 padding_x => 4,
2629 padding_y => 4, 2695 padding_y => 4,
2630 fg => [1, 1, 1], 2696 fg => [1, 1, 1],
2631 active_fg => [0, 0, 1], 2697 active_fg => [0, 0, 1],
2632 can_hover => 1, 2698 can_hover => 1,
2633 align => 0, 2699 align => 0.5,
2634 valign => 0, 2700 valign => 0.5,
2635 can_events => 1, 2701 can_events => 1,
2636 @_ 2702 @_
2637 ); 2703 );
2638} 2704}
2639 2705
2706sub invoke_button_down {
2707 my ($self, $ev, $x, $y) = @_;
2708
2709 1
2710}
2711
2640sub invoke_button_up { 2712sub invoke_button_up {
2641 my ($self, $ev, $x, $y) = @_; 2713 my ($self, $ev, $x, $y) = @_;
2642 2714
2643 $self->emit ("activate") 2715 $self->emit ("activate")
2644 if $x >= 0 && $x < $self->{w} 2716 if $x >= 0 && $x < $self->{w}
2647 1 2719 1
2648} 2720}
2649 2721
2650############################################################################# 2722#############################################################################
2651 2723
2652package CFPlus::UI::VGauge; 2724package DC::UI::VGauge;
2653 2725
2654our @ISA = CFPlus::UI::Base::; 2726our @ISA = DC::UI::Base::;
2655 2727
2656use List::Util qw(min max); 2728use List::Util qw(min max);
2657 2729
2658use CFPlus::OpenGL; 2730use DC::OpenGL;
2659 2731
2660my %tex = ( 2732my %tex = (
2661 food => [ 2733 food => [
2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2734 map { new_from_resource DC::Texture $_, mipmap => 1 }
2663 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2735 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2664 ], 2736 ],
2665 grace => [ 2737 grace => [
2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2738 map { new_from_resource DC::Texture $_, mipmap => 1 }
2667 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2739 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2668 ], 2740 ],
2669 hp => [ 2741 hp => [
2670 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2742 map { new_from_resource DC::Texture $_, mipmap => 1 }
2671 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2743 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2672 ], 2744 ],
2673 mana => [ 2745 mana => [
2674 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2746 map { new_from_resource DC::Texture $_, mipmap => 1 }
2675 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2747 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2676 ], 2748 ],
2677); 2749);
2678 2750
2679# eg. VGauge->new (gauge => 'food'), default gauge: food 2751# eg. VGauge->new (gauge => 'food'), default gauge: food
2782 glDisable GL_TEXTURE_2D; 2854 glDisable GL_TEXTURE_2D;
2783} 2855}
2784 2856
2785############################################################################# 2857#############################################################################
2786 2858
2859package DC::UI::Progress;
2860
2861our @ISA = DC::UI::Label::;
2862
2863use DC::OpenGL;
2864
2865sub new {
2866 my ($class, %arg) = @_;
2867
2868 my $self = $class->SUPER::new (
2869 padding_x => 2,
2870 padding_y => 2,
2871 fg => [1, 1, 1],
2872 bg => [0, 0, 1, 0.2],
2873 bar => [0.7, 0.5, 0.1, 0.8],
2874 outline => [0.4, 0.3, 0],
2875 fontsize => 0.9,
2876 valign => 0.5,
2877 align => 0.5,
2878 can_events => 1,
2879 ellipsise => 1,
2880 label => "%d%%",
2881 %arg,
2882 );
2883
2884 $self->set_value ($arg{value} || -1);
2885
2886 $self
2887}
2888
2889sub set_label {
2890 my ($self, $label) = @_;
2891
2892 return if $self->{label} eq $label;
2893 $self->{label} = $label;
2894
2895 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2896}
2897
2898sub set_value {
2899 my ($self, $value) = @_;
2900
2901 if ($self->{value} ne $value) {
2902 $self->{value} = $value;
2903
2904 if ($value < 0) {
2905 $self->set_text ("-");
2906 } else {
2907 $self->set_text (sprintf $self->{label}, $value * 100);
2908 }
2909
2910 $self->update;
2911 }
2912}
2913
2914sub _draw {
2915 my ($self) = @_;
2916
2917 glEnable GL_BLEND;
2918 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2919
2920 my $px = $self->{padding_x};
2921 my $py = $self->{padding_y};
2922
2923 if ($self->{value} >= 0) {
2924 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2925
2926 glColor_premultiply @{$self->{bar}};
2927 glRect $px, $py, $s, $self->{h} - $py;
2928 glColor_premultiply @{$self->{bg}};
2929 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2930 }
2931
2932 glColor_premultiply @{$self->{outline}};
2933
2934 $px -= .5;
2935 $py -= .5;
2936
2937 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2938
2939 glDisable GL_BLEND;
2940
2941 {
2942 local $self->{bg}; # do not draw background
2943 $self->SUPER::_draw;
2944 }
2945}
2946
2947#############################################################################
2948
2949package DC::UI::ExperienceProgress;
2950
2951our @ISA = DC::UI::Progress::;
2952
2953sub new {
2954 my ($class, %arg) = @_;
2955
2956 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2957
2958 my $self = $class->SUPER::new (
2959 %arg,
2960 tooltip => sub {
2961 my ($self) = @_;
2962
2963 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2964 $tt,
2965 $self->{lvl},
2966 ::formsep ($self->{exp}),
2967 ::formsep ($self->{nxt}),
2968 ::formsep ($self->{nxt} - $self->{exp}),
2969 $self->_percent * 100,
2970 },
2971 );
2972
2973 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2974 if $::CONN;
2975
2976 $self
2977}
2978
2979sub DESTROY {
2980 my ($self) = @_;
2981
2982 delete $::CONN->{on_exp_update}{$self+0}
2983 if $::CONN;
2984
2985 $self->SUPER::DESTROY;
2986}
2987
2988sub _percent {
2989 my ($self) = @_;
2990
2991 my $table = $::CONN && $::CONN->{exp_table}
2992 or return -1;
2993
2994 my $l0 = $table->[$self->{lvl} - 1];
2995 my $l1 = $table->[$self->{lvl}];
2996
2997 $self->{nxt} = $l1;
2998
2999 ($self->{exp} - $l0) / ($l1 - $l0)
3000}
3001
3002sub set_value {
3003 my ($self, $lvl, $exp) = @_;
3004
3005 $self->{lvl} = $lvl;
3006 $self->{exp} = $exp;
3007
3008 $self->SUPER::set_value ($self->_percent);
3009}
3010
3011#############################################################################
3012
2787package CFPlus::UI::Gauge; 3013package DC::UI::Gauge;
2788 3014
2789our @ISA = CFPlus::UI::VBox::; 3015our @ISA = DC::UI::VBox::;
2790 3016
2791sub new { 3017sub new {
2792 my ($class, %arg) = @_; 3018 my ($class, %arg) = @_;
2793 3019
2794 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
2796 can_hover => 1, 3022 can_hover => 1,
2797 can_events => 1, 3023 can_events => 1,
2798 %arg, 3024 %arg,
2799 ); 3025 );
2800 3026
2801 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3027 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2802 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3028 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2803 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3029 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2804 3030
2805 $self 3031 $self
2806} 3032}
2807 3033
2808sub set_fontsize { 3034sub set_fontsize {
2829 $self->{value}->set_text ($val); 3055 $self->{value}->set_text ($val);
2830} 3056}
2831 3057
2832############################################################################# 3058#############################################################################
2833 3059
2834package CFPlus::UI::Slider; 3060package DC::UI::Slider;
2835 3061
2836use strict; 3062use common::sense;
2837 3063
2838use CFPlus::OpenGL; 3064use DC::OpenGL;
2839 3065
2840our @ISA = CFPlus::UI::DrawBG::; 3066our @ISA = DC::UI::DrawBG::;
2841 3067
2842my @tex = 3068my @tex =
2843 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3069 map { new_from_resource DC::Texture $_ }
2844 qw(s1_slider.png s1_slider_bg.png); 3070 qw(s1_slider.png s1_slider_bg.png);
2845 3071
2846sub new { 3072sub new {
2847 my $class = shift; 3073 my $class = shift;
2848 3074
2885sub set_value { 3111sub set_value {
2886 my ($self, $value) = @_; 3112 my ($self, $value) = @_;
2887 3113
2888 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3114 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2889 3115
2890 $hi = $lo + 1 if $hi <= $lo; 3116 $hi = $lo if $hi < $lo;
2891 3117
2892 $page = $hi - $lo if $page > $hi - $lo; 3118 $value = $hi - $page if $value > $hi - $page;
2893
2894 $value = $lo if $value < $lo; 3119 $value = $lo if $value < $lo;
2895 $value = $hi - $page if $value > $hi - $page;
2896 3120
2897 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3121 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2898 if $unit; 3122 if $unit;
2899 3123
2900 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3124 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2915 my ($self, $ev, $x, $y) = @_; 3139 my ($self, $ev, $x, $y) = @_;
2916 3140
2917 $self->SUPER::invoke_button_down ($ev, $x, $y); 3141 $self->SUPER::invoke_button_down ($ev, $x, $y);
2918 3142
2919 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3143 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2920 3144
2921 $self->invoke_mouse_motion ($ev, $x, $y); 3145 $self->invoke_mouse_motion ($ev, $x, $y);
2922 3146
2923 1 3147 1
2924} 3148}
2925 3149
2929 if ($GRAB == $self) { 3153 if ($GRAB == $self) {
2930 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3154 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2931 3155
2932 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3156 my (undef, $lo, $hi, $page) = @{$self->{range}};
2933 3157
2934 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3158 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2935 3159
2936 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3160 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2937 } else { 3161 } else {
2938 return 0; 3162 return 0;
2939 } 3163 }
2944sub invoke_mouse_wheel { 3168sub invoke_mouse_wheel {
2945 my ($self, $ev) = @_; 3169 my ($self, $ev) = @_;
2946 3170
2947 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3171 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2948 3172
2949 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3173 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2950 3174
2951 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3175 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2952 3176
2953 1 3177 1
2954} 3178}
2964 my ($self) = @_; 3188 my ($self) = @_;
2965 3189
2966 unless ($self->{knob_w}) { 3190 unless ($self->{knob_w}) {
2967 $self->set_value ($self->{range}[0]); 3191 $self->set_value ($self->{range}[0]);
2968 3192
2969 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3193 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2970 my $range = ($hi - $page - $lo) || 1e-100; 3194 my $range = ($hi - $page - $lo) || 1e-10;
2971 3195
2972 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3196 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2973 3197
2974 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3198 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2975 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3199 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2976 3200
2977 $value = ($value - $lo) / $range; 3201 $value = ($value - $lo) / $range;
2985 3209
2986 glScale $self->{w}, $self->{h}; 3210 glScale $self->{w}, $self->{h};
2987 3211
2988 if ($self->{vertical}) { 3212 if ($self->{vertical}) {
2989 # draw a vertical slider like a rotated horizontal slider 3213 # draw a vertical slider like a rotated horizontal slider
2990 3214
2991 glTranslate 1, 0, 0; 3215 glTranslate 1, 0, 0;
2992 glRotate 90, 0, 0, 1; 3216 glRotate 90, 0, 0, 1;
2993 } 3217 }
2994 3218
2995 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 3219 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
3007 glDisable GL_TEXTURE_2D; 3231 glDisable GL_TEXTURE_2D;
3008} 3232}
3009 3233
3010############################################################################# 3234#############################################################################
3011 3235
3012package CFPlus::UI::ValSlider; 3236package DC::UI::ValSlider;
3013 3237
3014our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
3015 3239
3016sub new { 3240sub new {
3017 my ($class, %arg) = @_; 3241 my ($class, %arg) = @_;
3018 3242
3019 my $range = delete $arg{range}; 3243 my $range = delete $arg{range};
3020 3244
3021 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
3022 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3246 slider => (new DC::UI::Slider expand => 1, range => $range),
3023 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3247 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3024 to_value => sub { shift }, 3248 to_value => sub { shift },
3025 from_value => sub { shift }, 3249 from_value => sub { shift },
3026 %arg, 3250 %arg,
3027 ); 3251 );
3028 3252
3048sub set_range { shift->{slider}->set_range (@_) } 3272sub set_range { shift->{slider}->set_range (@_) }
3049sub set_value { shift->{slider}->set_value (@_) } 3273sub set_value { shift->{slider}->set_value (@_) }
3050 3274
3051############################################################################# 3275#############################################################################
3052 3276
3053package CFPlus::UI::TextScroller; 3277package DC::UI::TextScroller;
3054 3278
3055our @ISA = CFPlus::UI::HBox::; 3279our @ISA = DC::UI::HBox::;
3056 3280
3057use CFPlus::OpenGL; 3281use DC::OpenGL;
3058 3282
3059sub new { 3283sub new {
3060 my $class = shift; 3284 my $class = shift;
3061 3285
3062 my $self = $class->SUPER::new ( 3286 my $self = $class->SUPER::new (
3063 fontsize => 1, 3287 fontsize => 1,
3064 can_events => 1, 3288 can_events => 1,
3065 indent => 0, 3289 indent => 0,
3066 #font => default_font 3290 #font => default_font
3067 @_, 3291 @_,
3068 3292
3069 layout => (new CFPlus::Layout), 3293 layout => (new DC::Layout),
3070 par => [],
3071 max_par => 0, 3294 max_par => 0,
3072 height => 0, 3295 height => 0,
3073 children => [ 3296 children => [
3074 (new CFPlus::UI::Empty expand => 1), 3297 (new DC::UI::Empty expand => 1),
3075 (new CFPlus::UI::Slider vertical => 1), 3298 (new DC::UI::Slider vertical => 1),
3076 ], 3299 ],
3077 ); 3300 );
3078 3301
3079 $self->{children}[1]->connect (changed => sub { $self->update }); 3302 $self->{children}[1]->connect (changed => sub { $self->update });
3303
3304 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3080 3305
3081 $self 3306 $self
3082} 3307}
3083 3308
3084sub set_fontsize { 3309sub set_fontsize {
3136 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3361 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3137 $layout->set_markup ($para->{markup}); 3362 $layout->set_markup ($para->{markup});
3138 3363
3139 $layout->set_shapes ( 3364 $layout->set_shapes (
3140 map 3365 map
3141 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3366 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3142 @{$para->{widget}} 3367 @{$para->{widget}}
3143 ); 3368 );
3144 3369
3145 $layout 3370 $layout
3146} 3371}
3263 $ROOT->on_post_alloc ($self => sub { 3488 $ROOT->on_post_alloc ($self => sub {
3264 $self->force_uptodate; 3489 $self->force_uptodate;
3265 3490
3266 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3491 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3267 3492
3268 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3493 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3269 glClearColor 0, 0, 0, 0; 3494 glClearColor 0, 0, 0, 0;
3270 glClear GL_COLOR_BUFFER_BIT; 3495 glClear GL_COLOR_BUFFER_BIT;
3271 3496
3272 package CFPlus::UI::Base; 3497 package DC::UI::Base;
3273 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3498 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3274 (0, 0, $self->{w}, $self->{h}); 3499 (0, 0, $self->{w}, $self->{h});
3275 3500
3276 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
3277 3502
3288 3513
3289 if ($y0 < $y + $h && $y < $y1) { 3514 if ($y0 < $y + $h && $y < $y1) {
3290 my $layout = $self->get_layout ($para); 3515 my $layout = $self->get_layout ($para);
3291 3516
3292 $layout->render ($para->{indent}, $y - $y0); 3517 $layout->render ($para->{indent}, $y - $y0);
3518 $layout->draw;
3293 3519
3294 if (my @w = @{ $para->{widget} }) { 3520 if (my @w = @{ $para->{widget} }) {
3295 my @s = $layout->get_shapes; 3521 my @s = $layout->get_shapes;
3296 3522
3297 for (@w) { 3523 for (@w) {
3335 $self->{children}[1]->draw; 3561 $self->{children}[1]->draw;
3336} 3562}
3337 3563
3338############################################################################# 3564#############################################################################
3339 3565
3340package CFPlus::UI::Animator; 3566package DC::UI::Animator;
3341 3567
3342use CFPlus::OpenGL; 3568use DC::OpenGL;
3343 3569
3344our @ISA = CFPlus::UI::Bin::; 3570our @ISA = DC::UI::Bin::;
3345 3571
3346sub moveto { 3572sub moveto {
3347 my ($self, $x, $y) = @_; 3573 my ($self, $x, $y) = @_;
3348 3574
3349 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3575 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3350 $self->{speed} = 0.001; 3576 $self->{speed} = 0.001;
3351 $self->{time} = 1; 3577 $self->{time} = 1;
3352 3578
3353 ::animation_start $self; 3579 ::animation_start $self;
3354} 3580}
3355 3581
3356sub animate { 3582sub animate {
3357 my ($self, $interval) = @_; 3583 my ($self, $interval) = @_;
3361 $self->{time} = 0; 3587 $self->{time} = 0;
3362 ::animation_stop $self; 3588 ::animation_stop $self;
3363 } 3589 }
3364 3590
3365 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}}; 3591 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
3366 3592
3367 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time}); 3593 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
3368 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time}); 3594 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
3369} 3595}
3370 3596
3371sub _draw { 3597sub _draw {
3377 glPopMatrix; 3603 glPopMatrix;
3378} 3604}
3379 3605
3380############################################################################# 3606#############################################################################
3381 3607
3382package CFPlus::UI::Flopper; 3608package DC::UI::Flopper;
3383 3609
3384our @ISA = CFPlus::UI::Button::; 3610our @ISA = DC::UI::Button::;
3385 3611
3386sub new { 3612sub new {
3387 my $class = shift; 3613 my $class = shift;
3388 3614
3389 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3401 $self->{other}->toggle_visibility; 3627 $self->{other}->toggle_visibility;
3402} 3628}
3403 3629
3404############################################################################# 3630#############################################################################
3405 3631
3406package CFPlus::UI::Tooltip; 3632package DC::UI::Tooltip;
3407 3633
3408our @ISA = CFPlus::UI::Bin::; 3634our @ISA = DC::UI::Bin::;
3409 3635
3410use CFPlus::OpenGL; 3636use DC::OpenGL;
3411 3637
3412sub new { 3638sub new {
3413 my $class = shift; 3639 my $class = shift;
3414 3640
3415 $class->SUPER::new ( 3641 $class->SUPER::new (
3416 @_, 3642 @_,
3417 can_events => 0, 3643 can_events => 0,
3418 ) 3644 )
3419} 3645}
3420 3646
3647# expand, as good as possible
3648sub _expand_doclets {
3649 my ($tip) = @_;
3650
3651 $tip =~ s{#\(([^)]+)\)}{
3652 if ($::CONN) {
3653 exists $::CONN->{doclet}{$1}
3654 ? $::CONN->{doclet}{$1}
3655 : "(waiting for server to show full text)"
3656 } else {
3657 "(unable to show full text without server connection)"
3658 }
3659 }ge;
3660
3661 $tip =~ s/^\n+//;
3662 $tip =~ s/\n+$//;
3663
3664 $tip
3665}
3666
3667# expands a tooltip, potentially multiple times remotely
3668# and returns a guard. clals the clalback each time the text changes.
3669sub expand_tooltip {
3670 my ($tip, $cb) = @_;
3671
3672 # first expand #name tooltips from local pod
3673 $tip = DC::Pod::section_label tooltip => $1
3674 if $tip =~ /^#([^(].*)$/;
3675
3676 my $active; # true if any remote requests outstanding
3677
3678 if ($::CONN && $::CONN->{addme_success}) {
3679 # now find all doclet references
3680 for my $doclet ($tip =~ /#\(([^)]+)\)/g) {
3681 unless (exists $::CONN->{doclet}{$doclet}) {
3682 # need to ask the server
3683 # we don't try to avoid duplicate requests
3684
3685 $active = 1;
3686 $::CONN->send_exti_req (doclet => (split /\//, $doclet, 2), sub {
3687 $::CONN->{doclet}{$doclet} = DC::sanitise_cfxml $_[0];
3688 $cb->(_expand_doclets $tip) if $active;
3689 });
3690 }
3691 }
3692 }
3693
3694 $cb->(_expand_doclets $tip);
3695
3696 $active and Guard::guard { undef $active }
3697}
3698
3421sub set_tooltip_from { 3699sub set_tooltip_from {
3422 my ($self, $widget) = @_; 3700 my ($self, $widget) = @_;
3423 3701
3424 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3425 if $widget->{tooltip} =~ /^#(.*)$/;
3426
3427 my $tooltip = $widget->{tooltip}; 3702 my $tip = $widget->{tooltip};
3703 $tip = $tip->($widget) if "CODE" eq ref $tip;
3428 3704
3429 if ($ENV{CFPLUS_DEBUG} & 2) {
3430 $tooltip .= "\n\n" . (ref $widget) . "\n"
3431 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3432 . "req $widget->{req_w} $widget->{req_h}\n"
3433 . "visible $widget->{visible}";
3434 }
3435
3436 $tooltip =~ s/^\n+//;
3437 $tooltip =~ s/\n+$//;
3438
3439 $self->add (new CFPlus::UI::Label 3705 $self->add (new DC::UI::Label
3440 markup => $tooltip, 3706 fg => $DC::THEME{tooltip_fg},
3441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3707 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3708 align => 0,
3442 fontsize => 0.8, 3709 fontsize => 0.8,
3443 style => 1, # FLAG_INVERSE 3710 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3444 ellipsise => 0, 3711 ellipsise => 0,
3445 font => ($widget->{tooltip_font} || $::FONT_PROP), 3712 font => ($widget->{tooltip_font} || $::FONT_PROP),
3446 ); 3713 );
3714
3715 $self->{tooltip_expand} = expand_tooltip $tip, sub {
3716 my ($tip) = @_;
3717
3718 if ($ENV{CFPLUS_DEBUG} & 2) {
3719 $tip .= "\n\n" . (ref $widget) . "\n"
3720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3721 . "req $widget->{req_w} $widget->{req_h}\n"
3722 . "visible $widget->{visible}";
3723 }
3724
3725 $self->{children}[0]->set_markup ($tip);
3726 };
3447} 3727}
3448 3728
3449sub size_request { 3729sub size_request {
3450 my ($self) = @_; 3730 my ($self) = @_;
3451 3731
3483} 3763}
3484 3764
3485sub _draw { 3765sub _draw {
3486 my ($self) = @_; 3766 my ($self) = @_;
3487 3767
3488 glTranslate 0.375, 0.375;
3489
3490 my ($w, $h) = @$self{qw(w h)}; 3768 my ($w, $h) = @$self{qw(w h)};
3491 3769
3492 glColor 1, 0.8, 0.4; 3770 glColor @{ $DC::THEME{tooltip_bg} };
3493 glBegin GL_QUADS; 3771 glRect 0, 0, $w, $h;
3494 glVertex 0 , 0; 3772
3495 glVertex 0 , $h; 3773 glColor @{ $DC::THEME{tooltip_border} };
3496 glVertex $w, $h; 3774 glRect_lineloop .5, .5, $w + .5, $h + .5;
3497 glVertex $w, 0; 3775
3498 glEnd; 3776 glTranslate 2, 2;
3499
3500 glColor 0, 0, 0;
3501 glBegin GL_LINE_LOOP;
3502 glVertex 0 , 0;
3503 glVertex 0 , $h;
3504 glVertex $w, $h;
3505 glVertex $w, 0;
3506 glEnd;
3507
3508 glTranslate 2 - 0.375, 2 - 0.375;
3509 3777
3510 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3511} 3779}
3512 3780
3513############################################################################# 3781#############################################################################
3514 3782
3515package CFPlus::UI::Face; 3783package DC::UI::Face;
3516 3784
3517our @ISA = CFPlus::UI::DrawBG::; 3785our @ISA = DC::UI::DrawBG::;
3518 3786
3519use CFPlus::OpenGL; 3787use DC::OpenGL;
3520 3788
3521sub new { 3789sub new {
3522 my $class = shift; 3790 my $class = shift;
3523 3791
3524 my $self = $class->SUPER::new ( 3792 my $self = $class->SUPER::new (
3527 aspect => 1, 3795 aspect => 1,
3528 can_events => 0, 3796 can_events => 0,
3529 @_, 3797 @_,
3530 ); 3798 );
3531 3799
3532 if ($self->{anim} && $self->{animspeed}) {
3533 CFPlus::weaken (my $widget = $self);
3534
3535 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3536 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3537 $self->{timer} = Event->timer (
3538 parked => 1,
3539 cb => sub {
3540 return unless $::CONN && $widget;
3541
3542 ++$widget->{frame};
3543 $widget->update_face;
3544 $widget->update;
3545
3546 $widget->update_timer;
3547 },
3548 );
3549
3550 $self->update_face;
3551 $self->update_timer; 3800 $self->update_anim;
3552 } 3801
3553
3554 $self 3802 $self
3555} 3803}
3556 3804
3557sub update_timer { 3805sub update_timer {
3558 my ($self) = @_; 3806 my ($self) = @_;
3559 3807
3560 return unless $self->{timer}; 3808 return unless $self->{timer};
3561 3809
3562 if ($self->{visible}) { 3810 if ($self->{visible}) {
3563 $self->{timer}->at (
3564 $self->{anim_start}
3565 + $self->{animspeed}
3566 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3567 );
3568 $self->{timer}->start; 3811 $self->{timer}->start;
3569 } else { 3812 } else {
3570 $self->{timer}->stop; 3813 $self->{timer}->stop;
3571 } 3814 }
3572} 3815}
3573 3816
3574sub update_face { 3817sub update_face {
3575 my ($self) = @_; 3818 my ($self) = @_;
3576 3819
3577 return unless $::CONN;
3578
3579 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580 if ($anim && @$anim) {
3581 delete $self->{wait_face};
3582 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3583 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3584 }
3585 }
3586}
3587
3588sub size_request {
3589 my ($self) = @_;
3590
3591 if ($::CONN) { 3820 if ($::CONN) {
3592 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3821 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3593 if (my $tex = $::CONN->{texture}[$faceid]) { 3822 if ($anim && @$anim) {
3594 $self->{tex} = $tex; 3823 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3595 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3824 delete $self->{face_change_cb};
3596 } else { 3825
3597 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3826 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3598 $self->realloc; 3827 unless ($tex->{name} || $tex->{loading}) {
3828 $tex->upload (sub { $self->reconfigure });
3829 }
3599 }); 3830 }
3600 } 3831 }
3601 } 3832 }
3602 } 3833 }
3834}
3835
3836sub update_anim {
3837 my ($self) = @_;
3838
3839 if ($self->{anim} && $self->{animspeed}) {
3840 DC::weaken (my $widget = $self);
3841
3842 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3843 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3844 return unless $::CONN;
3845
3846 my $w = $widget
3847 or return;
3848
3849 ++$w->{frame};
3850 $w->update_face;
3851
3852 # somehow, $widget can go away
3853 $w->update;
3854 $w->update_timer;
3855 };
3856
3857 $self->update_face;
3858 $self->update_timer;
3859 } else {
3860 delete $self->{timer};
3861 }
3862}
3863
3864sub size_request {
3865 my ($self) = @_;
3866
3867 if ($::CONN) {
3868 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3869 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3870 if ($tex->{name}) {
3871 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3872 } elsif (!$tex->{loading}) {
3873 $tex->upload (sub { $self->reconfigure });
3874 }
3875 }
3876
3877 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3878 }
3879 }
3603 3880
3604 ($self->{size_w} || 8, $self->{size_h} || 8) 3881 ($self->{size_w} || 8, $self->{size_h} || 8)
3605} 3882}
3606 3883
3607sub update { 3884sub update {
3608 my ($self) = @_; 3885 my ($self) = @_;
3609 3886
3610 return unless $self->{visible}; 3887 return unless $self->{visible};
3611 3888
3612 $self->SUPER::update; 3889 $self->SUPER::update;
3890}
3891
3892sub set_face {
3893 my ($self, $face) = @_;
3894
3895 $self->{face} = $face;
3896 $self->reconfigure;
3897}
3898
3899sub set_anim {
3900 my ($self, $anim) = @_;
3901
3902 $self->{anim} = $anim;
3903 $self->update_anim;
3904}
3905
3906sub set_animspeed {
3907 my ($self, $animspeed) = @_;
3908
3909 $self->{animspeed} = $animspeed;
3910 $self->update_anim;
3613} 3911}
3614 3912
3615sub invoke_visibility_change { 3913sub invoke_visibility_change {
3616 my ($self) = @_; 3914 my ($self) = @_;
3617 3915
3643 $self->SUPER::destroy; 3941 $self->SUPER::destroy;
3644} 3942}
3645 3943
3646############################################################################# 3944#############################################################################
3647 3945
3648package CFPlus::UI::Buttonbar; 3946package DC::UI::Buttonbar;
3649 3947
3650our @ISA = CFPlus::UI::HBox::; 3948our @ISA = DC::UI::HBox::;
3651 3949
3652# TODO: should actually wrap buttons and other goodies. 3950# TODO: should actually wrap buttons and other goodies.
3653 3951
3654############################################################################# 3952#############################################################################
3655 3953
3656package CFPlus::UI::Menu; 3954package DC::UI::Menu;
3657 3955
3658our @ISA = CFPlus::UI::Toplevel::; 3956our @ISA = DC::UI::Toplevel::;
3659 3957
3660use CFPlus::OpenGL; 3958use DC::OpenGL;
3661 3959
3662sub new { 3960sub new {
3663 my $class = shift; 3961 my $class = shift;
3664 3962
3665 my $self = $class->SUPER::new ( 3963 my $self = $class->SUPER::new (
3666 items => [], 3964 items => [],
3667 z => 100, 3965 z => 100,
3668 @_, 3966 @_,
3669 ); 3967 );
3670 3968
3671 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3969 $self->add ($self->{vbox} = new DC::UI::VBox);
3672 3970
3673 for my $item (@{ $self->{items} }) { 3971 for my $item (@{ $self->{items} }) {
3674 my ($widget, $cb, $tooltip) = @$item; 3972 my ($widget, $cb, $tooltip) = @$item;
3675 3973
3676 # handle various types of items, only text for now 3974 # handle various types of items, only text for now
3677 if (!ref $widget) { 3975 if (!ref $widget) {
3678 if ($widget =~ /\t/) { 3976 if ($widget =~ /\t/) {
3679 my ($left, $right) = split /\t/, $widget, 2; 3977 my ($left, $right) = split /\t/, $widget, 2;
3680 3978
3681 $widget = new CFPlus::UI::HBox 3979 $widget = new DC::UI::HBox
3682 can_hover => 1, 3980 can_hover => 1,
3683 can_events => 1, 3981 can_events => 1,
3684 tooltip => $tooltip, 3982 tooltip => $tooltip,
3685 children => [ 3983 children => [
3686 (new CFPlus::UI::Label markup => $left, expand => 1), 3984 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3687 (new CFPlus::UI::Label markup => $right, align => +1), 3985 (new DC::UI::Label markup => $right, align => 1),
3688 ], 3986 ],
3689 ; 3987 ;
3690 3988
3691 } else { 3989 } else {
3692 $widget = new CFPlus::UI::Label 3990 $widget = new DC::UI::Label
3693 can_hover => 1, 3991 can_hover => 1,
3694 can_events => 1, 3992 can_events => 1,
3993 align => 0,
3695 markup => $widget, 3994 markup => $widget,
3696 tooltip => $tooltip; 3995 tooltip => $tooltip;
3697 } 3996 }
3698 } 3997 }
3699 3998
3714 # maybe save $GRAB? must be careful about events... 4013 # maybe save $GRAB? must be careful about events...
3715 $GRAB = $self; 4014 $GRAB = $self;
3716 $self->{button} = $ev->{button}; 4015 $self->{button} = $ev->{button};
3717 4016
3718 $self->show; 4017 $self->show;
3719 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 4018
4019 my $x = $ev->{x};
4020 my $y = $ev->{y};
4021
4022 $self->{root}->on_post_alloc ($self => sub {
4023 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
4024 });
4025
4026 1 # so it can be used inside event handlers
3720} 4027}
3721 4028
3722sub invoke_mouse_motion { 4029sub invoke_mouse_motion {
3723 my ($self, $ev, $x, $y) = @_; 4030 my ($self, $ev, $x, $y) = @_;
3724 4031
3745 1 4052 1
3746} 4053}
3747 4054
3748############################################################################# 4055#############################################################################
3749 4056
3750package CFPlus::UI::Multiplexer; 4057package DC::UI::Multiplexer;
3751 4058
3752our @ISA = CFPlus::UI::Container::; 4059our @ISA = DC::UI::Container::;
3753 4060
3754sub new { 4061sub new {
3755 my $class = shift; 4062 my $class = shift;
3756 4063
3757 my $self = $class->SUPER::new ( 4064 my $self = $class->SUPER::new (
3758 @_, 4065 @_,
3759 ); 4066 );
3760 4067
3761 $self->{current} = $self->{children}[0] 4068 $self->set_current_page (0);
3762 if @{ $self->{children} };
3763 4069
3764 $self 4070 $self
3765} 4071}
3766 4072
3767sub add { 4073sub add {
3768 my ($self, @widgets) = @_; 4074 my ($self, @widgets) = @_;
3769 4075
3770 $self->SUPER::add (@widgets); 4076 $self->SUPER::add (@widgets);
3771 4077
3772 $self->{current} = $self->{children}[0] 4078 $self->set_current_page (0)
3773 if @{ $self->{children} }; 4079 if @widgets == @{ $self->{children} };
3774} 4080}
3775 4081
3776sub get_current_page { 4082sub get_current_page {
3777 my ($self) = @_; 4083 my ($self) = @_;
3778 4084
3784 4090
3785 my $widget = ref $page_or_widget 4091 my $widget = ref $page_or_widget
3786 ? $page_or_widget 4092 ? $page_or_widget
3787 : $self->{children}[$page_or_widget]; 4093 : $self->{children}[$page_or_widget];
3788 4094
4095 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4096
3789 $self->{current} = $widget; 4097 if (($self->{current} = $widget)) {
4098 $self->{current}->set_visible if $self->{current} && $self->{visible};
3790 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4099 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3791 4100
3792 $self->emit (page_changed => $self->{current}); 4101 $self->emit (page_changed => $self->{current});
4102 }
3793 4103
3794 $self->realloc; 4104 $self->realloc;
3795} 4105}
3796 4106
3797sub visible_children { 4107sub visible_children {
3798 $_[0]{current} 4108 $_[0]{current} || ()
3799} 4109}
3800 4110
3801sub size_request { 4111sub size_request {
3802 my ($self) = @_; 4112 my ($self) = @_;
3803 4113
4114 $self->{current}
3804 $self->{current}->size_request 4115 ? $self->{current}->size_request
4116 : (0, 0)
3805} 4117}
3806 4118
3807sub invoke_size_allocate { 4119sub invoke_size_allocate {
3808 my ($self, $w, $h) = @_; 4120 my ($self, $w, $h) = @_;
3809 4121
3810 $self->{current}->configure (0, 0, $w, $h); 4122 $self->{current}->configure (0, 0, $w, $h)
4123 if $self->{current};
3811 4124
3812 1 4125 1
3813} 4126}
3814 4127
3815sub _draw { 4128sub _draw {
3816 my ($self) = @_; 4129 my ($self) = @_;
3817 4130
3818 $self->{current}->draw; 4131 $self->{current}->draw
4132 if $self->{current};
3819} 4133}
3820 4134
3821############################################################################# 4135#############################################################################
3822 4136
3823package CFPlus::UI::Notebook; 4137package DC::UI::Notebook;
3824 4138
4139use DC::OpenGL;
4140
3825our @ISA = CFPlus::UI::VBox::; 4141our @ISA = DC::UI::VBox::;
3826 4142
3827sub new { 4143sub new {
3828 my $class = shift; 4144 my $class = shift;
3829 4145
3830 my $self = $class->SUPER::new ( 4146 my $self = $class->SUPER::new (
3831 buttonbar => (new CFPlus::UI::Buttonbar), 4147 buttonbar => (new DC::UI::Buttonbar),
3832 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4148 multiplexer => (new DC::UI::Multiplexer expand => 1),
4149 active_outline => [.7, .7, 0.2],
3833 # filter => # will be put between multiplexer and $self 4150 # filter => # will be put between multiplexer and $self
3834 @_, 4151 @_,
3835 ); 4152 );
3836 4153
3837 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4154 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3845 4162
3846 for my $child (@$widgets) { 4163 for my $child (@$widgets) {
3847 Scalar::Util::weaken $child; 4164 Scalar::Util::weaken $child;
3848 $child->{c_tab_} ||= do { 4165 $child->{c_tab_} ||= do {
3849 my $tab = 4166 my $tab =
3850 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4167 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
3851 ? $child->{c_tab} 4168 ? $child->{c_tab}
3852 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4169 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3853 4170
3854 $tab->connect (activate => sub { 4171 $tab->connect (activate => sub {
3855 $wself->set_current_page ($child); 4172 $wself->set_current_page ($child);
3856 }); 4173 });
3857 4174
3889sub pages { 4206sub pages {
3890 my ($self) = @_; 4207 my ($self) = @_;
3891 $self->{multiplexer}->children 4208 $self->{multiplexer}->children
3892} 4209}
3893 4210
4211sub page_index {
4212 my ($self, $widget) = @_;
4213
4214 my $i = 0;
4215 for ($self->pages) {
4216 if ($_ eq $widget) { return $i };
4217 $i++;
4218 }
4219
4220 undef
4221}
4222
3894sub add_tab { 4223sub add_tab {
3895 my ($self, $title, $widget, $tooltip) = @_; 4224 my ($self, $title, $widget, $tooltip) = @_;
3896 4225
3897 $title = [$title, $tooltip] unless ref $title; 4226 $title = [$title, $tooltip] unless ref $title;
3898 $widget->{c_tab} = $title; 4227 $widget->{c_tab} = $title;
3911 4240
3912 $self->{multiplexer}->set_current_page ($page); 4241 $self->{multiplexer}->set_current_page ($page);
3913 $self->emit (page_changed => $self->{multiplexer}{current}); 4242 $self->emit (page_changed => $self->{multiplexer}{current});
3914} 4243}
3915 4244
4245sub _draw {
4246 my ($self) = @_;
4247
4248 $self->SUPER::_draw ();
4249
4250 if (my $cur = $self->{multiplexer}{current}) {
4251 if ($cur = $cur->{c_tab_}) {
4252 glTranslate $self->{buttonbar}{x} + $cur->{x},
4253 $self->{buttonbar}{y} + $cur->{y};
4254 glLineWidth 3;
4255 #glEnable GL_BLEND;
4256 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4257 glColor @{$self->{active_outline}};
4258 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4259 glLineWidth 1;
4260 #glDisable GL_BLEND;
4261 }
4262 }
4263}
4264
3916############################################################################# 4265#############################################################################
3917 4266
3918package CFPlus::UI::Selector; 4267package DC::UI::Selector;
3919 4268
3920use utf8; 4269use utf8;
3921 4270
3922our @ISA = CFPlus::UI::Button::; 4271our @ISA = DC::UI::Button::;
3923 4272
3924sub new { 4273sub new {
3925 my $class = shift; 4274 my $class = shift;
3926 4275
3927 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
3944 my ($value, $title, $tooltip) = @$_; 4293 my ($value, $title, $tooltip) = @$_;
3945 4294
3946 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4295 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3947 } 4296 }
3948 4297
3949 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4298 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3950} 4299}
3951 4300
3952sub _set_value { 4301sub _set_value {
3953 my ($self, $value) = @_; 4302 my ($self, $value) = @_;
3954 4303
3955 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4304 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4305 $item ||= $self->{options}[0]
3956 or return; 4306 or return;
3957 4307
3958 $self->{value} = $item->[0]; 4308 $self->{value} = $item->[0];
3959 $self->set_markup ("$item->[1] ⇓"); 4309 $self->set_markup ("$item->[1] ⇓");
3960 $self->set_tooltip ($item->[2]); 4310# $self->set_tooltip ($item->[2]);
3961} 4311}
3962 4312
3963sub set_value { 4313sub set_value {
3964 my ($self, $value) = @_; 4314 my ($self, $value) = @_;
3965 4315
3967 4317
3968 $self->_set_value ($value); 4318 $self->_set_value ($value);
3969 $self->emit (changed => $value); 4319 $self->emit (changed => $value);
3970} 4320}
3971 4321
4322sub set_options {
4323 my ($self, $options) = @_;
4324
4325 $self->{options} = $options;
4326 $self->_set_value ($self->{value});
4327}
4328
3972############################################################################# 4329#############################################################################
3973 4330
3974package CFPlus::UI::Statusbox; 4331package DC::UI::Statusbox;
3975 4332
3976our @ISA = CFPlus::UI::VBox::; 4333our @ISA = DC::UI::VBox::;
3977 4334
3978sub new { 4335sub new {
3979 my $class = shift; 4336 my $class = shift;
3980 4337
3981 my $self = $class->SUPER::new ( 4338 my $self = $class->SUPER::new (
3982 fontsize => 0.8, 4339 fontsize => 0.8,
3983 @_, 4340 @_,
3984 ); 4341 );
3985 4342
3986 CFPlus::weaken (my $this = $self); 4343 DC::weaken (my $this = $self);
3987 4344
3988 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4345 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3989 4346
3990 $self 4347 $self
3991} 4348}
3992 4349
3993sub reorder { 4350sub reorder {
3994 my ($self) = @_; 4351 my ($self) = @_;
3995 my $NOW = Time::HiRes::time; 4352 my $NOW = AE::time;
3996 4353
3997 # freeze display when hovering over any label 4354 # freeze display when hovering over any label
3998 return if $CFPlus::UI::TOOLTIP->{owner} 4355 return if $DC::UI::TOOLTIP->{owner}
3999 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4356 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4000 values %{ $self->{item} }; 4357 values %{ $self->{item} };
4001 4358
4002 while (my ($k, $v) = each %{ $self->{item} }) { 4359 while (my ($k, $v) = each %{ $self->{item} }) {
4003 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4360 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4004 } 4361 }
4362
4363 $self->{timer}->set (1, 1);
4005 4364
4006 my @widgets; 4365 my @widgets;
4007 4366
4008 my @items = sort { 4367 my @items = sort {
4009 $a->{pri} <=> $b->{pri} 4368 $a->{pri} <=> $b->{pri}
4010 or $b->{id} <=> $a->{id} 4369 or $b->{id} <=> $a->{id}
4011 } values %{ $self->{item} }; 4370 } values %{ $self->{item} };
4012
4013 $self->{timer}->interval (1);
4014 4371
4015 my $count = 10 + 1; 4372 my $count = 10 + 1;
4016 for my $item (@items) { 4373 for my $item (@items) {
4017 last unless --$count; 4374 last unless --$count;
4018 4375
4025 for ($short) { 4382 for ($short) {
4026 s/^\s+//; 4383 s/^\s+//;
4027 s/\s+/ /g; 4384 s/\s+/ /g;
4028 } 4385 }
4029 4386
4030 new CFPlus::UI::Label 4387 new DC::UI::Label
4031 markup => $short, 4388 markup => $short,
4032 tooltip => $item->{tooltip}, 4389 tooltip => $item->{tooltip},
4033 tooltip_font => $::FONT_PROP, 4390 tooltip_font => $::FONT_PROP,
4034 tooltip_width => 0.67, 4391 tooltip_width => 0.67,
4035 fontsize => $item->{fontsize} || $self->{fontsize}, 4392 fontsize => $item->{fontsize} || $self->{fontsize},
4036 max_w => $::WIDTH * 0.44, 4393 max_w => $::WIDTH * 0.44,
4394 align => 0,
4037 fg => [@{ $item->{fg} }], 4395 fg => [@{ $item->{fg} }],
4038 can_events => 1, 4396 can_events => 1,
4039 can_hover => 1 4397 can_hover => 1
4040 }; 4398 };
4041 4399
4042 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4043 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4044 $label->update; 4402 $label->update;
4045 $label->set_max_size (undef, $label->{req_h} * $diff) 4403 $label->set_max_size (undef, $label->{req_h} * $diff)
4046 if $diff < 1; 4404 if $diff < 1;
4047 $self->{timer}->interval (1/30); 4405 $self->{timer}->set (1/30, 1/30);
4048 } else { 4406 } else {
4049 $label->{fg}[3] = $item->{fg}[3] || 1; 4407 $label->{fg}[3] = $item->{fg}[3] || 1;
4050 } 4408 }
4051 4409
4052 push @widgets, $label; 4410 push @widgets, $label;
4053 } 4411 }
4412
4413 my $hash = join ",", @widgets;
4414 return if $hash eq $self->{last_widget_hash};
4415 $self->{last_widget_hash} = $hash;
4054 4416
4055 $self->clear; 4417 $self->clear;
4056 $self->SUPER::add (reverse @widgets); 4418 $self->SUPER::add (reverse @widgets);
4057} 4419}
4058 4420
4094 $ROOT->on_refresh (reorder => sub { 4456 $ROOT->on_refresh (reorder => sub {
4095 $self->reorder; 4457 $self->reorder;
4096 }); 4458 });
4097} 4459}
4098 4460
4461sub clr_group {
4462 my ($self, $group) = @_;
4463
4464 if (delete $self->{item}{$group}) {
4465 $ROOT->on_refresh (reorder => sub {
4466 $self->reorder;
4467 });
4468 }
4469}
4470
4099sub reconfigure { 4471sub reconfigure {
4100 my ($self) = @_; 4472 my ($self) = @_;
4101 4473
4102 delete $_->{label} 4474 delete $_->{label}
4103 for values %{ $self->{item} || {} }; 4475 for values %{ $self->{item} || {} };
4114 $self->SUPER::destroy; 4486 $self->SUPER::destroy;
4115} 4487}
4116 4488
4117############################################################################# 4489#############################################################################
4118 4490
4119package CFPlus::UI::Root; 4491package DC::UI::Root;
4120 4492
4121our @ISA = CFPlus::UI::Container::; 4493our @ISA = DC::UI::Container::;
4122 4494
4123use List::Util qw(min max); 4495use List::Util qw(min max);
4124 4496
4125use CFPlus::OpenGL; 4497use DC::OpenGL;
4126 4498
4127sub new { 4499sub new {
4128 my $class = shift; 4500 my $class = shift;
4129 4501
4130 my $self = $class->SUPER::new ( 4502 my $self = $class->SUPER::new (
4131 visible => 1, 4503 visible => 1,
4132 @_, 4504 @_,
4133 ); 4505 );
4134 4506
4135 CFPlus::weaken ($self->{root} = $self); 4507 DC::weaken ($self->{root} = $self);
4136 4508
4137 $self 4509 $self
4138} 4510}
4139 4511
4140sub size_request { 4512sub size_request {
4188} 4560}
4189 4561
4190sub update { 4562sub update {
4191 my ($self) = @_; 4563 my ($self) = @_;
4192 4564
4193 $::WANT_REFRESH++; 4565 $::WANT_REFRESH = 1;
4194} 4566}
4195 4567
4196sub add { 4568sub add {
4197 my ($self, @children) = @_; 4569 my ($self, @children) = @_;
4198 4570
4257 while () { 4629 while () {
4258 @queue or last outer; 4630 @queue or last outer;
4259 4631
4260 $widget = pop @{ $queue[-1] || [] } 4632 $widget = pop @{ $queue[-1] || [] }
4261 and last; 4633 and last;
4262 4634
4263 pop @queue; 4635 pop @queue;
4264 } 4636 }
4265 4637
4266 delete $queue{$widget+0}; 4638 delete $queue{$widget+0};
4267 4639
4268 my ($w, $h) = $widget->size_request; 4640 my ($w, $h) = $widget->size_request;
4269 4641
4270 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4642 $w += $widget->{padding_x} * 2;
4271 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4643 $h += $widget->{padding_y} * 2;
4644
4645 $w = max $widget->{min_w}, $w;
4646 $h = max $widget->{min_h}, $h;
4272 4647
4273 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4648 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4274 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4649 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4275 4650
4276 $w = $widget->{force_w} if exists $widget->{force_w}; 4651 $w = $widget->{force_w} if exists $widget->{force_w};
4343 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4718 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4344 glMatrixMode GL_MODELVIEW; 4719 glMatrixMode GL_MODELVIEW;
4345 glLoadIdentity; 4720 glLoadIdentity;
4346 4721
4347 { 4722 {
4348 package CFPlus::UI::Base; 4723 package DC::UI::Base;
4349 4724
4350 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4725 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4351 (0, 0, $self->{w}, $self->{h}); 4726 (0, 0, $self->{w}, $self->{h});
4352 4727
4353 $self->_draw; 4728 $self->_draw;
4354 } 4729 }
4355} 4730}
4356 4731
4357############################################################################# 4732#############################################################################
4358 4733
4359package CFPlus::UI; 4734package DC::UI;
4360 4735
4361$ROOT = new CFPlus::UI::Root; 4736$ROOT = new DC::UI::Root;
4362$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4737$TOOLTIP = new DC::UI::Tooltip z => 900;
4363 4738
43641 47391
4365

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines