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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
266 $self->hide; 268 $self->hide;
267 $self->emit ("destroy"); 269 $self->emit ("destroy");
268 %$self = (); 270 %$self = ();
269} 271}
270 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
271sub show { 277sub show {
272 my ($self) = @_; 278 my ($self) = @_;
273 279
274 return if $self->{parent}; 280 return if $self->{parent};
275 281
… …
314sub set_visibility { 320sub set_visibility {
315 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
316 322
317 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
318 324
319 $visible ? $self->hide 325 $visible ? $self->show
320 : $self->show; 326 : $self->hide;
321} 327}
322 328
323sub toggle_visibility { 329sub toggle_visibility {
324 my ($self) = @_; 330 my ($self) = @_;
325 331
… …
530 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
531 : (); 537 : ();
532 538
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 540
535 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 550}
540 551
541sub find_widget { 552sub find_widget {
542 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
543 554
… …
551} 562}
552 563
553sub set_parent { 564sub set_parent {
554 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
555 566
556 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
558} 569}
559 570
560sub realloc { 571sub realloc {
561 my ($self) = @_; 572 my ($self) = @_;
… …
640 my ($self) = @_; 651 my ($self) = @_;
641 652
642 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
643} 654}
644 655
656my $cntx;#d#
645sub DESTROY { 657sub DESTROY {
646 my ($self) = @_; 658 my ($self) = @_;
647 659
648 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
649 661
… …
1021 1033
1022############################################################################# 1034#############################################################################
1023 1035
1024package CFPlus::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1025 1037
1026our @ISA = CFPlus::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1027 1039
1028sub new { 1040sub new {
1029 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1030 1042
1031 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1032 1044
1033 my $self; 1045 my $self;
1034 1046
1035 my $slider = new CFPlus::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
1036 vertical => 1, 1057 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1059 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1062 },
1041 ; 1063 ;
1042 1064
1043 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1045 can_events => 1, 1067 can_events => 1,
1046 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1047 %arg, 1072 %arg,
1048 ); 1073 );
1049 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1051 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1052 1080
1053 $self 1081 $self
1054} 1082}
1055 1083
… …
1064sub invoke_mouse_wheel { 1092sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1093 my ($self, $ev) = @_;
1066 1094
1067 return 0 unless $ev->{dy}; # only vertical movements 1095 return 0 unless $ev->{dy}; # only vertical movements
1068 1096
1069 $self->{slider}->emit (mouse_wheel => $ev); 1097 $self->{vslider}->emit (mouse_wheel => $ev);
1070 1098
1071 1 1099 1
1072} 1100}
1073 1101
1074sub update_slider { 1102sub update_slider {
1075 my ($self) = @_; 1103 my ($self) = @_;
1076 1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1078} 1114}
1079 1115
1080sub update { 1116sub update {
1081 my ($self) = @_; 1117 my ($self) = @_;
1082 1118
1083 $self->SUPER::update; 1119 $self->SUPER::update;
1084
1085 $self->update_slider; 1120 $self->update_slider;
1086} 1121}
1087 1122
1088sub invoke_size_allocate { 1123sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1090 1125
1091 $self->update_slider; 1126 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1128}
1095 1129
1096############################################################################# 1130#############################################################################
1097 1131
… …
1469sub new { 1503sub new {
1470 my $class = shift; 1504 my $class = shift;
1471 1505
1472 $class->SUPER::new ( 1506 $class->SUPER::new (
1473 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1474 @_, 1509 @_,
1475 ) 1510 )
1476} 1511}
1477 1512
1478sub children { 1513sub children {
… …
1553 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1554 1589
1555 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1557 1592
1558 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1559 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1562 1597
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1599
1567 CFPlus::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1568 CFPlus::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1569 1609
1570 my $y; 1610 my $y;
1571 1611
1572 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
… …
1962 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1964 2004
1965 my $text = $self->get_text; 2005 my $text = $self->get_text;
1966 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1967 if ($uni == 8) { 2009 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
1976 $self->{cursor} = 0; 2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2029 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2030 $text = "";
1981 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2033 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2038 } else {
1987 return 0; 2039 return 0;
1988 } 2040 }
1989 2041
… …
2310 or Carp::croak "'path' or 'tex' attributes required"; 2362 or Carp::croak "'path' or 'tex' attributes required";
2311 2363
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2366
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
2316 2368
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2370
2319 $self 2371 $self
2320} 2372}
… …
2693sub invoke_mouse_wheel { 2745sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2746 my ($self, $ev) = @_;
2695 2747
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2753
2700 ! ! $delta 2754 ! ! $delta
2701} 2755}
2702 2756
2703sub update { 2757sub update {
… …
2813 #font => default_font 2867 #font => default_font
2814 @_, 2868 @_,
2815 2869
2816 layout => (new CFPlus::Layout), 2870 layout => (new CFPlus::Layout),
2817 par => [], 2871 par => [],
2872 max_par => 0,
2818 height => 0, 2873 height => 0,
2819 children => [ 2874 children => [
2820 (new CFPlus::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2822 ], 2877 ],
… …
2945 wrapped => 1, 3000 wrapped => 1,
2946 }; 3001 };
2947 3002
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
2950 } 3009 }
2951 3010
2952 $self->{need_reflow}++; 3011 $self->{need_reflow}++;
2953 $self->update; 3012 $self->update;
2954} 3013}
… …
3268 can_events => 0, 3327 can_events => 0,
3269 @_, 3328 @_,
3270 ); 3329 );
3271 3330
3272 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
3274 3333
3275 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3336 hard => 1,
3278 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
3279 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
3280 ++$widget->{frame}; 3340 ++$widget->{frame};
3281 $widget->update; 3341 $widget->update;
3282 }, 3342 },
3283 ); 3343 );
3284 } 3344 }
… …
3311 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
3312 3372
3313 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim; 3374 if $anim && @$anim;
3315 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3316 3379
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
3318 3381
3319 if ($tex) { 3382 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3325 } 3392 }
3326} 3393}
3327 3394
3328sub destroy { 3395sub destroy {
3329 my ($self) = @_; 3396 my ($self) = @_;
… …
3532} 3599}
3533 3600
3534sub add { 3601sub add {
3535 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3536 3603
3537 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3538 3605
3539 $self->{buttonbar}->add (new CFPlus::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title, 3607 markup => $title,
3541 tooltip => $tooltip, 3608 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
… …
3626 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3694 fontsize => 0.8,
3628 @_, 3695 @_,
3629 ); 3696 );
3630 3697
3631 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3632 3699
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 3701
3635 $self 3702 $self
3636} 3703}
… …
3775 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3776 visible => 1, 3843 visible => 1,
3777 @_, 3844 @_,
3778 ); 3845 );
3779 3846
3780 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3781 3848
3782 $self 3849 $self
3783} 3850}
3784 3851
3785sub size_request { 3852sub size_request {

Diff Legend

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