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.429 by root, Tue Aug 21 00:59:34 2007 UTC vs.
Revision 1.475 by root, Sun Jan 11 22:15:23 2009 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use Guard ();
9
10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 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 strict;
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
… …
364 $self->{force_h} = $h; 369 $self->{force_h} = $h;
365 370
366 $self->realloc; 371 $self->realloc;
367} 372}
368 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
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";
372} 395}
373 396
… …
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 strict;
625use CFPlus::OpenGL; 649use DC::OpenGL;
626 650
627sub new { 651sub new {
628 my $class = shift; 652 my $class = shift;
629
630 # range [value, low, high, page]
631 653
632 $class->SUPER::new ( 654 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
635 @_ 657 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 669 my ($w, $h) = @$self{qw(w h)};
648 670
649 glEnable GL_BLEND; 671 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 673 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 674 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 675 glDisable GL_BLEND;
661 } 676 }
662} 677}
663 678
664############################################################################# 679#############################################################################
665 680
666package CFPlus::UI::Empty; 681package DC::UI::Empty;
667 682
668our @ISA = CFPlus::UI::Base::; 683our @ISA = DC::UI::Base::;
669 684
670sub new { 685sub new {
671 my ($class, %arg) = @_; 686 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 687 $class->SUPER::new (can_events => 0, %arg);
673} 688}
… …
680 695
681sub draw { } 696sub draw { }
682 697
683############################################################################# 698#############################################################################
684 699
685package CFPlus::UI::Container; 700package DC::UI::Container;
686 701
687our @ISA = CFPlus::UI::Base::; 702our @ISA = DC::UI::Base::;
688 703
689sub new { 704sub new {
690 my ($class, %arg) = @_; 705 my ($class, %arg) = @_;
691 706
692 my $children = delete $arg{children}; 707 my $children = delete $arg{children};
… …
786 $_->draw for $self->visible_children; 801 $_->draw for $self->visible_children;
787} 802}
788 803
789############################################################################# 804#############################################################################
790 805
791package CFPlus::UI::Bin; 806package DC::UI::Bin;
792 807
793our @ISA = CFPlus::UI::Container::; 808our @ISA = DC::UI::Container::;
794 809
795sub new { 810sub new {
796 my ($class, %arg) = @_; 811 my ($class, %arg) = @_;
797 812
798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 813 my $child = (delete $arg{child}) || new DC::UI::Empty::;
799 814
800 $class->SUPER::new (children => [$child], %arg) 815 $class->SUPER::new (children => [$child], %arg)
801} 816}
802 817
803sub add { 818sub add {
… …
810sub remove { 825sub remove {
811 my ($self, $widget) = @_; 826 my ($self, $widget) = @_;
812 827
813 $self->SUPER::remove ($widget); 828 $self->SUPER::remove ($widget);
814 829
815 $self->{children} = [new CFPlus::UI::Empty] 830 $self->{children} = [new DC::UI::Empty]
816 unless @{$self->{children}}; 831 unless @{$self->{children}};
817} 832}
818 833
819sub child { $_[0]->{children}[0] } 834sub child { $_[0]->{children}[0] }
820 835
… …
829 844
830 1 845 1
831} 846}
832 847
833############################################################################# 848#############################################################################
834
835# back-buffered drawing area 849# back-buffered drawing area
836 850
837package CFPlus::UI::Window; 851package DC::UI::Window;
838 852
839our @ISA = CFPlus::UI::Bin::; 853our @ISA = DC::UI::Bin::;
840 854
841use CFPlus::OpenGL; 855use DC::OpenGL;
842 856
843sub new { 857sub new {
844 my ($class, %arg) = @_; 858 my ($class, %arg) = @_;
845 859
846 my $self = $class->SUPER::new (%arg); 860 my $self = $class->SUPER::new (%arg);
… …
868} 882}
869 883
870sub render_child { 884sub render_child {
871 my ($self) = @_; 885 my ($self) = @_;
872 886
873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 887 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
874 glClearColor 0, 0, 0, 0; 888 glClearColor 0, 0, 0, 0;
875 glClear GL_COLOR_BUFFER_BIT; 889 glClear GL_COLOR_BUFFER_BIT;
876 890
877 { 891 {
878 package CFPlus::UI::Base; 892 package DC::UI::Base;
879 893
880 local ($draw_x, $draw_y, $draw_w, $draw_h) = 894 local ($draw_x, $draw_y, $draw_w, $draw_h) =
881 (0, 0, $self->{w}, $self->{h}); 895 (0, 0, $self->{w}, $self->{h});
882 896
883 $self->_render; 897 $self->_render;
… …
900 glDisable GL_TEXTURE_2D; 914 glDisable GL_TEXTURE_2D;
901} 915}
902 916
903############################################################################# 917#############################################################################
904 918
905package CFPlus::UI::ViewPort; 919package DC::UI::ViewPort;
906 920
907use List::Util qw(min max); 921use List::Util qw(min max);
908 922
909our @ISA = CFPlus::UI::Window::; 923our @ISA = DC::UI::Window::;
910 924
911sub new { 925sub new {
912 my $class = shift; 926 my $class = shift;
913 927
914 $class->SUPER::new ( 928 $class->SUPER::new (
… …
998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1012 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
999 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1013 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1000 ) { 1014 ) {
1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1015 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1002 } else { 1016 } else {
1003 $self->CFPlus::UI::Base::find_widget ($x, $y) 1017 $self->DC::UI::Base::find_widget ($x, $y)
1004 } 1018 }
1005} 1019}
1006 1020
1007sub _render { 1021sub _render {
1008 my ($self) = @_; 1022 my ($self) = @_;
1009 1023
1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1024 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1025 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1012 1026
1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1027 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1014 1028
1015 $self->SUPER::_render; 1029 $self->SUPER::_render;
1016} 1030}
1017 1031
1018############################################################################# 1032#############################################################################
1019 1033
1020package CFPlus::UI::ScrolledWindow; 1034package DC::UI::ScrolledWindow;
1021 1035
1022our @ISA = CFPlus::UI::Table::; 1036our @ISA = DC::UI::Table::;
1023 1037
1024sub new { 1038sub new {
1025 my ($class, %arg) = @_; 1039 my ($class, %arg) = @_;
1026 1040
1027 my $child = delete $arg{child}; 1041 my $child = delete $arg{child};
1028 1042
1029 my $self; 1043 my $self;
1030 1044
1031 my $hslider = new CFPlus::UI::Slider 1045 my $hslider = new DC::UI::Slider
1032 c_col => 0, 1046 c_col => 0,
1033 c_row => 1, 1047 c_row => 1,
1034 vertical => 0, 1048 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1050 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1051 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1053 },
1040 ; 1054 ;
1041 1055
1042 my $vslider = new CFPlus::UI::Slider 1056 my $vslider = new DC::UI::Slider
1043 c_col => 1, 1057 c_col => 1,
1044 c_row => 0, 1058 c_row => 0,
1045 vertical => 1, 1059 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1061 on_changed => sub {
… …
1059 col_expand => [1, 0], 1073 col_expand => [1, 0],
1060 row_expand => [1, 0], 1074 row_expand => [1, 0],
1061 %arg, 1075 %arg,
1062 ); 1076 );
1063 1077
1064 $self->{vp} = new CFPlus::UI::ViewPort 1078 $self->{vp} = new DC::UI::ViewPort
1065 c_col => 0, 1079 c_col => 0,
1066 c_row => 0, 1080 c_row => 0,
1067 expand => 1, 1081 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1082 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1083 scroll_y => $self->{scroll_y},
… …
1195 $self->SUPER::invoke_size_allocate ($w, $h) 1209 $self->SUPER::invoke_size_allocate ($w, $h)
1196} 1210}
1197 1211
1198############################################################################# 1212#############################################################################
1199 1213
1200package CFPlus::UI::Frame; 1214package DC::UI::Frame;
1201 1215
1202our @ISA = CFPlus::UI::Bin::; 1216our @ISA = DC::UI::Bin::;
1203 1217
1204use CFPlus::OpenGL; 1218use DC::OpenGL;
1205 1219
1206sub new { 1220sub new {
1207 my $class = shift; 1221 my $class = shift;
1208 1222
1209 $class->SUPER::new ( 1223 $class->SUPER::new (
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1233 my ($w, $h) = @$self{qw(w h)};
1220 1234
1221 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1237 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1238 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1239 glDisable GL_BLEND;
1233 } 1240 }
1234 1241
1235 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1236} 1243}
1237 1244
1238############################################################################# 1245#############################################################################
1239 1246
1240package CFPlus::UI::FancyFrame; 1247package DC::UI::FancyFrame;
1241 1248
1242our @ISA = CFPlus::UI::Bin::; 1249our @ISA = DC::UI::Bin::;
1243 1250
1244use CFPlus::OpenGL; 1251use DC::OpenGL;
1245 1252
1246sub new { 1253sub new {
1247 my ($class, %arg) = @_; 1254 my ($class, %arg) = @_;
1248 1255
1249 if ((exists $arg{label}) && !ref $arg{label}) { 1256 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label 1257 $arg{label} = new DC::UI::Label
1251 align => 1, 1258 align => 1,
1252 valign => 0, 1259 valign => 0.5,
1253 text => $arg{label}, 1260 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75; 1261 fontsize => ($arg{border} || 0.8) * 0.75;
1255 } 1262 }
1256 1263
1257 my $self = $class->SUPER::new ( 1264 my $self = $class->SUPER::new (
1258 # label => "", 1265 # label => "",
1259 fg => [0.6, 0.3, 0.1], 1266 fg => undef,
1260 border => 0.8, 1267 border => 0.8,
1261 style => 'single', 1268 style => 'single',
1262 %arg, 1269 %arg,
1263 ); 1270 );
1264 1271
… …
1267 1274
1268sub add { 1275sub add {
1269 my ($self, @widgets) = @_; 1276 my ($self, @widgets) = @_;
1270 1277
1271 $self->SUPER::add (@widgets); 1278 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1279 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273} 1280}
1274 1281
1275sub border { 1282sub border {
1276 int $_[0]{border} * $::FONTSIZE 1283 int $_[0]{border} * $::FONTSIZE
1277} 1284}
… …
1317 my $border = $self->border; 1324 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h}); 1325 my ($w, $h) = ($self->{w}, $self->{h});
1319 1326
1320 $child->draw; 1327 $child->draw;
1321 1328
1322 glColor @{$self->{fg}}; 1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1323 glBegin GL_LINE_STRIP; 1330 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1335 } 1342 }
1336} 1343}
1337 1344
1338############################################################################# 1345#############################################################################
1339 1346
1340package CFPlus::UI::Toplevel; 1347package DC::UI::Toplevel;
1341 1348
1342our @ISA = CFPlus::UI::Bin::; 1349our @ISA = DC::UI::Bin::;
1343 1350
1344use CFPlus::OpenGL; 1351use DC::OpenGL;
1345 1352
1346my $bg = 1353my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1348 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1349 1356
1350my @border = 1357my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1358 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); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353 1360
1354my @icon = 1361my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png); 1363 qw(x1_move.png x1_resize.png);
1357 1364
1358sub new { 1365sub new {
1359 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1360 1367
1361 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1362 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1363 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1364 border => 0.6, 1371 border => 0.8,
1365 can_events => 1, 1372 can_events => 1,
1366 min_w => 64, 1373 min_w => 64,
1367 min_h => 32, 1374 min_h => 32,
1368 %arg, 1375 %arg,
1369 ); 1376 );
1370 1377
1371 $self->{title_widget} = new CFPlus::UI::Label 1378 $self->{title_widget} = new DC::UI::Label
1372 align => 0, 1379 align => 0.5,
1373 valign => 1, 1380 valign => 1,
1374 text => $self->{title}, 1381 text => $self->{title},
1375 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1376 if exists $self->{title}; 1383 if exists $self->{title};
1377 1384
1378 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1379 $self->{close_button} = 1386 $self->{close_button} =
1380 new CFPlus::UI::ImageButton 1387 new DC::UI::ImageButton
1381 path => 'x1_close.png', 1388 path => 'x1_close.png',
1382 on_activate => sub { $self->emit ("delete") }; 1389 on_activate => sub { $self->emit ("delete") };
1383 1390
1384 $self->CFPlus::UI::Container::add ($self->{close_button}); 1391 $self->DC::UI::Container::add ($self->{close_button});
1385 } 1392 }
1386 1393
1387 $self 1394 $self
1388} 1395}
1389 1396
1390sub add { 1397sub add {
1391 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1392 1399
1393 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1401 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1402 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1396} 1403}
1397 1404
1398sub border { 1405sub border {
1399 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1407}
1408
1409sub get_max_wh {
1410 my ($self) = @_;
1411
1412 return ($self->{w}, $self->{h})
1413 if $self->{visible} && $self->{w};
1414
1415 $self->SUPER::get_max_wh
1400} 1416}
1401 1417
1402sub size_request { 1418sub size_request {
1403 my ($self) = @_; 1419 my ($self) = @_;
1404 1420
… …
1529 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 1547
1532 my $border = $self->border; 1548 my $border = $self->border;
1533 1549
1550 if ($border) {
1534 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539 1556
1540 # move 1557 # move
1541 my $w2 = ($w - $border) * .5; 1558 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5; 1559 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546 1563
1547 # resize 1564 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button}; 1567 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1553 1571
1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1555 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1556 1574
1557 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
… …
1576 if $self->{close_button}; 1594 if $self->{close_button};
1577} 1595}
1578 1596
1579############################################################################# 1597#############################################################################
1580 1598
1581package CFPlus::UI::Table; 1599package DC::UI::Table;
1582 1600
1583our @ISA = CFPlus::UI::Container::; 1601our @ISA = DC::UI::Container::;
1584 1602
1585use List::Util qw(max sum); 1603use List::Util qw(max sum);
1586 1604
1587use CFPlus::OpenGL; 1605use DC::OpenGL;
1588 1606
1589sub new { 1607sub new {
1590 my $class = shift; 1608 my $class = shift;
1591 1609
1592 $class->SUPER::new ( 1610 $class->SUPER::new (
… …
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)}; 1654 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1655
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1656 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1657
1640 if ($w > $sw) { 1658 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1659 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1660 }
1643 } 1661 }
1644 1662
1645 # second pass, rows 1663 # second pass, rows
1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { 1664 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)}; 1665 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1666
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1667 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1668
1651 if ($h > $sh) { 1669 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1670 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1653 } 1671 }
1654 } 1672 }
1655 1673
1656 (\@w, \@h) 1674 (\@w, \@h)
1657} 1675}
… …
1680 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1681 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1682 1700
1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1684 1702
1685 CFPlus::UI::harmonize $ws; 1703 DC::UI::harmonize $ws;
1686 1704
1687 my @row_expand = @{$self->{row_expand}}; 1705 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand; 1706 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1; 1707 my $row_expand = (sum @row_expand) || 1;
1690 1708
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692 1710
1693 CFPlus::UI::harmonize $hs; 1711 DC::UI::harmonize $hs;
1694 1712
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1713 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1714 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1715
1698 for my $widget ($self->children) { 1716 for my $widget ($self->children) {
… …
1707 1 1725 1
1708} 1726}
1709 1727
1710############################################################################# 1728#############################################################################
1711 1729
1712package CFPlus::UI::Fixed; 1730package DC::UI::Fixed;
1713 1731
1714use List::Util qw(min max); 1732use List::Util qw(min max);
1715 1733
1716our @ISA = CFPlus::UI::Container::; 1734our @ISA = DC::UI::Container::;
1717 1735
1718sub _scale($$$) { 1736sub _scale($$$) {
1719 my ($rel, $val, $max) = @_; 1737 my ($rel, $val, $max) = @_;
1720 1738
1721 $rel ? $val * $max : $val 1739 $rel ? $val * $max : $val
… …
1773 1 1791 1
1774} 1792}
1775 1793
1776############################################################################# 1794#############################################################################
1777 1795
1778package CFPlus::UI::Box; 1796package DC::UI::Box;
1779 1797
1780our @ISA = CFPlus::UI::Container::; 1798our @ISA = DC::UI::Container::;
1781 1799
1782sub size_request { 1800sub size_request {
1783 my ($self) = @_; 1801 my ($self) = @_;
1784 1802
1785 my @children = $self->visible_children; 1803 my @children = $self->visible_children;
… …
1820 $req[$_] += $space * $children[$_]{expand} 1838 $req[$_] += $space * $children[$_]{expand}
1821 for 0 .. $#children; 1839 for 0 .. $#children;
1822 } 1840 }
1823 } 1841 }
1824 1842
1825 CFPlus::UI::harmonize \@req; 1843 DC::UI::harmonize \@req;
1826 1844
1827 my $pos = 0; 1845 my $pos = 0;
1828 for (0 .. $#children) { 1846 for (0 .. $#children) {
1829 my $alloc = $req[$_]; 1847 my $alloc = $req[$_];
1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1848 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1835 1 1853 1
1836} 1854}
1837 1855
1838############################################################################# 1856#############################################################################
1839 1857
1840package CFPlus::UI::HBox; 1858package DC::UI::HBox;
1841 1859
1842our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1843 1861
1844sub new { 1862sub new {
1845 my $class = shift; 1863 my $class = shift;
1846 1864
1847 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1850 ) 1868 )
1851} 1869}
1852 1870
1853############################################################################# 1871#############################################################################
1854 1872
1855package CFPlus::UI::VBox; 1873package DC::UI::VBox;
1856 1874
1857our @ISA = CFPlus::UI::Box::; 1875our @ISA = DC::UI::Box::;
1858 1876
1859sub new { 1877sub new {
1860 my $class = shift; 1878 my $class = shift;
1861 1879
1862 $class->SUPER::new ( 1880 $class->SUPER::new (
… …
1865 ) 1883 )
1866} 1884}
1867 1885
1868############################################################################# 1886#############################################################################
1869 1887
1870package CFPlus::UI::Label; 1888package DC::UI::Label;
1871 1889
1872our @ISA = CFPlus::UI::DrawBG::; 1890our @ISA = DC::UI::DrawBG::;
1873 1891
1874use CFPlus::OpenGL; 1892use DC::OpenGL;
1875 1893
1876sub new { 1894sub new {
1877 my ($class, %arg) = @_; 1895 my ($class, %arg) = @_;
1878 1896
1879 my $self = $class->SUPER::new ( 1897 my $self = $class->SUPER::new (
… …
1884 #text => initial text 1902 #text => initial text
1885 #markup => initial narkup 1903 #markup => initial narkup
1886 #max_w => maximum pixel width 1904 #max_w => maximum pixel width
1887 #style => 0, # render flags 1905 #style => 0, # render flags
1888 ellipsise => 3, # end 1906 ellipsise => 3, # end
1889 layout => (new CFPlus::Layout), 1907 layout => (new DC::Layout),
1890 fontsize => 1, 1908 fontsize => 1,
1891 align => -1, 1909 align => 0.5,
1892 valign => -1, 1910 valign => 0.5,
1893 padding_x => 2, 1911 padding_x => 4,
1894 padding_y => 2, 1912 padding_y => 2,
1895 can_events => 0, 1913 can_events => 0,
1896 %arg 1914 %arg
1897 ); 1915 );
1898 1916
1899 if (exists $self->{template}) { 1917 if (exists $self->{template}) {
1900 my $layout = new CFPlus::Layout; 1918 my $layout = new DC::Layout;
1901 $layout->set_text (delete $self->{template}); 1919 $layout->set_text (delete $self->{template});
1902 $self->{template} = $layout; 1920 $self->{template} = $layout;
1903 } 1921 }
1904 1922
1905 if (exists $self->{markup}) { 1923 if (exists $self->{markup}) {
… …
1961 1979
1962sub size_request { 1980sub size_request {
1963 my ($self) = @_; 1981 my ($self) = @_;
1964 1982
1965 $self->{size_req} ||= do { 1983 $self->{size_req} ||= do {
1984 my ($max_w, $max_h) = $self->get_max_wh;
1985
1966 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1967 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($max_w);
1968 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1969 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1970 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1971 1991
1972 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1973 1993
1974 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1975 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1976 $self->{template}->set_width ($self->{max_w} || -1); 1996 $self->{template}->set_width ($max_w);
1977 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1978 1998
1979 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1980 2000
1981 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
2037 2057
2038 [$self->{layout}->size] 2058 [$self->{layout}->size]
2039 }; 2059 };
2040 2060
2041 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
2042 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2043 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2063 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2044 : ($self->{w} - $size->[0]) * 0.5);
2045
2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2048 : ($self->{h} - $size->[1]) * 0.5);
2049 2064
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2051 }; 2066 };
2052 2067
2053# unless ($self->{list}) { 2068# unless ($self->{list}) {
2054# $self->{list} = CFPlus::OpenGL::glGenList; 2069# $self->{list} = DC::OpenGL::glGenList;
2055# CFPlus::OpenGL::glNewList $self->{list}; 2070# DC::OpenGL::glNewList $self->{list};
2056# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2071# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2057# CFPlus::OpenGL::glEndList; 2072# DC::OpenGL::glEndList;
2058# } 2073# }
2059# 2074#
2060# CFPlus::OpenGL::glCallList $self->{list}; 2075# DC::OpenGL::glCallList $self->{list};
2061 2076
2062 $self->{layout}->draw; 2077 $self->{layout}->draw;
2063} 2078}
2064 2079
2065#sub destroy { 2080#sub destroy {
2066# my ($self) = @_; 2081# my ($self) = @_;
2067# 2082#
2068# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2083# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2069# 2084#
2070# $self->SUPER::destroy; 2085# $self->SUPER::destroy;
2071#} 2086#}
2072 2087
2073############################################################################# 2088#############################################################################
2074 2089
2075package CFPlus::UI::EntryBase; 2090package DC::UI::EntryBase;
2076 2091
2077our @ISA = CFPlus::UI::Label::; 2092our @ISA = DC::UI::Label::;
2078 2093
2079use CFPlus::OpenGL; 2094use DC::OpenGL;
2080 2095
2081sub new { 2096sub new {
2082 my $class = shift; 2097 my $class = shift;
2083 2098
2084 $class->SUPER::new ( 2099 $class->SUPER::new (
2085 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
2086 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1], 2102 outline => undef,
2088 active_bg => [0, 0, 1, .2], 2103 active_bg => [0, 0, 1, .2],
2089 active_fg => [1, 1, 1], 2104 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0], 2105 active_outline => [1, 1, 0],
2091 can_hover => 1, 2106 can_hover => 1,
2092 can_focus => 1, 2107 can_focus => 1,
2108 align => 0,
2093 valign => 0, 2109 valign => 0.5,
2094 can_events => 1, 2110 can_events => 1,
2095 ellipsise => 0, 2111 ellipsise => 0,
2112 padding_x => 4,
2113 padding_y => 2,
2096 #text => ... 2114 #text => ...
2097 #hidden => "*", 2115 #hidden => "*",
2098 @_ 2116 @_
2099 ) 2117 )
2100} 2118}
… …
2147 2165
2148 my $text = $self->get_text; 2166 my $text = $self->get_text;
2149 2167
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2168 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2151 2169
2152 if ($uni == 8) { 2170 if ($sym == DC::SDLK_BACKSPACE) {
2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2154 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
2155 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
2156 } elsif ($sym == CFPlus::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
2157 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
2158 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
2159 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2160 } elsif ($sym == CFPlus::SDLK_HOME) { 2178 } elsif ($sym == DC::SDLK_HOME) {
2161 # what a hack 2179 # what a hack
2162 $self->{cursor} = 2180 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2181 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1 2182 ? length $1
2165 : 0; 2183 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) { 2184 } elsif ($sym == DC::SDLK_END) {
2167 # uh, again 2185 # uh, again
2168 $self->{cursor} = 2186 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2187 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1 2188 ? $self->{cursor} + length $1
2171 : length $self->{text}; 2189 : length $self->{text};
… …
2235 glColor_premultiply @{$self->{bg}}; 2253 glColor_premultiply @{$self->{bg}};
2236 } 2254 }
2237 2255
2238 glEnable GL_BLEND; 2256 glEnable GL_BLEND;
2239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2257 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2240 glBegin GL_QUADS;
2241 glVertex 0 , 0;
2242 glVertex 0 , $self->{h};
2243 glVertex $self->{w}, $self->{h}; 2258 glRect 0, 0, $self->{w}, $self->{h};
2244 glVertex $self->{w}, 0;
2245 glEnd;
2246 glDisable GL_BLEND; 2259 glDisable GL_BLEND;
2247 2260
2248 $self->SUPER::_draw; 2261 $self->SUPER::_draw;
2249 2262
2250 #TODO: force update every cursor change :( 2263 #TODO: force update every cursor change :(
… …
2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2258 } 2271 }
2259 2272
2260 glColor_premultiply @{$self->{active_fg}}; 2273 glColor_premultiply @{$self->{active_fg}};
2261 glBegin GL_LINES; 2274 glBegin GL_LINES;
2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2264 glEnd; 2277 glEnd;
2265 2278
2266 glLineWidth 3; 2279 glLineWidth 3;
2267 glColor @{$self->{active_outline}}; 2280 glColor @{$self->{active_outline}};
2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2282 glLineWidth 1;
2283
2284 } else {
2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2268 glBegin GL_LINE_LOOP; 2286 glBegin GL_LINE_STRIP;
2269 glVertex 0, 0; 2287 glVertex .5, $self->{h} * .5;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1; 2288 glVertex .5, $self->{h} - 2.5;
2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2290 glVertex $self->{w} - .5, $self->{h} * .5;
2273 glEnd; 2291 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2284 glEnd;
2285 } 2292 }
2286} 2293}
2287 2294
2288############################################################################# 2295#############################################################################
2289 2296
2290package CFPlus::UI::Entry; 2297package DC::UI::Entry;
2291 2298
2292our @ISA = CFPlus::UI::EntryBase::; 2299our @ISA = DC::UI::EntryBase::;
2293 2300
2294use CFPlus::OpenGL; 2301use DC::OpenGL;
2302
2303sub new {
2304 my $class = shift;
2305
2306 $class->SUPER::new (
2307 history_pointer => -1,
2308 @_
2309 )
2310}
2311
2295 2312
2296sub invoke_key_down { 2313sub invoke_key_down {
2297 my ($self, $ev) = @_; 2314 my ($self, $ev) = @_;
2298 2315
2299 my $sym = $ev->{sym}; 2316 my $sym = $ev->{sym};
… …
2305 $self->{history_pointer} = -1; 2322 $self->{history_pointer} = -1;
2306 $self->{history_saveback} = ''; 2323 $self->{history_saveback} = '';
2307 $self->emit (activate => $txt); 2324 $self->emit (activate => $txt);
2308 $self->update; 2325 $self->update;
2309 2326
2310 } elsif ($sym == CFPlus::SDLK_UP) { 2327 } elsif ($sym == DC::SDLK_UP) {
2311 if ($self->{history_pointer} < 0) { 2328 if ($self->{history_pointer} < 0) {
2312 $self->{history_saveback} = $self->get_text; 2329 $self->{history_saveback} = $self->get_text;
2313 } 2330 }
2314 if (@{$self->{history} || []} > 0) { 2331 if (@{$self->{history} || []} > 0) {
2315 $self->{history_pointer}++; 2332 $self->{history_pointer}++;
… …
2317 $self->{history_pointer} = @{$self->{history} || []} - 1; 2334 $self->{history_pointer} = @{$self->{history} || []} - 1;
2318 } 2335 }
2319 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2336 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2320 } 2337 }
2321 2338
2322 } elsif ($sym == CFPlus::SDLK_DOWN) { 2339 } elsif ($sym == DC::SDLK_DOWN) {
2323 $self->{history_pointer}--; 2340 $self->{history_pointer}--;
2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2341 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2325 2342
2326 if ($self->{history_pointer} >= 0) { 2343 if ($self->{history_pointer} >= 0) {
2327 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2328 } else { 2345 } else {
2346 if (defined $self->{history_saveback}) {
2329 $self->set_text ($self->{history_saveback}); 2347 $self->set_text ($self->{history_saveback});
2348 $self->{history_saveback} = undef;
2349 }
2330 } 2350 }
2331 2351
2332 } else { 2352 } else {
2333 return $self->SUPER::invoke_key_down ($ev) 2353 return $self->SUPER::invoke_key_down ($ev)
2334 } 2354 }
… …
2336 1 2356 1
2337} 2357}
2338 2358
2339############################################################################# 2359#############################################################################
2340 2360
2341package CFPlus::UI::TextEdit; 2361package DC::UI::TextEdit;
2342 2362
2343our @ISA = CFPlus::UI::EntryBase::; 2363our @ISA = DC::UI::EntryBase::;
2344 2364
2345use CFPlus::OpenGL; 2365use DC::OpenGL;
2366
2367sub new {
2368 my $class = shift;
2369
2370 $class->SUPER::new (
2371 padding_y => 4,
2372
2373 @_
2374 )
2375}
2346 2376
2347sub move_cursor_ver { 2377sub move_cursor_ver {
2348 my ($self, $dy) = @_; 2378 my ($self, $dy) = @_;
2349 2379
2350 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2380 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2351 2381
2352 $y += $dy; 2382 $line += $dy;
2353 2383
2354 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2384 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2355 $self->{cursor} = $index; 2385 $self->{cursor} = $index;
2356 delete $self->{cur_h}; 2386 delete $self->{cur_h};
2357 $self->update; 2387 $self->update;
2358 return; 2388 return;
2359 } 2389 }
… …
2362sub invoke_key_down { 2392sub invoke_key_down {
2363 my ($self, $ev) = @_; 2393 my ($self, $ev) = @_;
2364 2394
2365 my $sym = $ev->{sym}; 2395 my $sym = $ev->{sym};
2366 2396
2367 if ($sym == CFPlus::SDLK_UP) { 2397 if ($sym == DC::SDLK_UP) {
2368 $self->move_cursor_ver (-1); 2398 $self->move_cursor_ver (-1);
2369 } elsif ($sym == CFPlus::SDLK_DOWN) { 2399 } elsif ($sym == DC::SDLK_DOWN) {
2370 $self->move_cursor_ver (+1); 2400 $self->move_cursor_ver (+1);
2371 } else { 2401 } else {
2372 return $self->SUPER::invoke_key_down ($ev) 2402 return $self->SUPER::invoke_key_down ($ev)
2373 } 2403 }
2374 2404
2375 1 2405 1
2376} 2406}
2377 2407
2378############################################################################# 2408#############################################################################
2379 2409
2380package CFPlus::UI::ButtonBin; 2410package DC::UI::ButtonBin;
2381 2411
2382our @ISA = CFPlus::UI::Bin::; 2412our @ISA = DC::UI::Bin::;
2383 2413
2384use CFPlus::OpenGL; 2414use DC::OpenGL;
2385 2415
2386my @tex = 2416my @tex =
2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2388 qw(b1_button_inactive.png b1_button_active.png); 2418 qw(b1_button_inactive.png b1_button_active.png);
2389 2419
2390sub new { 2420sub new {
2391 my $class = shift; 2421 my $class = shift;
2392 2422
2393 $class->SUPER::new ( 2423 $class->SUPER::new (
2394 can_hover => 1, 2424 can_hover => 1,
2395 align => 0, 2425 align => 0.5,
2396 valign => 0, 2426 valign => 0.5,
2397 can_events => 1, 2427 can_events => 1,
2398 @_ 2428 @_
2399 ) 2429 )
2400} 2430}
2401 2431
… …
2424 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2425} 2455}
2426 2456
2427############################################################################# 2457#############################################################################
2428 2458
2429package CFPlus::UI::Button; 2459package DC::UI::Button;
2430 2460
2431our @ISA = CFPlus::UI::Label::; 2461our @ISA = DC::UI::Label::;
2432 2462
2433use CFPlus::OpenGL; 2463use DC::OpenGL;
2434 2464
2435my @tex = 2465my @tex =
2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2437 qw(b1_button_inactive.png b1_button_active.png); 2467 qw(b1_button_inactive.png b1_button_active.png);
2438 2468
2439sub new { 2469sub new {
2440 my $class = shift; 2470 my $class = shift;
2441 2471
2442 $class->SUPER::new ( 2472 $class->SUPER::new (
2443 padding_x => 4, 2473 padding_x => 8,
2444 padding_y => 4, 2474 padding_y => 4,
2445 fg => [1.0, 1.0, 1.0], 2475 fg => [1.0, 1.0, 1.0],
2446 active_fg => [0.8, 0.8, 0.8], 2476 active_fg => [0.8, 0.8, 0.8],
2447 can_hover => 1, 2477 can_hover => 1,
2448 align => 0, 2478 align => 0.5,
2449 valign => 0, 2479 valign => 0.5,
2450 can_events => 1, 2480 can_events => 1,
2451 @_ 2481 @_
2452 ) 2482 )
2453} 2483}
2454 2484
… …
2479 $self->SUPER::_draw; 2509 $self->SUPER::_draw;
2480} 2510}
2481 2511
2482############################################################################# 2512#############################################################################
2483 2513
2484package CFPlus::UI::CheckBox; 2514package DC::UI::CheckBox;
2485 2515
2486our @ISA = CFPlus::UI::DrawBG::; 2516our @ISA = DC::UI::DrawBG::;
2487 2517
2488my @tex = 2518my @tex =
2489 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2490 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2491 2521
2492use CFPlus::OpenGL; 2522use DC::OpenGL;
2493 2523
2494sub new { 2524sub new {
2495 my $class = shift; 2525 my $class = shift;
2496 2526
2497 $class->SUPER::new ( 2527 $class->SUPER::new (
2528 fontsize => 1,
2498 padding_x => 2, 2529 padding_x => 2,
2499 padding_y => 2, 2530 padding_y => 2,
2500 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2501 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2502 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
… …
2508} 2539}
2509 2540
2510sub size_request { 2541sub size_request {
2511 my ($self) = @_; 2542 my ($self) = @_;
2512 2543
2513 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2514} 2545}
2515 2546
2516sub toggle { 2547sub toggle {
2517 my ($self) = @_; 2548 my ($self) = @_;
2518 2549
… …
2537sub _draw { 2568sub _draw {
2538 my ($self) = @_; 2569 my ($self) = @_;
2539 2570
2540 $self->SUPER::_draw; 2571 $self->SUPER::_draw;
2541 2572
2542 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2573 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2543 2574
2544 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2545 2576
2546 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2577 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2547 2578
… …
2554 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2555} 2586}
2556 2587
2557############################################################################# 2588#############################################################################
2558 2589
2559package CFPlus::UI::Image; 2590package DC::UI::Image;
2560 2591
2561our @ISA = CFPlus::UI::Base::; 2592our @ISA = DC::UI::Base::;
2562 2593
2563use CFPlus::OpenGL; 2594use DC::OpenGL;
2564 2595
2565our %texture_cache; 2596our %texture_cache;
2566 2597
2567sub new { 2598sub new {
2568 my $class = shift; 2599 my $class = shift;
… …
2575 2606
2576 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2577 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2578 2609
2579 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2580 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2581 2612
2582 CFPlus::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2583 2614
2584 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2585 2616
2586 $self 2617 $self
2587} 2618}
2588 2619
2589sub STORABLE_freeze { 2620sub STORABLE_freeze {
2590 my ($self, $cloning) = @_; 2621 my ($self, $cloning) = @_;
2591 2622
2592 $self->{path} 2623 $self->{path}
2593 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2624 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2594 2625
2595 $self->{path} 2626 $self->{path}
2596} 2627}
2597 2628
2598sub STORABLE_attach { 2629sub STORABLE_attach {
… …
2629 glDisable GL_TEXTURE_2D; 2660 glDisable GL_TEXTURE_2D;
2630} 2661}
2631 2662
2632############################################################################# 2663#############################################################################
2633 2664
2634package CFPlus::UI::ImageButton; 2665package DC::UI::ImageButton;
2635 2666
2636our @ISA = CFPlus::UI::Image::; 2667our @ISA = DC::UI::Image::;
2637 2668
2638use CFPlus::OpenGL; 2669use DC::OpenGL;
2639 2670
2640my %textures; 2671my %textures;
2641 2672
2642sub new { 2673sub new {
2643 my $class = shift; 2674 my $class = shift;
… …
2646 padding_x => 4, 2677 padding_x => 4,
2647 padding_y => 4, 2678 padding_y => 4,
2648 fg => [1, 1, 1], 2679 fg => [1, 1, 1],
2649 active_fg => [0, 0, 1], 2680 active_fg => [0, 0, 1],
2650 can_hover => 1, 2681 can_hover => 1,
2651 align => 0, 2682 align => 0.5,
2652 valign => 0, 2683 valign => 0.5,
2653 can_events => 1, 2684 can_events => 1,
2654 @_ 2685 @_
2655 ); 2686 );
2656} 2687}
2657 2688
… …
2671 1 2702 1
2672} 2703}
2673 2704
2674############################################################################# 2705#############################################################################
2675 2706
2676package CFPlus::UI::VGauge; 2707package DC::UI::VGauge;
2677 2708
2678our @ISA = CFPlus::UI::Base::; 2709our @ISA = DC::UI::Base::;
2679 2710
2680use List::Util qw(min max); 2711use List::Util qw(min max);
2681 2712
2682use CFPlus::OpenGL; 2713use DC::OpenGL;
2683 2714
2684my %tex = ( 2715my %tex = (
2685 food => [ 2716 food => [
2686 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2687 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2688 ], 2719 ],
2689 grace => [ 2720 grace => [
2690 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2691 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2722 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2692 ], 2723 ],
2693 hp => [ 2724 hp => [
2694 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2695 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2696 ], 2727 ],
2697 mana => [ 2728 mana => [
2698 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2729 map { new_from_resource DC::Texture $_, mipmap => 1 }
2699 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2730 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2700 ], 2731 ],
2701); 2732);
2702 2733
2703# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2806 glDisable GL_TEXTURE_2D; 2837 glDisable GL_TEXTURE_2D;
2807} 2838}
2808 2839
2809############################################################################# 2840#############################################################################
2810 2841
2842package DC::UI::Progress;
2843
2844our @ISA = DC::UI::Label::;
2845
2846use DC::OpenGL;
2847
2848sub new {
2849 my ($class, %arg) = @_;
2850
2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2854 fg => [1, 1, 1],
2855 bg => [0, 0, 1, 0.2],
2856 bar => [0.7, 0.5, 0.1, 0.8],
2857 outline => [0.4, 0.3, 0],
2858 fontsize => 0.9,
2859 valign => 0.5,
2860 align => 0.5,
2861 can_events => 1,
2862 ellipsise => 1,
2863 label => "%d%%",
2864 %arg,
2865 );
2866
2867 $self->set_value ($arg{value} || -1);
2868
2869 $self
2870}
2871
2872sub set_label {
2873 my ($self, $label) = @_;
2874
2875 return if $self->{label} eq $label;
2876 $self->{label} = $label;
2877
2878 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2879}
2880
2881sub set_value {
2882 my ($self, $value) = @_;
2883
2884 if ($self->{value} ne $value) {
2885 $self->{value} = $value;
2886
2887 if ($value < 0) {
2888 $self->set_text ("-");
2889 } else {
2890 $self->set_text (sprintf $self->{label}, $value * 100);
2891 }
2892
2893 $self->update;
2894 }
2895}
2896
2897sub _draw {
2898 my ($self) = @_;
2899
2900 glEnable GL_BLEND;
2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2906 if ($self->{value} >= 0) {
2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2908
2909 glColor_premultiply @{$self->{bar}};
2910 glRect $px, $py, $s, $self->{h} - $py;
2911 glColor_premultiply @{$self->{bg}};
2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2913 }
2914
2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2921
2922 glDisable GL_BLEND;
2923
2924 {
2925 local $self->{bg}; # do not draw background
2926 $self->SUPER::_draw;
2927 }
2928}
2929
2930#############################################################################
2931
2932package DC::UI::ExperienceProgress;
2933
2934our @ISA = DC::UI::Progress::;
2935
2936sub new {
2937 my ($class, %arg) = @_;
2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2941 my $self = $class->SUPER::new (
2942 %arg,
2943 tooltip => sub {
2944 my ($self) = @_;
2945
2946 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2947 $tt,
2948 $self->{lvl},
2949 ::formsep ($self->{exp}),
2950 ::formsep ($self->{nxt}),
2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2953 },
2954 );
2955
2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2957 if $::CONN;
2958
2959 $self
2960}
2961
2962sub DESTROY {
2963 my ($self) = @_;
2964
2965 delete $::CONN->{on_exp_update}{$self+0}
2966 if $::CONN;
2967
2968 $self->SUPER::DESTROY;
2969}
2970
2971sub _percent {
2972 my ($self) = @_;
2973
2974 my $table = $::CONN && $::CONN->{exp_table}
2975 or return -1;
2976
2977 my $l0 = $table->[$self->{lvl} - 1];
2978 my $l1 = $table->[$self->{lvl}];
2979
2980 $self->{nxt} = $l1;
2981
2982 ($self->{exp} - $l0) / ($l1 - $l0)
2983}
2984
2985sub set_value {
2986 my ($self, $lvl, $exp) = @_;
2987
2988 $self->{lvl} = $lvl;
2989 $self->{exp} = $exp;
2990
2991 $self->SUPER::set_value ($self->_percent);
2992}
2993
2994#############################################################################
2995
2811package CFPlus::UI::Gauge; 2996package DC::UI::Gauge;
2812 2997
2813our @ISA = CFPlus::UI::VBox::; 2998our @ISA = DC::UI::VBox::;
2814 2999
2815sub new { 3000sub new {
2816 my ($class, %arg) = @_; 3001 my ($class, %arg) = @_;
2817 3002
2818 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
… …
2820 can_hover => 1, 3005 can_hover => 1,
2821 can_events => 1, 3006 can_events => 1,
2822 %arg, 3007 %arg,
2823 ); 3008 );
2824 3009
2825 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3010 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2826 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3011 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2827 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3012 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2828 3013
2829 $self 3014 $self
2830} 3015}
2831 3016
2832sub set_fontsize { 3017sub set_fontsize {
… …
2853 $self->{value}->set_text ($val); 3038 $self->{value}->set_text ($val);
2854} 3039}
2855 3040
2856############################################################################# 3041#############################################################################
2857 3042
2858package CFPlus::UI::Slider; 3043package DC::UI::Slider;
2859 3044
2860use strict; 3045use strict;
2861 3046
2862use CFPlus::OpenGL; 3047use DC::OpenGL;
2863 3048
2864our @ISA = CFPlus::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
2865 3050
2866my @tex = 3051my @tex =
2867 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
2868 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
2869 3054
2870sub new { 3055sub new {
2871 my $class = shift; 3056 my $class = shift;
2872 3057
… …
2909sub set_value { 3094sub set_value {
2910 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
2911 3096
2912 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2913 3098
2914 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
2915 3100
2916 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
2917
2918 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
2919 $value = $hi - $page if $value > $hi - $page;
2920 3103
2921 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2922 if $unit; 3105 if $unit;
2923 3106
2924 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2968sub invoke_mouse_wheel { 3151sub invoke_mouse_wheel {
2969 my ($self, $ev) = @_; 3152 my ($self, $ev) = @_;
2970 3153
2971 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3154 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2972 3155
2973 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3156 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2974 3157
2975 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3158 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2976 3159
2977 1 3160 1
2978} 3161}
… …
2988 my ($self) = @_; 3171 my ($self) = @_;
2989 3172
2990 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
2991 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
2992 3175
2993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2994 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
2995 3178
2996 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3179 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2997 3180
2998 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3181 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2999 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
3000 3183
3001 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
… …
3031 glDisable GL_TEXTURE_2D; 3214 glDisable GL_TEXTURE_2D;
3032} 3215}
3033 3216
3034############################################################################# 3217#############################################################################
3035 3218
3036package CFPlus::UI::ValSlider; 3219package DC::UI::ValSlider;
3037 3220
3038our @ISA = CFPlus::UI::HBox::; 3221our @ISA = DC::UI::HBox::;
3039 3222
3040sub new { 3223sub new {
3041 my ($class, %arg) = @_; 3224 my ($class, %arg) = @_;
3042 3225
3043 my $range = delete $arg{range}; 3226 my $range = delete $arg{range};
3044 3227
3045 my $self = $class->SUPER::new ( 3228 my $self = $class->SUPER::new (
3046 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3229 slider => (new DC::UI::Slider expand => 1, range => $range),
3047 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3230 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3048 to_value => sub { shift }, 3231 to_value => sub { shift },
3049 from_value => sub { shift }, 3232 from_value => sub { shift },
3050 %arg, 3233 %arg,
3051 ); 3234 );
3052 3235
… …
3072sub set_range { shift->{slider}->set_range (@_) } 3255sub set_range { shift->{slider}->set_range (@_) }
3073sub set_value { shift->{slider}->set_value (@_) } 3256sub set_value { shift->{slider}->set_value (@_) }
3074 3257
3075############################################################################# 3258#############################################################################
3076 3259
3077package CFPlus::UI::TextScroller; 3260package DC::UI::TextScroller;
3078 3261
3079our @ISA = CFPlus::UI::HBox::; 3262our @ISA = DC::UI::HBox::;
3080 3263
3081use CFPlus::OpenGL; 3264use DC::OpenGL;
3082 3265
3083sub new { 3266sub new {
3084 my $class = shift; 3267 my $class = shift;
3085 3268
3086 my $self = $class->SUPER::new ( 3269 my $self = $class->SUPER::new (
… …
3088 can_events => 1, 3271 can_events => 1,
3089 indent => 0, 3272 indent => 0,
3090 #font => default_font 3273 #font => default_font
3091 @_, 3274 @_,
3092 3275
3093 layout => (new CFPlus::Layout), 3276 layout => (new DC::Layout),
3094 par => [], 3277 par => [],
3095 max_par => 0, 3278 max_par => 0,
3096 height => 0, 3279 height => 0,
3097 children => [ 3280 children => [
3098 (new CFPlus::UI::Empty expand => 1), 3281 (new DC::UI::Empty expand => 1),
3099 (new CFPlus::UI::Slider vertical => 1), 3282 (new DC::UI::Slider vertical => 1),
3100 ], 3283 ],
3101 ); 3284 );
3102 3285
3103 $self->{children}[1]->connect (changed => sub { $self->update }); 3286 $self->{children}[1]->connect (changed => sub { $self->update });
3104 3287
… …
3160 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3343 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3161 $layout->set_markup ($para->{markup}); 3344 $layout->set_markup ($para->{markup});
3162 3345
3163 $layout->set_shapes ( 3346 $layout->set_shapes (
3164 map 3347 map
3165 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3348 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3166 @{$para->{widget}} 3349 @{$para->{widget}}
3167 ); 3350 );
3168 3351
3169 $layout 3352 $layout
3170} 3353}
… …
3287 $ROOT->on_post_alloc ($self => sub { 3470 $ROOT->on_post_alloc ($self => sub {
3288 $self->force_uptodate; 3471 $self->force_uptodate;
3289 3472
3290 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3473 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3291 3474
3292 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3475 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3293 glClearColor 0, 0, 0, 0; 3476 glClearColor 0, 0, 0, 0;
3294 glClear GL_COLOR_BUFFER_BIT; 3477 glClear GL_COLOR_BUFFER_BIT;
3295 3478
3296 package CFPlus::UI::Base; 3479 package DC::UI::Base;
3297 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3480 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3298 (0, 0, $self->{w}, $self->{h}); 3481 (0, 0, $self->{w}, $self->{h});
3299 3482
3300 my $top = int $self->{children}[1]{range}[0]; 3483 my $top = int $self->{children}[1]{range}[0];
3301 3484
… …
3360 $self->{children}[1]->draw; 3543 $self->{children}[1]->draw;
3361} 3544}
3362 3545
3363############################################################################# 3546#############################################################################
3364 3547
3365package CFPlus::UI::Animator; 3548package DC::UI::Animator;
3366 3549
3367use CFPlus::OpenGL; 3550use DC::OpenGL;
3368 3551
3369our @ISA = CFPlus::UI::Bin::; 3552our @ISA = DC::UI::Bin::;
3370 3553
3371sub moveto { 3554sub moveto {
3372 my ($self, $x, $y) = @_; 3555 my ($self, $x, $y) = @_;
3373 3556
3374 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3557 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3402 glPopMatrix; 3585 glPopMatrix;
3403} 3586}
3404 3587
3405############################################################################# 3588#############################################################################
3406 3589
3407package CFPlus::UI::Flopper; 3590package DC::UI::Flopper;
3408 3591
3409our @ISA = CFPlus::UI::Button::; 3592our @ISA = DC::UI::Button::;
3410 3593
3411sub new { 3594sub new {
3412 my $class = shift; 3595 my $class = shift;
3413 3596
3414 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3426 $self->{other}->toggle_visibility; 3609 $self->{other}->toggle_visibility;
3427} 3610}
3428 3611
3429############################################################################# 3612#############################################################################
3430 3613
3431package CFPlus::UI::Tooltip; 3614package DC::UI::Tooltip;
3432 3615
3433our @ISA = CFPlus::UI::Bin::; 3616our @ISA = DC::UI::Bin::;
3434 3617
3435use CFPlus::OpenGL; 3618use DC::OpenGL;
3436 3619
3437sub new { 3620sub new {
3438 my $class = shift; 3621 my $class = shift;
3439 3622
3440 $class->SUPER::new ( 3623 $class->SUPER::new (
… …
3444} 3627}
3445 3628
3446sub set_tooltip_from { 3629sub set_tooltip_from {
3447 my ($self, $widget) = @_; 3630 my ($self, $widget) = @_;
3448 3631
3449 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3450 if $widget->{tooltip} =~ /^#(.*)$/;
3451
3452 my $tooltip = $widget->{tooltip}; 3632 my $tip = $widget->{tooltip};
3633 $tip = $tip->($widget) if "CODE" eq ref $tip;
3634
3635 $tip = DC::Pod::section_label tooltip => $1
3636 if $tip =~ /^#(.*)$/;
3453 3637
3454 if ($ENV{CFPLUS_DEBUG} & 2) { 3638 if ($ENV{CFPLUS_DEBUG} & 2) {
3455 $tooltip .= "\n\n" . (ref $widget) . "\n" 3639 $tip .= "\n\n" . (ref $widget) . "\n"
3456 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3640 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3457 . "req $widget->{req_w} $widget->{req_h}\n" 3641 . "req $widget->{req_w} $widget->{req_h}\n"
3458 . "visible $widget->{visible}"; 3642 . "visible $widget->{visible}";
3459 } 3643 }
3460 3644
3461 $tooltip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
3462 $tooltip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
3463 3647
3464 $self->add (new CFPlus::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
3465 markup => $tooltip, 3650 markup => $tip,
3466 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3652 align => 0,
3467 fontsize => 0.8, 3653 fontsize => 0.8,
3468 style => 1, # FLAG_INVERSE 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3469 ellipsise => 0, 3655 ellipsise => 0,
3470 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
3471 ); 3657 );
3472} 3658}
3473 3659
… …
3508} 3694}
3509 3695
3510sub _draw { 3696sub _draw {
3511 my ($self) = @_; 3697 my ($self) = @_;
3512 3698
3513 glTranslate 0.375, 0.375;
3514
3515 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
3516 3700
3517 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
3518 glRect 0, 0, $w, $h; 3702 glRect 0, 0, $w, $h;
3519 3703
3520 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
3521 glBegin GL_LINE_LOOP; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
3522 glVertex 0 , 0;
3523 glVertex 0 , $h;
3524 glVertex $w, $h;
3525 glVertex $w, 0;
3526 glEnd;
3527 3706
3528 glTranslate 2 - 0.375, 2 - 0.375; 3707 glTranslate 2, 2;
3529 3708
3530 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
3531} 3710}
3532 3711
3533############################################################################# 3712#############################################################################
3534 3713
3535package CFPlus::UI::Face; 3714package DC::UI::Face;
3536 3715
3537our @ISA = CFPlus::UI::DrawBG::; 3716our @ISA = DC::UI::DrawBG::;
3538 3717
3539use CFPlus::OpenGL; 3718use DC::OpenGL;
3540 3719
3541sub new { 3720sub new {
3542 my $class = shift; 3721 my $class = shift;
3543 3722
3544 my $self = $class->SUPER::new ( 3723 my $self = $class->SUPER::new (
… …
3548 can_events => 0, 3727 can_events => 0,
3549 @_, 3728 @_,
3550 ); 3729 );
3551 3730
3552 if ($self->{anim} && $self->{animspeed}) { 3731 if ($self->{anim} && $self->{animspeed}) {
3553 CFPlus::weaken (my $widget = $self); 3732 DC::weaken (my $widget = $self);
3554 3733
3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3734 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3735 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3557 $self->{timer} = Event->timer (
3558 parked => 1,
3559 cb => sub {
3560 return unless $::CONN; 3736 return unless $::CONN;
3561 3737
3562 my $w = $widget 3738 my $w = $widget
3563 or return; 3739 or return;
3564 3740
3565 ++$w->{frame}; 3741 ++$w->{frame};
3566 $w->update_face; 3742 $w->update_face;
3567 3743
3568 # somehow, $widget can go away 3744 # somehow, $widget can go away
3569 $w->update; 3745 $w->update;
3570 $w->update_timer; 3746 $w->update_timer;
3571 },
3572 ); 3747 };
3573 3748
3574 $self->update_face; 3749 $self->update_face;
3575 $self->update_timer; 3750 $self->update_timer;
3576 } 3751 }
3577 3752
… …
3582 my ($self) = @_; 3757 my ($self) = @_;
3583 3758
3584 return unless $self->{timer}; 3759 return unless $self->{timer};
3585 3760
3586 if ($self->{visible}) { 3761 if ($self->{visible}) {
3587 $self->{timer}->at (
3588 $self->{anim_start}
3589 + $self->{animspeed}
3590 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3591 );
3592 $self->{timer}->start; 3762 $self->{timer}->start;
3593 } else { 3763 } else {
3594 $self->{timer}->stop; 3764 $self->{timer}->stop;
3595 } 3765 }
3596} 3766}
… …
3673 $self->SUPER::destroy; 3843 $self->SUPER::destroy;
3674} 3844}
3675 3845
3676############################################################################# 3846#############################################################################
3677 3847
3678package CFPlus::UI::Buttonbar; 3848package DC::UI::Buttonbar;
3679 3849
3680our @ISA = CFPlus::UI::HBox::; 3850our @ISA = DC::UI::HBox::;
3681 3851
3682# TODO: should actually wrap buttons and other goodies. 3852# TODO: should actually wrap buttons and other goodies.
3683 3853
3684############################################################################# 3854#############################################################################
3685 3855
3686package CFPlus::UI::Menu; 3856package DC::UI::Menu;
3687 3857
3688our @ISA = CFPlus::UI::Toplevel::; 3858our @ISA = DC::UI::Toplevel::;
3689 3859
3690use CFPlus::OpenGL; 3860use DC::OpenGL;
3691 3861
3692sub new { 3862sub new {
3693 my $class = shift; 3863 my $class = shift;
3694 3864
3695 my $self = $class->SUPER::new ( 3865 my $self = $class->SUPER::new (
3696 items => [], 3866 items => [],
3697 z => 100, 3867 z => 100,
3698 @_, 3868 @_,
3699 ); 3869 );
3700 3870
3701 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3871 $self->add ($self->{vbox} = new DC::UI::VBox);
3702 3872
3703 for my $item (@{ $self->{items} }) { 3873 for my $item (@{ $self->{items} }) {
3704 my ($widget, $cb, $tooltip) = @$item; 3874 my ($widget, $cb, $tooltip) = @$item;
3705 3875
3706 # handle various types of items, only text for now 3876 # handle various types of items, only text for now
3707 if (!ref $widget) { 3877 if (!ref $widget) {
3708 if ($widget =~ /\t/) { 3878 if ($widget =~ /\t/) {
3709 my ($left, $right) = split /\t/, $widget, 2; 3879 my ($left, $right) = split /\t/, $widget, 2;
3710 3880
3711 $widget = new CFPlus::UI::HBox 3881 $widget = new DC::UI::HBox
3712 can_hover => 1, 3882 can_hover => 1,
3713 can_events => 1, 3883 can_events => 1,
3714 tooltip => $tooltip, 3884 tooltip => $tooltip,
3715 children => [ 3885 children => [
3716 (new CFPlus::UI::Label markup => $left, expand => 1), 3886 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3717 (new CFPlus::UI::Label markup => $right, align => +1), 3887 (new DC::UI::Label markup => $right, align => 1),
3718 ], 3888 ],
3719 ; 3889 ;
3720 3890
3721 } else { 3891 } else {
3722 $widget = new CFPlus::UI::Label 3892 $widget = new DC::UI::Label
3723 can_hover => 1, 3893 can_hover => 1,
3724 can_events => 1, 3894 can_events => 1,
3895 align => 0,
3725 markup => $widget, 3896 markup => $widget,
3726 tooltip => $tooltip; 3897 tooltip => $tooltip;
3727 } 3898 }
3728 } 3899 }
3729 3900
… …
3744 # maybe save $GRAB? must be careful about events... 3915 # maybe save $GRAB? must be careful about events...
3745 $GRAB = $self; 3916 $GRAB = $self;
3746 $self->{button} = $ev->{button}; 3917 $self->{button} = $ev->{button};
3747 3918
3748 $self->show; 3919 $self->show;
3749 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3920
3921 my $x = $ev->{x};
3922 my $y = $ev->{y};
3923
3924 $self->{root}->on_post_alloc ($self => sub {
3925 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3926 });
3927
3928 1 # so it can be used inside event handlers
3750} 3929}
3751 3930
3752sub invoke_mouse_motion { 3931sub invoke_mouse_motion {
3753 my ($self, $ev, $x, $y) = @_; 3932 my ($self, $ev, $x, $y) = @_;
3754 3933
… …
3775 1 3954 1
3776} 3955}
3777 3956
3778############################################################################# 3957#############################################################################
3779 3958
3780package CFPlus::UI::Multiplexer; 3959package DC::UI::Multiplexer;
3781 3960
3782our @ISA = CFPlus::UI::Container::; 3961our @ISA = DC::UI::Container::;
3783 3962
3784sub new { 3963sub new {
3785 my $class = shift; 3964 my $class = shift;
3786 3965
3787 my $self = $class->SUPER::new ( 3966 my $self = $class->SUPER::new (
3788 @_, 3967 @_,
3789 ); 3968 );
3790 3969
3791 $self->{current} = $self->{children}[0] 3970 $self->set_current_page (0);
3792 if @{ $self->{children} };
3793 3971
3794 $self 3972 $self
3795} 3973}
3796 3974
3797sub add { 3975sub add {
3798 my ($self, @widgets) = @_; 3976 my ($self, @widgets) = @_;
3799 3977
3800 $self->SUPER::add (@widgets); 3978 $self->SUPER::add (@widgets);
3801 3979
3802 $self->{current} = $self->{children}[0] 3980 $self->set_current_page (0)
3803 if @{ $self->{children} }; 3981 if @widgets == @{ $self->{children} };
3804} 3982}
3805 3983
3806sub get_current_page { 3984sub get_current_page {
3807 my ($self) = @_; 3985 my ($self) = @_;
3808 3986
… …
3814 3992
3815 my $widget = ref $page_or_widget 3993 my $widget = ref $page_or_widget
3816 ? $page_or_widget 3994 ? $page_or_widget
3817 : $self->{children}[$page_or_widget]; 3995 : $self->{children}[$page_or_widget];
3818 3996
3997 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3998
3819 $self->{current} = $widget; 3999 if (($self->{current} = $widget)) {
4000 $self->{current}->set_visible if $self->{current} && $self->{visible};
3820 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4001 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3821 4002
3822 $self->emit (page_changed => $self->{current}); 4003 $self->emit (page_changed => $self->{current});
4004 }
3823 4005
3824 $self->realloc; 4006 $self->realloc;
3825} 4007}
3826 4008
3827sub visible_children { 4009sub visible_children {
3828 $_[0]{current} 4010 $_[0]{current} || ()
3829} 4011}
3830 4012
3831sub size_request { 4013sub size_request {
3832 my ($self) = @_; 4014 my ($self) = @_;
3833 4015
4016 $self->{current}
3834 $self->{current}->size_request 4017 ? $self->{current}->size_request
4018 : (0, 0)
3835} 4019}
3836 4020
3837sub invoke_size_allocate { 4021sub invoke_size_allocate {
3838 my ($self, $w, $h) = @_; 4022 my ($self, $w, $h) = @_;
3839 4023
3840 $self->{current}->configure (0, 0, $w, $h); 4024 $self->{current}->configure (0, 0, $w, $h)
4025 if $self->{current};
3841 4026
3842 1 4027 1
3843} 4028}
3844 4029
3845sub _draw { 4030sub _draw {
3846 my ($self) = @_; 4031 my ($self) = @_;
3847 4032
3848 $self->{current}->draw; 4033 $self->{current}->draw
4034 if $self->{current};
3849} 4035}
3850 4036
3851############################################################################# 4037#############################################################################
3852 4038
3853package CFPlus::UI::Notebook; 4039package DC::UI::Notebook;
3854 4040
4041use DC::OpenGL;
4042
3855our @ISA = CFPlus::UI::VBox::; 4043our @ISA = DC::UI::VBox::;
3856 4044
3857sub new { 4045sub new {
3858 my $class = shift; 4046 my $class = shift;
3859 4047
3860 my $self = $class->SUPER::new ( 4048 my $self = $class->SUPER::new (
3861 buttonbar => (new CFPlus::UI::Buttonbar), 4049 buttonbar => (new DC::UI::Buttonbar),
3862 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4050 multiplexer => (new DC::UI::Multiplexer expand => 1),
4051 active_outline => [.7, .7, 0.2],
3863 # filter => # will be put between multiplexer and $self 4052 # filter => # will be put between multiplexer and $self
3864 @_, 4053 @_,
3865 ); 4054 );
3866 4055
3867 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3875 4064
3876 for my $child (@$widgets) { 4065 for my $child (@$widgets) {
3877 Scalar::Util::weaken $child; 4066 Scalar::Util::weaken $child;
3878 $child->{c_tab_} ||= do { 4067 $child->{c_tab_} ||= do {
3879 my $tab = 4068 my $tab =
3880 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4069 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
3881 ? $child->{c_tab} 4070 ? $child->{c_tab}
3882 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4071 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3883 4072
3884 $tab->connect (activate => sub { 4073 $tab->connect (activate => sub {
3885 $wself->set_current_page ($child); 4074 $wself->set_current_page ($child);
3886 }); 4075 });
3887 4076
… …
3919sub pages { 4108sub pages {
3920 my ($self) = @_; 4109 my ($self) = @_;
3921 $self->{multiplexer}->children 4110 $self->{multiplexer}->children
3922} 4111}
3923 4112
4113sub page_index {
4114 my ($self, $widget) = @_;
4115
4116 my $i = 0;
4117 for ($self->pages) {
4118 if ($_ eq $widget) { return $i };
4119 $i++;
4120 }
4121
4122 undef
4123}
4124
3924sub add_tab { 4125sub add_tab {
3925 my ($self, $title, $widget, $tooltip) = @_; 4126 my ($self, $title, $widget, $tooltip) = @_;
3926 4127
3927 $title = [$title, $tooltip] unless ref $title; 4128 $title = [$title, $tooltip] unless ref $title;
3928 $widget->{c_tab} = $title; 4129 $widget->{c_tab} = $title;
… …
3941 4142
3942 $self->{multiplexer}->set_current_page ($page); 4143 $self->{multiplexer}->set_current_page ($page);
3943 $self->emit (page_changed => $self->{multiplexer}{current}); 4144 $self->emit (page_changed => $self->{multiplexer}{current});
3944} 4145}
3945 4146
4147sub _draw {
4148 my ($self) = @_;
4149
4150 $self->SUPER::_draw ();
4151
4152 if (my $cur = $self->{multiplexer}{current}) {
4153 if ($cur = $cur->{c_tab_}) {
4154 glTranslate $self->{buttonbar}{x} + $cur->{x},
4155 $self->{buttonbar}{y} + $cur->{y};
4156 glLineWidth 3;
4157 #glEnable GL_BLEND;
4158 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4159 glColor @{$self->{active_outline}};
4160 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4161 glLineWidth 1;
4162 #glDisable GL_BLEND;
4163 }
4164 }
4165}
4166
3946############################################################################# 4167#############################################################################
3947 4168
3948package CFPlus::UI::Selector; 4169package DC::UI::Selector;
3949 4170
3950use utf8; 4171use utf8;
3951 4172
3952our @ISA = CFPlus::UI::Button::; 4173our @ISA = DC::UI::Button::;
3953 4174
3954sub new { 4175sub new {
3955 my $class = shift; 4176 my $class = shift;
3956 4177
3957 my $self = $class->SUPER::new ( 4178 my $self = $class->SUPER::new (
… …
3974 my ($value, $title, $tooltip) = @$_; 4195 my ($value, $title, $tooltip) = @$_;
3975 4196
3976 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4197 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3977 } 4198 }
3978 4199
3979 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4200 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3980} 4201}
3981 4202
3982sub _set_value { 4203sub _set_value {
3983 my ($self, $value) = @_; 4204 my ($self, $value) = @_;
3984 4205
3985 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4206 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4207 $item ||= $self->{options}[0]
3986 or return; 4208 or return;
3987 4209
3988 $self->{value} = $item->[0]; 4210 $self->{value} = $item->[0];
3989 $self->set_markup ("$item->[1] ⇓"); 4211 $self->set_markup ("$item->[1] ⇓");
3990 $self->set_tooltip ($item->[2]); 4212# $self->set_tooltip ($item->[2]);
3991} 4213}
3992 4214
3993sub set_value { 4215sub set_value {
3994 my ($self, $value) = @_; 4216 my ($self, $value) = @_;
3995 4217
… …
3997 4219
3998 $self->_set_value ($value); 4220 $self->_set_value ($value);
3999 $self->emit (changed => $value); 4221 $self->emit (changed => $value);
4000} 4222}
4001 4223
4224sub set_options {
4225 my ($self, $options) = @_;
4226
4227 $self->{options} = $options;
4228 $self->_set_value ($self->{value});
4229}
4230
4002############################################################################# 4231#############################################################################
4003 4232
4004package CFPlus::UI::Statusbox; 4233package DC::UI::Statusbox;
4005 4234
4006our @ISA = CFPlus::UI::VBox::; 4235our @ISA = DC::UI::VBox::;
4007 4236
4008sub new { 4237sub new {
4009 my $class = shift; 4238 my $class = shift;
4010 4239
4011 my $self = $class->SUPER::new ( 4240 my $self = $class->SUPER::new (
4012 fontsize => 0.8, 4241 fontsize => 0.8,
4013 @_, 4242 @_,
4014 ); 4243 );
4015 4244
4016 CFPlus::weaken (my $this = $self); 4245 DC::weaken (my $this = $self);
4017 4246
4018 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4247 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4019 4248
4020 $self 4249 $self
4021} 4250}
4022 4251
4023sub reorder { 4252sub reorder {
4024 my ($self) = @_; 4253 my ($self) = @_;
4025 my $NOW = Time::HiRes::time; 4254 my $NOW = EV::time;
4026 4255
4027 # freeze display when hovering over any label 4256 # freeze display when hovering over any label
4028 return if $CFPlus::UI::TOOLTIP->{owner} 4257 return if $DC::UI::TOOLTIP->{owner}
4029 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4258 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4030 values %{ $self->{item} }; 4259 values %{ $self->{item} };
4031 4260
4032 while (my ($k, $v) = each %{ $self->{item} }) { 4261 while (my ($k, $v) = each %{ $self->{item} }) {
4033 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4262 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4034 } 4263 }
4264
4265 $self->{timer}->set (1, 1);
4035 4266
4036 my @widgets; 4267 my @widgets;
4037 4268
4038 my @items = sort { 4269 my @items = sort {
4039 $a->{pri} <=> $b->{pri} 4270 $a->{pri} <=> $b->{pri}
4040 or $b->{id} <=> $a->{id} 4271 or $b->{id} <=> $a->{id}
4041 } values %{ $self->{item} }; 4272 } values %{ $self->{item} };
4042
4043 $self->{timer}->interval (1);
4044 4273
4045 my $count = 10 + 1; 4274 my $count = 10 + 1;
4046 for my $item (@items) { 4275 for my $item (@items) {
4047 last unless --$count; 4276 last unless --$count;
4048 4277
… …
4055 for ($short) { 4284 for ($short) {
4056 s/^\s+//; 4285 s/^\s+//;
4057 s/\s+/ /g; 4286 s/\s+/ /g;
4058 } 4287 }
4059 4288
4060 new CFPlus::UI::Label 4289 new DC::UI::Label
4061 markup => $short, 4290 markup => $short,
4062 tooltip => $item->{tooltip}, 4291 tooltip => $item->{tooltip},
4063 tooltip_font => $::FONT_PROP, 4292 tooltip_font => $::FONT_PROP,
4064 tooltip_width => 0.67, 4293 tooltip_width => 0.67,
4065 fontsize => $item->{fontsize} || $self->{fontsize}, 4294 fontsize => $item->{fontsize} || $self->{fontsize},
4066 max_w => $::WIDTH * 0.44, 4295 max_w => $::WIDTH * 0.44,
4296 align => 0,
4067 fg => [@{ $item->{fg} }], 4297 fg => [@{ $item->{fg} }],
4068 can_events => 1, 4298 can_events => 1,
4069 can_hover => 1 4299 can_hover => 1
4070 }; 4300 };
4071 4301
4072 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4302 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4073 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4303 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4074 $label->update; 4304 $label->update;
4075 $label->set_max_size (undef, $label->{req_h} * $diff) 4305 $label->set_max_size (undef, $label->{req_h} * $diff)
4076 if $diff < 1; 4306 if $diff < 1;
4077 $self->{timer}->interval (1/30); 4307 $self->{timer}->set (1/30, 1/30);
4078 } else { 4308 } else {
4079 $label->{fg}[3] = $item->{fg}[3] || 1; 4309 $label->{fg}[3] = $item->{fg}[3] || 1;
4080 } 4310 }
4081 4311
4082 push @widgets, $label; 4312 push @widgets, $label;
4083 } 4313 }
4314
4315 my $hash = join ",", @widgets;
4316 return if $hash eq $self->{last_widget_hash};
4317 $self->{last_widget_hash} = $hash;
4084 4318
4085 $self->clear; 4319 $self->clear;
4086 $self->SUPER::add (reverse @widgets); 4320 $self->SUPER::add (reverse @widgets);
4087} 4321}
4088 4322
… …
4144 $self->SUPER::destroy; 4378 $self->SUPER::destroy;
4145} 4379}
4146 4380
4147############################################################################# 4381#############################################################################
4148 4382
4149package CFPlus::UI::Root; 4383package DC::UI::Root;
4150 4384
4151our @ISA = CFPlus::UI::Container::; 4385our @ISA = DC::UI::Container::;
4152 4386
4153use List::Util qw(min max); 4387use List::Util qw(min max);
4154 4388
4155use CFPlus::OpenGL; 4389use DC::OpenGL;
4156 4390
4157sub new { 4391sub new {
4158 my $class = shift; 4392 my $class = shift;
4159 4393
4160 my $self = $class->SUPER::new ( 4394 my $self = $class->SUPER::new (
4161 visible => 1, 4395 visible => 1,
4162 @_, 4396 @_,
4163 ); 4397 );
4164 4398
4165 CFPlus::weaken ($self->{root} = $self); 4399 DC::weaken ($self->{root} = $self);
4166 4400
4167 $self 4401 $self
4168} 4402}
4169 4403
4170sub size_request { 4404sub size_request {
… …
4218} 4452}
4219 4453
4220sub update { 4454sub update {
4221 my ($self) = @_; 4455 my ($self) = @_;
4222 4456
4223 $::WANT_REFRESH->start; 4457 $::WANT_REFRESH = 1;
4224} 4458}
4225 4459
4226sub add { 4460sub add {
4227 my ($self, @children) = @_; 4461 my ($self, @children) = @_;
4228 4462
… …
4295 4529
4296 delete $queue{$widget+0}; 4530 delete $queue{$widget+0};
4297 4531
4298 my ($w, $h) = $widget->size_request; 4532 my ($w, $h) = $widget->size_request;
4299 4533
4300 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4534 $w += $widget->{padding_x} * 2;
4301 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4535 $h += $widget->{padding_y} * 2;
4536
4537 $w = max $widget->{min_w}, $w;
4538 $h = max $widget->{min_h}, $h;
4302 4539
4303 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4540 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4304 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4541 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4305 4542
4306 $w = $widget->{force_w} if exists $widget->{force_w}; 4543 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4373 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4610 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4374 glMatrixMode GL_MODELVIEW; 4611 glMatrixMode GL_MODELVIEW;
4375 glLoadIdentity; 4612 glLoadIdentity;
4376 4613
4377 { 4614 {
4378 package CFPlus::UI::Base; 4615 package DC::UI::Base;
4379 4616
4380 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4617 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4381 (0, 0, $self->{w}, $self->{h}); 4618 (0, 0, $self->{w}, $self->{h});
4382 4619
4383 $self->_draw; 4620 $self->_draw;
4384 } 4621 }
4385} 4622}
4386 4623
4387############################################################################# 4624#############################################################################
4388 4625
4389package CFPlus::UI; 4626package DC::UI;
4390 4627
4391$ROOT = new CFPlus::UI::Root; 4628$ROOT = new DC::UI::Root;
4392$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4629$TOOLTIP = new DC::UI::Tooltip z => 900;
4393 4630
43941 46311
4395

Diff Legend

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