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.452 by root, Wed Dec 26 20:09:38 2007 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 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 ();
7 7
8use CFPlus; 8use dc;
9use CFPlus::Pod; 9use dc::Pod;
10use CFPlus::Texture; 10use dc::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT; 14our $LAYOUT;
15our $ROOT; 15our $ROOT;
… …
111 111
112 if ($GRAB) { 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 116 my $shift = $ev->{mod} & dc::KMOD_SHIFT;
117 117
118 $ev->{dx} = $shift ? $delta : 0; 118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta; 119 $ev->{dy} = $shift ? 0 : $delta;
120 120
121 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
… …
211 reconfigure_widgets; 211 reconfigure_widgets;
212} 212}
213 213
214############################################################################# 214#############################################################################
215 215
216package CFPlus::UI::Event; 216package dc::UI::Event;
217 217
218sub xy { 218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220} 220}
221 221
222############################################################################# 222#############################################################################
223 223
224package CFPlus::UI::Base; 224package dc::UI::Base;
225 225
226use strict; 226use strict;
227 227
228use CFPlus::OpenGL; 228use dc::OpenGL;
229 229
230sub new { 230sub new {
231 my $class = shift; 231 my $class = shift;
232 232
233 my $self = bless { 233 my $self = bless {
… …
238 h => undef, 238 h => undef,
239 can_events => 1, 239 can_events => 1,
240 @_ 240 @_
241 }, $class; 241 }, $class;
242 242
243 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 dc::weaken ($dc::UI::WIDGET{$self+0} = $self);
244 244
245 for (keys %$self) { 245 for (keys %$self) {
246 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
247 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
248 } 248 }
249 } 249 }
250 250
251 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $dc::UI::LAYOUT->{$self->{name}}) {
252 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $dc::UI::ROOT->{alloc_w} if exists $layout->{x};
253 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $dc::UI::ROOT->{alloc_h} if exists $layout->{y};
254 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $dc::UI::ROOT->{alloc_w} if exists $layout->{w};
255 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $dc::UI::ROOT->{alloc_h} if exists $layout->{h};
256 256
257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
259 259
260 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
278sub show { 278sub show {
279 my ($self) = @_; 279 my ($self) = @_;
280 280
281 return if $self->{parent}; 281 return if $self->{parent};
282 282
283 $CFPlus::UI::ROOT->add ($self); 283 $dc::UI::ROOT->add ($self);
284} 284}
285 285
286sub set_visible { 286sub set_visible {
287 my ($self) = @_; 287 my ($self) = @_;
288 288
… …
309 delete $self->{root}; 309 delete $self->{root};
310 310
311 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
312 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
313 313
314 $CFPlus::UI::TOOLTIP_WATCHER->invoke 314 $dc::UI::TOOLTIP_WATCHER->invoke
315 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
316 316
317 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
318 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
319} 319}
… …
389 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
390 390
391 if ($self->{aspect}) { 391 if ($self->{aspect}) {
392 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
393 393
394 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 394 $w = List::Util::min $w, dc::ceil $h * $self->{aspect};
395 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 395 $h = List::Util::min $h, dc::ceil $w / $self->{aspect};
396 396
397 # use alignment to adjust x, y 397 # use alignment to adjust x, y
398 398
399 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
400 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
… …
441 441
442 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
443 443
444 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
445 445
446 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($dc::UI::TOOLTIP->{owner} == $self) {
447 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $dc::UI::TOOLTIP->{owner};
448 $CFPlus::UI::TOOLTIP_WATCHER->invoke; 448 $dc::UI::TOOLTIP_WATCHER->invoke;
449 } 449 }
450} 450}
451 451
452# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
453sub coord2local { 453sub coord2local {
… …
519sub connect { 519sub connect {
520 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
521 521
522 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
523 523
524 defined wantarray and CFPlus::guard { 524 defined wantarray and dc::guard {
525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
526 @{ $self->{signal_cb}{$signal} }; 526 @{ $self->{signal_cb}{$signal} };
527 } 527 }
528} 528}
529 529
… …
567# in .xs 567# in .xs
568 568
569sub set_parent { 569sub set_parent {
570 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
571 571
572 CFPlus::weaken ($self->{parent} = $parent); 572 dc::weaken ($self->{parent} = $parent);
573 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
574} 574}
575 575
576sub realloc { 576sub realloc {
577 my ($self) = @_; 577 my ($self) = @_;
… …
615} 615}
616 616
617sub DESTROY { 617sub DESTROY {
618 my ($self) = @_; 618 my ($self) = @_;
619 619
620 return if CFPlus::in_destruct; 620 return if dc::in_destruct;
621 621
622 local $@; 622 local $@;
623 eval { $self->destroy }; 623 eval { $self->destroy };
624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
625 625
626 delete $WIDGET{$self+0}; 626 delete $WIDGET{$self+0};
627} 627}
628 628
629############################################################################# 629#############################################################################
630 630
631package CFPlus::UI::DrawBG; 631package dc::UI::DrawBG;
632 632
633our @ISA = CFPlus::UI::Base::; 633our @ISA = dc::UI::Base::;
634 634
635use strict; 635use strict;
636use CFPlus::OpenGL; 636use dc::OpenGL;
637 637
638sub new { 638sub new {
639 my $class = shift; 639 my $class = shift;
640 640
641 $class->SUPER::new ( 641 $class->SUPER::new (
… …
663 } 663 }
664} 664}
665 665
666############################################################################# 666#############################################################################
667 667
668package CFPlus::UI::Empty; 668package dc::UI::Empty;
669 669
670our @ISA = CFPlus::UI::Base::; 670our @ISA = dc::UI::Base::;
671 671
672sub new { 672sub new {
673 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
674 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
675} 675}
… …
682 682
683sub draw { } 683sub draw { }
684 684
685############################################################################# 685#############################################################################
686 686
687package CFPlus::UI::Container; 687package dc::UI::Container;
688 688
689our @ISA = CFPlus::UI::Base::; 689our @ISA = dc::UI::Base::;
690 690
691sub new { 691sub new {
692 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
693 693
694 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
… …
788 $_->draw for $self->visible_children; 788 $_->draw for $self->visible_children;
789} 789}
790 790
791############################################################################# 791#############################################################################
792 792
793package CFPlus::UI::Bin; 793package dc::UI::Bin;
794 794
795our @ISA = CFPlus::UI::Container::; 795our @ISA = dc::UI::Container::;
796 796
797sub new { 797sub new {
798 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
799 799
800 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 800 my $child = (delete $arg{child}) || new dc::UI::Empty::;
801 801
802 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
803} 803}
804 804
805sub add { 805sub add {
… …
812sub remove { 812sub remove {
813 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
814 814
815 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
816 816
817 $self->{children} = [new CFPlus::UI::Empty] 817 $self->{children} = [new dc::UI::Empty]
818 unless @{$self->{children}}; 818 unless @{$self->{children}};
819} 819}
820 820
821sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
822 822
… …
833} 833}
834 834
835############################################################################# 835#############################################################################
836# back-buffered drawing area 836# back-buffered drawing area
837 837
838package CFPlus::UI::Window; 838package dc::UI::Window;
839 839
840our @ISA = CFPlus::UI::Bin::; 840our @ISA = dc::UI::Bin::;
841 841
842use CFPlus::OpenGL; 842use dc::OpenGL;
843 843
844sub new { 844sub new {
845 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
846 846
847 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
… …
869} 869}
870 870
871sub render_child { 871sub render_child {
872 my ($self) = @_; 872 my ($self) = @_;
873 873
874 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 874 $self->{texture} = new_from_opengl dc::Texture $self->{w}, $self->{h}, sub {
875 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
876 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
877 877
878 { 878 {
879 package CFPlus::UI::Base; 879 package dc::UI::Base;
880 880
881 local ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
882 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
883 883
884 $self->_render; 884 $self->_render;
… …
901 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
902} 902}
903 903
904############################################################################# 904#############################################################################
905 905
906package CFPlus::UI::ViewPort; 906package dc::UI::ViewPort;
907 907
908use List::Util qw(min max); 908use List::Util qw(min max);
909 909
910our @ISA = CFPlus::UI::Window::; 910our @ISA = dc::UI::Window::;
911 911
912sub new { 912sub new {
913 my $class = shift; 913 my $class = shift;
914 914
915 $class->SUPER::new ( 915 $class->SUPER::new (
… …
999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1001 ) { 1001 ) {
1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1003 } else { 1003 } else {
1004 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->dc::UI::Base::find_widget ($x, $y)
1005 } 1005 }
1006} 1006}
1007 1007
1008sub _render { 1008sub _render {
1009 my ($self) = @_; 1009 my ($self) = @_;
1010 1010
1011 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1011 local $dc::UI::Base::draw_x = $dc::UI::Base::draw_x - $self->{view_x};
1012 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1012 local $dc::UI::Base::draw_y = $dc::UI::Base::draw_y - $self->{view_y};
1013 1013
1014 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1015 1015
1016 $self->SUPER::_render; 1016 $self->SUPER::_render;
1017} 1017}
1018 1018
1019############################################################################# 1019#############################################################################
1020 1020
1021package CFPlus::UI::ScrolledWindow; 1021package dc::UI::ScrolledWindow;
1022 1022
1023our @ISA = CFPlus::UI::Table::; 1023our @ISA = dc::UI::Table::;
1024 1024
1025sub new { 1025sub new {
1026 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1027 1027
1028 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1029 1029
1030 my $self; 1030 my $self;
1031 1031
1032 my $hslider = new CFPlus::UI::Slider 1032 my $hslider = new dc::UI::Slider
1033 c_col => 0, 1033 c_col => 0,
1034 c_row => 1, 1034 c_row => 1,
1035 vertical => 0, 1035 vertical => 0,
1036 range => [0, 0, 1, 0.01], # HACK fix 1036 range => [0, 0, 1, 0.01], # HACK fix
1037 on_changed => sub { 1037 on_changed => sub {
1038 $self->{hpos} = $_[1]; 1038 $self->{hpos} = $_[1];
1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1040 },
1041 ; 1041 ;
1042 1042
1043 my $vslider = new CFPlus::UI::Slider 1043 my $vslider = new dc::UI::Slider
1044 c_col => 1, 1044 c_col => 1,
1045 c_row => 0, 1045 c_row => 0,
1046 vertical => 1, 1046 vertical => 1,
1047 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1048 on_changed => sub { 1048 on_changed => sub {
… …
1060 col_expand => [1, 0], 1060 col_expand => [1, 0],
1061 row_expand => [1, 0], 1061 row_expand => [1, 0],
1062 %arg, 1062 %arg,
1063 ); 1063 );
1064 1064
1065 $self->{vp} = new CFPlus::UI::ViewPort 1065 $self->{vp} = new dc::UI::ViewPort
1066 c_col => 0, 1066 c_col => 0,
1067 c_row => 0, 1067 c_row => 0,
1068 expand => 1, 1068 expand => 1,
1069 scroll_x => $self->{scroll_x}, 1069 scroll_x => $self->{scroll_x},
1070 scroll_y => $self->{scroll_y}, 1070 scroll_y => $self->{scroll_y},
… …
1196 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1197} 1197}
1198 1198
1199############################################################################# 1199#############################################################################
1200 1200
1201package CFPlus::UI::Frame; 1201package dc::UI::Frame;
1202 1202
1203our @ISA = CFPlus::UI::Bin::; 1203our @ISA = dc::UI::Bin::;
1204 1204
1205use CFPlus::OpenGL; 1205use dc::OpenGL;
1206 1206
1207sub new { 1207sub new {
1208 my $class = shift; 1208 my $class = shift;
1209 1209
1210 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1229 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1230} 1230}
1231 1231
1232############################################################################# 1232#############################################################################
1233 1233
1234package CFPlus::UI::FancyFrame; 1234package dc::UI::FancyFrame;
1235 1235
1236our @ISA = CFPlus::UI::Bin::; 1236our @ISA = dc::UI::Bin::;
1237 1237
1238use CFPlus::OpenGL; 1238use dc::OpenGL;
1239 1239
1240sub new { 1240sub new {
1241 my ($class, %arg) = @_; 1241 my ($class, %arg) = @_;
1242 1242
1243 if ((exists $arg{label}) && !ref $arg{label}) { 1243 if ((exists $arg{label}) && !ref $arg{label}) {
1244 $arg{label} = new CFPlus::UI::Label 1244 $arg{label} = new dc::UI::Label
1245 align => 1, 1245 align => 1,
1246 valign => 0, 1246 valign => 0,
1247 text => $arg{label}, 1247 text => $arg{label},
1248 fontsize => ($arg{border} || 0.8) * 0.75; 1248 fontsize => ($arg{border} || 0.8) * 0.75;
1249 } 1249 }
… …
1261 1261
1262sub add { 1262sub add {
1263 my ($self, @widgets) = @_; 1263 my ($self, @widgets) = @_;
1264 1264
1265 $self->SUPER::add (@widgets); 1265 $self->SUPER::add (@widgets);
1266 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1266 $self->dc::UI::Container::add ($self->{label}) if $self->{label};
1267} 1267}
1268 1268
1269sub border { 1269sub border {
1270 int $_[0]{border} * $::FONTSIZE 1270 int $_[0]{border} * $::FONTSIZE
1271} 1271}
… …
1329 } 1329 }
1330} 1330}
1331 1331
1332############################################################################# 1332#############################################################################
1333 1333
1334package CFPlus::UI::Toplevel; 1334package dc::UI::Toplevel;
1335 1335
1336our @ISA = CFPlus::UI::Bin::; 1336our @ISA = dc::UI::Bin::;
1337 1337
1338use CFPlus::OpenGL; 1338use dc::OpenGL;
1339 1339
1340my $bg = 1340my $bg =
1341 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1342 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1343 1343
1344my @border = 1344my @border =
1345 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1347 1347
1348my @icon = 1348my @icon =
1349 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1349 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1350 qw(x1_move.png x1_resize.png); 1350 qw(x1_move.png x1_resize.png);
1351 1351
1352sub new { 1352sub new {
1353 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1354 1354
… …
1360 min_w => 64, 1360 min_w => 64,
1361 min_h => 32, 1361 min_h => 32,
1362 %arg, 1362 %arg,
1363 ); 1363 );
1364 1364
1365 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new dc::UI::Label
1366 align => 0, 1366 align => 0,
1367 valign => 1, 1367 valign => 1,
1368 text => $self->{title}, 1368 text => $self->{title},
1369 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1370 if exists $self->{title}; 1370 if exists $self->{title};
1371 1371
1372 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1373 $self->{close_button} = 1373 $self->{close_button} =
1374 new CFPlus::UI::ImageButton 1374 new dc::UI::ImageButton
1375 path => 'x1_close.png', 1375 path => 'x1_close.png',
1376 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1377 1377
1378 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->dc::UI::Container::add ($self->{close_button});
1379 } 1379 }
1380 1380
1381 $self 1381 $self
1382} 1382}
1383 1383
1384sub add { 1384sub add {
1385 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1386 1386
1387 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1388 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1388 $self->dc::UI::Container::add ($self->{close_button}) if $self->{close_button};
1389 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1389 $self->dc::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1390} 1390}
1391 1391
1392sub border { 1392sub border {
1393 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1394} 1394}
… …
1579 if $self->{close_button}; 1579 if $self->{close_button};
1580} 1580}
1581 1581
1582############################################################################# 1582#############################################################################
1583 1583
1584package CFPlus::UI::Table; 1584package dc::UI::Table;
1585 1585
1586our @ISA = CFPlus::UI::Container::; 1586our @ISA = dc::UI::Container::;
1587 1587
1588use List::Util qw(max sum); 1588use List::Util qw(max sum);
1589 1589
1590use CFPlus::OpenGL; 1590use dc::OpenGL;
1591 1591
1592sub new { 1592sub new {
1593 my $class = shift; 1593 my $class = shift;
1594 1594
1595 $class->SUPER::new ( 1595 $class->SUPER::new (
… …
1683 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1684 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1685 1685
1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1687 1687
1688 CFPlus::UI::harmonize $ws; 1688 dc::UI::harmonize $ws;
1689 1689
1690 my @row_expand = @{$self->{row_expand}}; 1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand; 1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1; 1692 my $row_expand = (sum @row_expand) || 1;
1693 1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695 1695
1696 CFPlus::UI::harmonize $hs; 1696 dc::UI::harmonize $hs;
1697 1697
1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1700 1700
1701 for my $widget ($self->children) { 1701 for my $widget ($self->children) {
… …
1710 1 1710 1
1711} 1711}
1712 1712
1713############################################################################# 1713#############################################################################
1714 1714
1715package CFPlus::UI::Fixed; 1715package dc::UI::Fixed;
1716 1716
1717use List::Util qw(min max); 1717use List::Util qw(min max);
1718 1718
1719our @ISA = CFPlus::UI::Container::; 1719our @ISA = dc::UI::Container::;
1720 1720
1721sub _scale($$$) { 1721sub _scale($$$) {
1722 my ($rel, $val, $max) = @_; 1722 my ($rel, $val, $max) = @_;
1723 1723
1724 $rel ? $val * $max : $val 1724 $rel ? $val * $max : $val
… …
1776 1 1776 1
1777} 1777}
1778 1778
1779############################################################################# 1779#############################################################################
1780 1780
1781package CFPlus::UI::Box; 1781package dc::UI::Box;
1782 1782
1783our @ISA = CFPlus::UI::Container::; 1783our @ISA = dc::UI::Container::;
1784 1784
1785sub size_request { 1785sub size_request {
1786 my ($self) = @_; 1786 my ($self) = @_;
1787 1787
1788 my @children = $self->visible_children; 1788 my @children = $self->visible_children;
… …
1823 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1824 for 0 .. $#children; 1824 for 0 .. $#children;
1825 } 1825 }
1826 } 1826 }
1827 1827
1828 CFPlus::UI::harmonize \@req; 1828 dc::UI::harmonize \@req;
1829 1829
1830 my $pos = 0; 1830 my $pos = 0;
1831 for (0 .. $#children) { 1831 for (0 .. $#children) {
1832 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1838 1 1838 1
1839} 1839}
1840 1840
1841############################################################################# 1841#############################################################################
1842 1842
1843package CFPlus::UI::HBox; 1843package dc::UI::HBox;
1844 1844
1845our @ISA = CFPlus::UI::Box::; 1845our @ISA = dc::UI::Box::;
1846 1846
1847sub new { 1847sub new {
1848 my $class = shift; 1848 my $class = shift;
1849 1849
1850 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1853 ) 1853 )
1854} 1854}
1855 1855
1856############################################################################# 1856#############################################################################
1857 1857
1858package CFPlus::UI::VBox; 1858package dc::UI::VBox;
1859 1859
1860our @ISA = CFPlus::UI::Box::; 1860our @ISA = dc::UI::Box::;
1861 1861
1862sub new { 1862sub new {
1863 my $class = shift; 1863 my $class = shift;
1864 1864
1865 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1868 ) 1868 )
1869} 1869}
1870 1870
1871############################################################################# 1871#############################################################################
1872 1872
1873package CFPlus::UI::Label; 1873package dc::UI::Label;
1874 1874
1875our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = dc::UI::DrawBG::;
1876 1876
1877use CFPlus::OpenGL; 1877use dc::OpenGL;
1878 1878
1879sub new { 1879sub new {
1880 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1881 1881
1882 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1887 #text => initial text 1887 #text => initial text
1888 #markup => initial narkup 1888 #markup => initial narkup
1889 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1890 #style => 0, # render flags 1890 #style => 0, # render flags
1891 ellipsise => 3, # end 1891 ellipsise => 3, # end
1892 layout => (new CFPlus::Layout), 1892 layout => (new dc::Layout),
1893 fontsize => 1, 1893 fontsize => 1,
1894 align => -1, 1894 align => -1,
1895 valign => -1, 1895 valign => -1,
1896 padding_x => 2, 1896 padding_x => 2,
1897 padding_y => 2, 1897 padding_y => 2,
1898 can_events => 0, 1898 can_events => 0,
1899 %arg 1899 %arg
1900 ); 1900 );
1901 1901
1902 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1903 my $layout = new CFPlus::Layout; 1903 my $layout = new dc::Layout;
1904 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1905 $self->{template} = $layout; 1905 $self->{template} = $layout;
1906 } 1906 }
1907 1907
1908 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
2054 2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2056 }; 2056 };
2057 2057
2058# unless ($self->{list}) { 2058# unless ($self->{list}) {
2059# $self->{list} = CFPlus::OpenGL::glGenList; 2059# $self->{list} = dc::OpenGL::glGenList;
2060# CFPlus::OpenGL::glNewList $self->{list}; 2060# dc::OpenGL::glNewList $self->{list};
2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062# CFPlus::OpenGL::glEndList; 2062# dc::OpenGL::glEndList;
2063# } 2063# }
2064# 2064#
2065# CFPlus::OpenGL::glCallList $self->{list}; 2065# dc::OpenGL::glCallList $self->{list};
2066 2066
2067 $self->{layout}->draw; 2067 $self->{layout}->draw;
2068} 2068}
2069 2069
2070#sub destroy { 2070#sub destroy {
2071# my ($self) = @_; 2071# my ($self) = @_;
2072# 2072#
2073# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2073# dc::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074# 2074#
2075# $self->SUPER::destroy; 2075# $self->SUPER::destroy;
2076#} 2076#}
2077 2077
2078############################################################################# 2078#############################################################################
2079 2079
2080package CFPlus::UI::EntryBase; 2080package dc::UI::EntryBase;
2081 2081
2082our @ISA = CFPlus::UI::Label::; 2082our @ISA = dc::UI::Label::;
2083 2083
2084use CFPlus::OpenGL; 2084use dc::OpenGL;
2085 2085
2086sub new { 2086sub new {
2087 my $class = shift; 2087 my $class = shift;
2088 2088
2089 $class->SUPER::new ( 2089 $class->SUPER::new (
… …
2156 2156
2157 if ($uni == 8) { 2157 if ($uni == 8) {
2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2159 } elsif ($uni == 127) { 2159 } elsif ($uni == 127) {
2160 substr $text, $self->{cursor}, 1, ""; 2160 substr $text, $self->{cursor}, 1, "";
2161 } elsif ($sym == CFPlus::SDLK_LEFT) { 2161 } elsif ($sym == dc::SDLK_LEFT) {
2162 --$self->{cursor} if $self->{cursor}; 2162 --$self->{cursor} if $self->{cursor};
2163 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2163 } elsif ($sym == dc::SDLK_RIGHT) {
2164 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2164 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2165 } elsif ($sym == CFPlus::SDLK_HOME) { 2165 } elsif ($sym == dc::SDLK_HOME) {
2166 # what a hack 2166 # what a hack
2167 $self->{cursor} = 2167 $self->{cursor} =
2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2169 ? length $1 2169 ? length $1
2170 : 0; 2170 : 0;
2171 } elsif ($sym == CFPlus::SDLK_END) { 2171 } elsif ($sym == dc::SDLK_END) {
2172 # uh, again 2172 # uh, again
2173 $self->{cursor} = 2173 $self->{cursor} =
2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2175 ? $self->{cursor} + length $1 2175 ? $self->{cursor} + length $1
2176 : length $self->{text}; 2176 : length $self->{text};
… …
2279 } 2279 }
2280} 2280}
2281 2281
2282############################################################################# 2282#############################################################################
2283 2283
2284package CFPlus::UI::Entry; 2284package dc::UI::Entry;
2285 2285
2286our @ISA = CFPlus::UI::EntryBase::; 2286our @ISA = dc::UI::EntryBase::;
2287 2287
2288use CFPlus::OpenGL; 2288use dc::OpenGL;
2289 2289
2290sub invoke_key_down { 2290sub invoke_key_down {
2291 my ($self, $ev) = @_; 2291 my ($self, $ev) = @_;
2292 2292
2293 my $sym = $ev->{sym}; 2293 my $sym = $ev->{sym};
… …
2299 $self->{history_pointer} = -1; 2299 $self->{history_pointer} = -1;
2300 $self->{history_saveback} = ''; 2300 $self->{history_saveback} = '';
2301 $self->emit (activate => $txt); 2301 $self->emit (activate => $txt);
2302 $self->update; 2302 $self->update;
2303 2303
2304 } elsif ($sym == CFPlus::SDLK_UP) { 2304 } elsif ($sym == dc::SDLK_UP) {
2305 if ($self->{history_pointer} < 0) { 2305 if ($self->{history_pointer} < 0) {
2306 $self->{history_saveback} = $self->get_text; 2306 $self->{history_saveback} = $self->get_text;
2307 } 2307 }
2308 if (@{$self->{history} || []} > 0) { 2308 if (@{$self->{history} || []} > 0) {
2309 $self->{history_pointer}++; 2309 $self->{history_pointer}++;
… …
2311 $self->{history_pointer} = @{$self->{history} || []} - 1; 2311 $self->{history_pointer} = @{$self->{history} || []} - 1;
2312 } 2312 }
2313 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2314 } 2314 }
2315 2315
2316 } elsif ($sym == CFPlus::SDLK_DOWN) { 2316 } elsif ($sym == dc::SDLK_DOWN) {
2317 $self->{history_pointer}--; 2317 $self->{history_pointer}--;
2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2319 2319
2320 if ($self->{history_pointer} >= 0) { 2320 if ($self->{history_pointer} >= 0) {
2321 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2321 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2330 1 2330 1
2331} 2331}
2332 2332
2333############################################################################# 2333#############################################################################
2334 2334
2335package CFPlus::UI::TextEdit; 2335package dc::UI::TextEdit;
2336 2336
2337our @ISA = CFPlus::UI::EntryBase::; 2337our @ISA = dc::UI::EntryBase::;
2338 2338
2339use CFPlus::OpenGL; 2339use dc::OpenGL;
2340 2340
2341sub move_cursor_ver { 2341sub move_cursor_ver {
2342 my ($self, $dy) = @_; 2342 my ($self, $dy) = @_;
2343 2343
2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
… …
2356sub invoke_key_down { 2356sub invoke_key_down {
2357 my ($self, $ev) = @_; 2357 my ($self, $ev) = @_;
2358 2358
2359 my $sym = $ev->{sym}; 2359 my $sym = $ev->{sym};
2360 2360
2361 if ($sym == CFPlus::SDLK_UP) { 2361 if ($sym == dc::SDLK_UP) {
2362 $self->move_cursor_ver (-1); 2362 $self->move_cursor_ver (-1);
2363 } elsif ($sym == CFPlus::SDLK_DOWN) { 2363 } elsif ($sym == dc::SDLK_DOWN) {
2364 $self->move_cursor_ver (+1); 2364 $self->move_cursor_ver (+1);
2365 } else { 2365 } else {
2366 return $self->SUPER::invoke_key_down ($ev) 2366 return $self->SUPER::invoke_key_down ($ev)
2367 } 2367 }
2368 2368
2369 1 2369 1
2370} 2370}
2371 2371
2372############################################################################# 2372#############################################################################
2373 2373
2374package CFPlus::UI::ButtonBin; 2374package dc::UI::ButtonBin;
2375 2375
2376our @ISA = CFPlus::UI::Bin::; 2376our @ISA = dc::UI::Bin::;
2377 2377
2378use CFPlus::OpenGL; 2378use dc::OpenGL;
2379 2379
2380my @tex = 2380my @tex =
2381 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2381 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2382 qw(b1_button_inactive.png b1_button_active.png); 2382 qw(b1_button_inactive.png b1_button_active.png);
2383 2383
2384sub new { 2384sub new {
2385 my $class = shift; 2385 my $class = shift;
2386 2386
… …
2418 $self->SUPER::_draw; 2418 $self->SUPER::_draw;
2419} 2419}
2420 2420
2421############################################################################# 2421#############################################################################
2422 2422
2423package CFPlus::UI::Button; 2423package dc::UI::Button;
2424 2424
2425our @ISA = CFPlus::UI::Label::; 2425our @ISA = dc::UI::Label::;
2426 2426
2427use CFPlus::OpenGL; 2427use dc::OpenGL;
2428 2428
2429my @tex = 2429my @tex =
2430 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2431 qw(b1_button_inactive.png b1_button_active.png); 2431 qw(b1_button_inactive.png b1_button_active.png);
2432 2432
2433sub new { 2433sub new {
2434 my $class = shift; 2434 my $class = shift;
2435 2435
… …
2473 $self->SUPER::_draw; 2473 $self->SUPER::_draw;
2474} 2474}
2475 2475
2476############################################################################# 2476#############################################################################
2477 2477
2478package CFPlus::UI::CheckBox; 2478package dc::UI::CheckBox;
2479 2479
2480our @ISA = CFPlus::UI::DrawBG::; 2480our @ISA = dc::UI::DrawBG::;
2481 2481
2482my @tex = 2482my @tex =
2483 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2483 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2484 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2484 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2485 2485
2486use CFPlus::OpenGL; 2486use dc::OpenGL;
2487 2487
2488sub new { 2488sub new {
2489 my $class = shift; 2489 my $class = shift;
2490 2490
2491 $class->SUPER::new ( 2491 $class->SUPER::new (
… …
2548 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2549} 2549}
2550 2550
2551############################################################################# 2551#############################################################################
2552 2552
2553package CFPlus::UI::Image; 2553package dc::UI::Image;
2554 2554
2555our @ISA = CFPlus::UI::Base::; 2555our @ISA = dc::UI::Base::;
2556 2556
2557use CFPlus::OpenGL; 2557use dc::OpenGL;
2558 2558
2559our %texture_cache; 2559our %texture_cache;
2560 2560
2561sub new { 2561sub new {
2562 my $class = shift; 2562 my $class = shift;
… …
2569 2569
2570 $self->{path} || $self->{tex} 2570 $self->{path} || $self->{tex}
2571 or Carp::croak "'path' or 'tex' attributes required"; 2571 or Carp::croak "'path' or 'tex' attributes required";
2572 2572
2573 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2573 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2574 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2574 new_from_file dc::Texture dc::find_rcfile $self->{path}, mipmap => 1;
2575 2575
2576 CFPlus::weaken $texture_cache{$self->{path}}; 2576 dc::weaken $texture_cache{$self->{path}};
2577 2577
2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2579 2579
2580 $self 2580 $self
2581} 2581}
2582 2582
2583sub STORABLE_freeze { 2583sub STORABLE_freeze {
2584 my ($self, $cloning) = @_; 2584 my ($self, $cloning) = @_;
2585 2585
2586 $self->{path} 2586 $self->{path}
2587 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2587 or die "cannot serialise dc::UI::Image on non-loadable images\n";
2588 2588
2589 $self->{path} 2589 $self->{path}
2590} 2590}
2591 2591
2592sub STORABLE_attach { 2592sub STORABLE_attach {
… …
2623 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2624} 2624}
2625 2625
2626############################################################################# 2626#############################################################################
2627 2627
2628package CFPlus::UI::ImageButton; 2628package dc::UI::ImageButton;
2629 2629
2630our @ISA = CFPlus::UI::Image::; 2630our @ISA = dc::UI::Image::;
2631 2631
2632use CFPlus::OpenGL; 2632use dc::OpenGL;
2633 2633
2634my %textures; 2634my %textures;
2635 2635
2636sub new { 2636sub new {
2637 my $class = shift; 2637 my $class = shift;
… …
2665 1 2665 1
2666} 2666}
2667 2667
2668############################################################################# 2668#############################################################################
2669 2669
2670package CFPlus::UI::VGauge; 2670package dc::UI::VGauge;
2671 2671
2672our @ISA = CFPlus::UI::Base::; 2672our @ISA = dc::UI::Base::;
2673 2673
2674use List::Util qw(min max); 2674use List::Util qw(min max);
2675 2675
2676use CFPlus::OpenGL; 2676use dc::OpenGL;
2677 2677
2678my %tex = ( 2678my %tex = (
2679 food => [ 2679 food => [
2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2682 ], 2682 ],
2683 grace => [ 2683 grace => [
2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2685 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2685 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2686 ], 2686 ],
2687 hp => [ 2687 hp => [
2688 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2690 ], 2690 ],
2691 mana => [ 2691 mana => [
2692 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2693 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2693 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2694 ], 2694 ],
2695); 2695);
2696 2696
2697# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2800 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2801} 2801}
2802 2802
2803############################################################################# 2803#############################################################################
2804 2804
2805package CFPlus::UI::Progress; 2805package dc::UI::Progress;
2806 2806
2807our @ISA = CFPlus::UI::Label::; 2807our @ISA = dc::UI::Label::;
2808 2808
2809use CFPlus::OpenGL; 2809use dc::OpenGL;
2810 2810
2811sub new { 2811sub new {
2812 my ($class, %arg) = @_; 2812 my ($class, %arg) = @_;
2813 2813
2814 my $self = $class->SUPER::new ( 2814 my $self = $class->SUPER::new (
… …
2834 my ($self, $label) = @_; 2834 my ($self, $label) = @_;
2835 2835
2836 return if $self->{label} eq $label; 2836 return if $self->{label} eq $label;
2837 $self->{label} = $label; 2837 $self->{label} = $label;
2838 2838
2839 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value}); 2839 $self->dc::UI::Progress::set_value (0 + delete $self->{value});
2840} 2840}
2841 2841
2842sub set_value { 2842sub set_value {
2843 my ($self, $value) = @_; 2843 my ($self, $value) = @_;
2844 2844
… …
2881 } 2881 }
2882} 2882}
2883 2883
2884############################################################################# 2884#############################################################################
2885 2885
2886package CFPlus::UI::ExperienceProgress; 2886package dc::UI::ExperienceProgress;
2887 2887
2888our @ISA = CFPlus::UI::Progress::; 2888our @ISA = dc::UI::Progress::;
2889 2889
2890sub new { 2890sub new {
2891 my ($class, %arg) = @_; 2891 my ($class, %arg) = @_;
2892 2892
2893 my $self = $class->SUPER::new ( 2893 my $self = $class->SUPER::new (
… …
2938 $self->SUPER::set_value ($v); 2938 $self->SUPER::set_value ($v);
2939} 2939}
2940 2940
2941############################################################################# 2941#############################################################################
2942 2942
2943package CFPlus::UI::Gauge; 2943package dc::UI::Gauge;
2944 2944
2945our @ISA = CFPlus::UI::VBox::; 2945our @ISA = dc::UI::VBox::;
2946 2946
2947sub new { 2947sub new {
2948 my ($class, %arg) = @_; 2948 my ($class, %arg) = @_;
2949 2949
2950 my $self = $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
… …
2952 can_hover => 1, 2952 can_hover => 1,
2953 can_events => 1, 2953 can_events => 1,
2954 %arg, 2954 %arg,
2955 ); 2955 );
2956 2956
2957 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2957 $self->add ($self->{value} = new dc::UI::Label valign => +1, align => 0, template => "999");
2958 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2958 $self->add ($self->{gauge} = new dc::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2959 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2959 $self->add ($self->{max} = new dc::UI::Label valign => -1, align => 0, template => "999");
2960 2960
2961 $self 2961 $self
2962} 2962}
2963 2963
2964sub set_fontsize { 2964sub set_fontsize {
… …
2985 $self->{value}->set_text ($val); 2985 $self->{value}->set_text ($val);
2986} 2986}
2987 2987
2988############################################################################# 2988#############################################################################
2989 2989
2990package CFPlus::UI::Slider; 2990package dc::UI::Slider;
2991 2991
2992use strict; 2992use strict;
2993 2993
2994use CFPlus::OpenGL; 2994use dc::OpenGL;
2995 2995
2996our @ISA = CFPlus::UI::DrawBG::; 2996our @ISA = dc::UI::DrawBG::;
2997 2997
2998my @tex = 2998my @tex =
2999 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 2999 map { new_from_file dc::Texture dc::find_rcfile $_ }
3000 qw(s1_slider.png s1_slider_bg.png); 3000 qw(s1_slider.png s1_slider_bg.png);
3001 3001
3002sub new { 3002sub new {
3003 my $class = shift; 3003 my $class = shift;
3004 3004
… …
3100sub invoke_mouse_wheel { 3100sub invoke_mouse_wheel {
3101 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
3102 3102
3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3104 3104
3105 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3105 my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
3106 3106
3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3108 3108
3109 1 3109 1
3110} 3110}
… …
3163 glDisable GL_TEXTURE_2D; 3163 glDisable GL_TEXTURE_2D;
3164} 3164}
3165 3165
3166############################################################################# 3166#############################################################################
3167 3167
3168package CFPlus::UI::ValSlider; 3168package dc::UI::ValSlider;
3169 3169
3170our @ISA = CFPlus::UI::HBox::; 3170our @ISA = dc::UI::HBox::;
3171 3171
3172sub new { 3172sub new {
3173 my ($class, %arg) = @_; 3173 my ($class, %arg) = @_;
3174 3174
3175 my $range = delete $arg{range}; 3175 my $range = delete $arg{range};
3176 3176
3177 my $self = $class->SUPER::new ( 3177 my $self = $class->SUPER::new (
3178 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3178 slider => (new dc::UI::Slider expand => 1, range => $range),
3179 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3179 entry => (new dc::UI::Label text => "", template => delete $arg{template}),
3180 to_value => sub { shift }, 3180 to_value => sub { shift },
3181 from_value => sub { shift }, 3181 from_value => sub { shift },
3182 %arg, 3182 %arg,
3183 ); 3183 );
3184 3184
… …
3204sub set_range { shift->{slider}->set_range (@_) } 3204sub set_range { shift->{slider}->set_range (@_) }
3205sub set_value { shift->{slider}->set_value (@_) } 3205sub set_value { shift->{slider}->set_value (@_) }
3206 3206
3207############################################################################# 3207#############################################################################
3208 3208
3209package CFPlus::UI::TextScroller; 3209package dc::UI::TextScroller;
3210 3210
3211our @ISA = CFPlus::UI::HBox::; 3211our @ISA = dc::UI::HBox::;
3212 3212
3213use CFPlus::OpenGL; 3213use dc::OpenGL;
3214 3214
3215sub new { 3215sub new {
3216 my $class = shift; 3216 my $class = shift;
3217 3217
3218 my $self = $class->SUPER::new ( 3218 my $self = $class->SUPER::new (
… …
3220 can_events => 1, 3220 can_events => 1,
3221 indent => 0, 3221 indent => 0,
3222 #font => default_font 3222 #font => default_font
3223 @_, 3223 @_,
3224 3224
3225 layout => (new CFPlus::Layout), 3225 layout => (new dc::Layout),
3226 par => [], 3226 par => [],
3227 max_par => 0, 3227 max_par => 0,
3228 height => 0, 3228 height => 0,
3229 children => [ 3229 children => [
3230 (new CFPlus::UI::Empty expand => 1), 3230 (new dc::UI::Empty expand => 1),
3231 (new CFPlus::UI::Slider vertical => 1), 3231 (new dc::UI::Slider vertical => 1),
3232 ], 3232 ],
3233 ); 3233 );
3234 3234
3235 $self->{children}[1]->connect (changed => sub { $self->update }); 3235 $self->{children}[1]->connect (changed => sub { $self->update });
3236 3236
… …
3419 $ROOT->on_post_alloc ($self => sub { 3419 $ROOT->on_post_alloc ($self => sub {
3420 $self->force_uptodate; 3420 $self->force_uptodate;
3421 3421
3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3423 3423
3424 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3424 $self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
3425 glClearColor 0, 0, 0, 0; 3425 glClearColor 0, 0, 0, 0;
3426 glClear GL_COLOR_BUFFER_BIT; 3426 glClear GL_COLOR_BUFFER_BIT;
3427 3427
3428 package CFPlus::UI::Base; 3428 package dc::UI::Base;
3429 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3429 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3430 (0, 0, $self->{w}, $self->{h}); 3430 (0, 0, $self->{w}, $self->{h});
3431 3431
3432 my $top = int $self->{children}[1]{range}[0]; 3432 my $top = int $self->{children}[1]{range}[0];
3433 3433
… …
3492 $self->{children}[1]->draw; 3492 $self->{children}[1]->draw;
3493} 3493}
3494 3494
3495############################################################################# 3495#############################################################################
3496 3496
3497package CFPlus::UI::Animator; 3497package dc::UI::Animator;
3498 3498
3499use CFPlus::OpenGL; 3499use dc::OpenGL;
3500 3500
3501our @ISA = CFPlus::UI::Bin::; 3501our @ISA = dc::UI::Bin::;
3502 3502
3503sub moveto { 3503sub moveto {
3504 my ($self, $x, $y) = @_; 3504 my ($self, $x, $y) = @_;
3505 3505
3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3534 glPopMatrix; 3534 glPopMatrix;
3535} 3535}
3536 3536
3537############################################################################# 3537#############################################################################
3538 3538
3539package CFPlus::UI::Flopper; 3539package dc::UI::Flopper;
3540 3540
3541our @ISA = CFPlus::UI::Button::; 3541our @ISA = dc::UI::Button::;
3542 3542
3543sub new { 3543sub new {
3544 my $class = shift; 3544 my $class = shift;
3545 3545
3546 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
… …
3558 $self->{other}->toggle_visibility; 3558 $self->{other}->toggle_visibility;
3559} 3559}
3560 3560
3561############################################################################# 3561#############################################################################
3562 3562
3563package CFPlus::UI::Tooltip; 3563package dc::UI::Tooltip;
3564 3564
3565our @ISA = CFPlus::UI::Bin::; 3565our @ISA = dc::UI::Bin::;
3566 3566
3567use CFPlus::OpenGL; 3567use dc::OpenGL;
3568 3568
3569sub new { 3569sub new {
3570 my $class = shift; 3570 my $class = shift;
3571 3571
3572 $class->SUPER::new ( 3572 $class->SUPER::new (
… …
3579 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
3580 3580
3581 my $tip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip; 3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583 3583
3584 $tip = CFPlus::Pod::section_label tooltip => $1 3584 $tip = dc::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/; 3585 if $tip =~ /^#(.*)$/;
3586 3586
3587 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
3588 $tip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
… …
3592 } 3592 }
3593 3593
3594 $tip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
3595 $tip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
3596 3596
3597 $self->add (new CFPlus::UI::Label 3597 $self->add (new dc::UI::Label
3598 markup => $tip, 3598 markup => $tip,
3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3600 fontsize => 0.8, 3600 fontsize => 0.8,
3601 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3602 ellipsise => 0, 3602 ellipsise => 0,
… …
3656 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3657} 3657}
3658 3658
3659############################################################################# 3659#############################################################################
3660 3660
3661package CFPlus::UI::Face; 3661package dc::UI::Face;
3662 3662
3663our @ISA = CFPlus::UI::DrawBG::; 3663our @ISA = dc::UI::DrawBG::;
3664 3664
3665use CFPlus::OpenGL; 3665use dc::OpenGL;
3666 3666
3667sub new { 3667sub new {
3668 my $class = shift; 3668 my $class = shift;
3669 3669
3670 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
… …
3674 can_events => 0, 3674 can_events => 0,
3675 @_, 3675 @_,
3676 ); 3676 );
3677 3677
3678 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3679 CFPlus::weaken (my $widget = $self); 3679 dc::weaken (my $widget = $self);
3680 3680
3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed}; 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub { 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3683 return unless $::CONN; 3683 return unless $::CONN;
3684 3684
… …
3790 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3791} 3791}
3792 3792
3793############################################################################# 3793#############################################################################
3794 3794
3795package CFPlus::UI::Buttonbar; 3795package dc::UI::Buttonbar;
3796 3796
3797our @ISA = CFPlus::UI::HBox::; 3797our @ISA = dc::UI::HBox::;
3798 3798
3799# TODO: should actually wrap buttons and other goodies. 3799# TODO: should actually wrap buttons and other goodies.
3800 3800
3801############################################################################# 3801#############################################################################
3802 3802
3803package CFPlus::UI::Menu; 3803package dc::UI::Menu;
3804 3804
3805our @ISA = CFPlus::UI::Toplevel::; 3805our @ISA = dc::UI::Toplevel::;
3806 3806
3807use CFPlus::OpenGL; 3807use dc::OpenGL;
3808 3808
3809sub new { 3809sub new {
3810 my $class = shift; 3810 my $class = shift;
3811 3811
3812 my $self = $class->SUPER::new ( 3812 my $self = $class->SUPER::new (
3813 items => [], 3813 items => [],
3814 z => 100, 3814 z => 100,
3815 @_, 3815 @_,
3816 ); 3816 );
3817 3817
3818 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3818 $self->add ($self->{vbox} = new dc::UI::VBox);
3819 3819
3820 for my $item (@{ $self->{items} }) { 3820 for my $item (@{ $self->{items} }) {
3821 my ($widget, $cb, $tooltip) = @$item; 3821 my ($widget, $cb, $tooltip) = @$item;
3822 3822
3823 # handle various types of items, only text for now 3823 # handle various types of items, only text for now
3824 if (!ref $widget) { 3824 if (!ref $widget) {
3825 if ($widget =~ /\t/) { 3825 if ($widget =~ /\t/) {
3826 my ($left, $right) = split /\t/, $widget, 2; 3826 my ($left, $right) = split /\t/, $widget, 2;
3827 3827
3828 $widget = new CFPlus::UI::HBox 3828 $widget = new dc::UI::HBox
3829 can_hover => 1, 3829 can_hover => 1,
3830 can_events => 1, 3830 can_events => 1,
3831 tooltip => $tooltip, 3831 tooltip => $tooltip,
3832 children => [ 3832 children => [
3833 (new CFPlus::UI::Label markup => $left, expand => 1), 3833 (new dc::UI::Label markup => $left, expand => 1),
3834 (new CFPlus::UI::Label markup => $right, align => +1), 3834 (new dc::UI::Label markup => $right, align => +1),
3835 ], 3835 ],
3836 ; 3836 ;
3837 3837
3838 } else { 3838 } else {
3839 $widget = new CFPlus::UI::Label 3839 $widget = new dc::UI::Label
3840 can_hover => 1, 3840 can_hover => 1,
3841 can_events => 1, 3841 can_events => 1,
3842 markup => $widget, 3842 markup => $widget,
3843 tooltip => $tooltip; 3843 tooltip => $tooltip;
3844 } 3844 }
… …
3892 1 3892 1
3893} 3893}
3894 3894
3895############################################################################# 3895#############################################################################
3896 3896
3897package CFPlus::UI::Multiplexer; 3897package dc::UI::Multiplexer;
3898 3898
3899our @ISA = CFPlus::UI::Container::; 3899our @ISA = dc::UI::Container::;
3900 3900
3901sub new { 3901sub new {
3902 my $class = shift; 3902 my $class = shift;
3903 3903
3904 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
… …
3965 $self->{current}->draw; 3965 $self->{current}->draw;
3966} 3966}
3967 3967
3968############################################################################# 3968#############################################################################
3969 3969
3970package CFPlus::UI::Notebook; 3970package dc::UI::Notebook;
3971 3971
3972use CFPlus::OpenGL; 3972use dc::OpenGL;
3973 3973
3974our @ISA = CFPlus::UI::VBox::; 3974our @ISA = dc::UI::VBox::;
3975 3975
3976sub new { 3976sub new {
3977 my $class = shift; 3977 my $class = shift;
3978 3978
3979 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3980 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new dc::UI::Buttonbar),
3981 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new dc::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2], 3982 active_outline => [.7, .7, 0.2],
3983 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3984 @_, 3984 @_,
3985 ); 3985 );
3986 3986
… …
3995 3995
3996 for my $child (@$widgets) { 3996 for my $child (@$widgets) {
3997 Scalar::Util::weaken $child; 3997 Scalar::Util::weaken $child;
3998 $child->{c_tab_} ||= do { 3998 $child->{c_tab_} ||= do {
3999 my $tab = 3999 my $tab =
4000 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4000 (UNIVERSAL::isa $child->{c_tab}, "dc::UI::Base")
4001 ? $child->{c_tab} 4001 ? $child->{c_tab}
4002 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4002 : new dc::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4003 4003
4004 $tab->connect (activate => sub { 4004 $tab->connect (activate => sub {
4005 $wself->set_current_page ($child); 4005 $wself->set_current_page ($child);
4006 }); 4006 });
4007 4007
… …
4083 } 4083 }
4084} 4084}
4085 4085
4086############################################################################# 4086#############################################################################
4087 4087
4088package CFPlus::UI::Selector; 4088package dc::UI::Selector;
4089 4089
4090use utf8; 4090use utf8;
4091 4091
4092our @ISA = CFPlus::UI::Button::; 4092our @ISA = dc::UI::Button::;
4093 4093
4094sub new { 4094sub new {
4095 my $class = shift; 4095 my $class = shift;
4096 4096
4097 my $self = $class->SUPER::new ( 4097 my $self = $class->SUPER::new (
… …
4114 my ($value, $title, $tooltip) = @$_; 4114 my ($value, $title, $tooltip) = @$_;
4115 4115
4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4117 } 4117 }
4118 4118
4119 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4119 dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
4120} 4120}
4121 4121
4122sub _set_value { 4122sub _set_value {
4123 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
4124 4124
… …
4147 $self->_set_value ($self->{value}); 4147 $self->_set_value ($self->{value});
4148} 4148}
4149 4149
4150############################################################################# 4150#############################################################################
4151 4151
4152package CFPlus::UI::Statusbox; 4152package dc::UI::Statusbox;
4153 4153
4154our @ISA = CFPlus::UI::VBox::; 4154our @ISA = dc::UI::VBox::;
4155 4155
4156sub new { 4156sub new {
4157 my $class = shift; 4157 my $class = shift;
4158 4158
4159 my $self = $class->SUPER::new ( 4159 my $self = $class->SUPER::new (
4160 fontsize => 0.8, 4160 fontsize => 0.8,
4161 @_, 4161 @_,
4162 ); 4162 );
4163 4163
4164 CFPlus::weaken (my $this = $self); 4164 dc::weaken (my $this = $self);
4165 4165
4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder }; 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4167 4167
4168 $self 4168 $self
4169} 4169}
… …
4171sub reorder { 4171sub reorder {
4172 my ($self) = @_; 4172 my ($self) = @_;
4173 my $NOW = Time::HiRes::time; 4173 my $NOW = Time::HiRes::time;
4174 4174
4175 # freeze display when hovering over any label 4175 # freeze display when hovering over any label
4176 return if $CFPlus::UI::TOOLTIP->{owner} 4176 return if $dc::UI::TOOLTIP->{owner}
4177 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4177 && grep $dc::UI::TOOLTIP->{owner} == $_->{label},
4178 values %{ $self->{item} }; 4178 values %{ $self->{item} };
4179 4179
4180 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
4181 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4182 } 4182 }
… …
4203 for ($short) { 4203 for ($short) {
4204 s/^\s+//; 4204 s/^\s+//;
4205 s/\s+/ /g; 4205 s/\s+/ /g;
4206 } 4206 }
4207 4207
4208 new CFPlus::UI::Label 4208 new dc::UI::Label
4209 markup => $short, 4209 markup => $short,
4210 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
4211 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
4212 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
4213 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
… …
4292 $self->SUPER::destroy; 4292 $self->SUPER::destroy;
4293} 4293}
4294 4294
4295############################################################################# 4295#############################################################################
4296 4296
4297package CFPlus::UI::Root; 4297package dc::UI::Root;
4298 4298
4299our @ISA = CFPlus::UI::Container::; 4299our @ISA = dc::UI::Container::;
4300 4300
4301use List::Util qw(min max); 4301use List::Util qw(min max);
4302 4302
4303use CFPlus::OpenGL; 4303use dc::OpenGL;
4304 4304
4305sub new { 4305sub new {
4306 my $class = shift; 4306 my $class = shift;
4307 4307
4308 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
4309 visible => 1, 4309 visible => 1,
4310 @_, 4310 @_,
4311 ); 4311 );
4312 4312
4313 CFPlus::weaken ($self->{root} = $self); 4313 dc::weaken ($self->{root} = $self);
4314 4314
4315 $self 4315 $self
4316} 4316}
4317 4317
4318sub size_request { 4318sub size_request {
… …
4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4522 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
4523 glLoadIdentity; 4523 glLoadIdentity;
4524 4524
4525 { 4525 {
4526 package CFPlus::UI::Base; 4526 package dc::UI::Base;
4527 4527
4528 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4529 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
4530 4530
4531 $self->_draw; 4531 $self->_draw;
4532 } 4532 }
4533} 4533}
4534 4534
4535############################################################################# 4535#############################################################################
4536 4536
4537package CFPlus::UI; 4537package dc::UI;
4538 4538
4539$ROOT = new CFPlus::UI::Root; 4539$ROOT = new dc::UI::Root;
4540$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4540$TOOLTIP = new dc::UI::Tooltip z => 900;
4541 4541
45421 45421
4543 4543

Diff Legend

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