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.269 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

371sub size_allocate { 371sub size_allocate {
372 # nothing to be done 372 # nothing to be done
373} 373}
374 374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
439 444
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 446 unless $FOCUS;
442} 447}
443 448
444sub mouse_motion { } 449sub mouse_motion { 0 }
445sub button_up { } 450sub button_up { 0 }
446sub key_down { } 451sub key_down { 0 }
447sub key_up { } 452sub key_up { 0 }
448 453
449sub button_down { 454sub button_down {
450 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
451 456
452 $self->focus_in; 457 $self->focus_in;
458
459 0
453} 460}
454 461
455sub find_widget { 462sub find_widget {
456 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
457 464
661our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
662 669
663sub new { 670sub new {
664 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
665 672
666 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
667 674
668 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
669 children => [], 676 children => [],
670 can_events => 0, 677 can_events => 0,
671 %arg, 678 %arg,
672 ); 679 );
680
673 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
674 683
675 $self 684 $self
676} 685}
677 686
678sub add { 687sub add {
726 $x -= $self->{x}; 735 $x -= $self->{x};
727 $y -= $self->{y}; 736 $y -= $self->{y};
728 737
729 my $res; 738 my $res;
730 739
731 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
733 and return $res; 742 and return $res;
734 } 743 }
735 744
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
784 793
785 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
786} 795}
787 796
788############################################################################# 797#############################################################################
798
799# back-buffered drawing area
789 800
790package CFClient::UI::Window; 801package CFClient::UI::Window;
791 802
792our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
793 804
946package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
947 958
948our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
949 960
950sub new { 961sub new {
951 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
952 965
953 my $self; 966 my $self;
954 967
955 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
956 vertical => 1, 969 vertical => 1,
961 ; 974 ;
962 975
963 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 978 slider => $slider,
966 @_, 979 %arg,
967 ); 980 );
968 981
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
972 984
973 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
974} 992}
975 993
976sub update { 994sub update {
977 my ($self) = @_; 995 my ($self) = @_;
978 996
1157 1175
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1177
1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1161 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
1162 } 1184 1
1163} 1185}
1164 1186
1165sub button_up { 1187sub button_up {
1166 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
1167 1189
1168 delete $self->{motion}; 1190 !!delete $self->{motion}
1169} 1191}
1170 1192
1171sub mouse_motion { 1193sub mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
1173 1195
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
1175} 1199}
1176 1200
1177sub _draw { 1201sub _draw {
1178 my ($self) = @_; 1202 my ($self) = @_;
1179 1203
1709 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1712 } elsif ($uni) { 1736 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1714 } 1740 }
1715 1741
1716 $self->_set_text ($text); 1742 $self->_set_text ($text);
1717 1743
1718 $self->realloc; 1744 $self->realloc;
1745
1746 1
1719} 1747}
1720 1748
1721sub focus_in { 1749sub focus_in {
1722 my ($self) = @_; 1750 my ($self) = @_;
1723 1751
1738 utf8::encode $text; 1766 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1740 1768
1741 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1742 $self->update; 1770 $self->update;
1771
1772 1
1743} 1773}
1744 1774
1745sub mouse_motion { 1775sub mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1748} 1780}
1749 1781
1750sub _draw { 1782sub _draw {
1751 my ($self) = @_; 1783 my ($self) = @_;
1752 1784
1829 } else { 1861 } else {
1830 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1831 } 1863 }
1832 1864
1833 } else { 1865 } else {
1834 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1835 } 1869 1
1836
1837} 1870}
1838 1871
1839############################################################################# 1872#############################################################################
1840 1873
1841package CFClient::UI::Button; 1874package CFClient::UI::Button;
1870 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1871 1904
1872 $self->emit ("activate") 1905 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1875} 1910}
1876 1911
1877sub _draw { 1912sub _draw {
1878 my ($self) = @_; 1913 my ($self) = @_;
1879 1914
1933 1968
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1937 $self->_emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1938 } 1977 1
1939} 1978}
1940 1979
1941sub _draw { 1980sub _draw {
1942 my ($self) = @_; 1981 my ($self) = @_;
1943 1982
2281 2320
2282 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2283 2322
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2324
2286 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2287} 2326}
2288 2327
2289sub mouse_motion { 2328sub mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2291 2330
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2335
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2337
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2300 } 2343 1
2301} 2344}
2302 2345
2303sub update { 2346sub update {
2304 my ($self) = @_; 2347 my ($self) = @_;
2305 2348
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2349 delete $self->{knob_w};
2350 $self->SUPER::update;
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2357 $self->set_value ($self->{range}[0]);
2308 2358
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2360 my $range = ($hi - $page - $lo) || 1e-100;
2311 2361
2317 $value = ($value - $lo) / $range; 2367 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2368 $value = $value * $self->{scale} + $self->{offset};
2319 2369
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2370 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2371 $self->{knob_w} = $knob_w;
2322 }); 2372 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2373
2330 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
2331 2375
2332 glScale $self->{w}, $self->{h}; 2376 glScale $self->{w}, $self->{h};
2333 2377
2827 $self->SUPER::DESTROY; 2871 $self->SUPER::DESTROY;
2828} 2872}
2829 2873
2830############################################################################# 2874#############################################################################
2831 2875
2876package CFClient::UI::Buttonbar;
2877
2878our @ISA = CFClient::UI::HBox::;
2879
2880# TODO: should actualyl wrap buttons and other goodies.
2881
2882#############################################################################
2883
2832package CFClient::UI::Menu; 2884package CFClient::UI::Menu;
2833 2885
2834our @ISA = CFClient::UI::FancyFrame::; 2886our @ISA = CFClient::UI::FancyFrame::;
2835 2887
2836use CFClient::OpenGL; 2888use CFClient::OpenGL;
2883 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2884 2936
2885 # TODO: should use vbox->find_widget or so 2937 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2939 $self->{hover} = $self->{item}{$HOVER};
2940
2941 0
2888} 2942}
2889 2943
2890sub button_up { 2944sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2892 2946
2894 undef $GRAB; 2948 undef $GRAB;
2895 $self->hide; 2949 $self->hide;
2896 2950
2897 $self->_emit ("popdown"); 2951 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2952 $self->{hover}[1]->() if $self->{hover};
2953 } else {
2954 return 0
2955 }
2956
2957 1
2958}
2959
2960#############################################################################
2961
2962package CFClient::UI::Multiplexer;
2963
2964our @ISA = CFClient::UI::Container::;
2965
2966sub new {
2967 my $class = shift;
2968
2969 my $self = $class->SUPER::new (
2970 @_,
2971 );
2972
2973 $self->{current} = $self->{children}[0]
2974 if @{ $self->{children} };
2975
2976 $self
2977}
2978
2979sub add {
2980 my ($self, @widgets) = @_;
2981
2982 $self->SUPER::add (@widgets);
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986}
2987
2988sub set_current_page {
2989 my ($self, $page_or_widget) = @_;
2990
2991 my $widget = ref $page_or_widget
2992 ? $page_or_widget
2993 : $self->{children}[$page_or_widget];
2994
2995 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997
2998 $self->_emit (page_changed => $self->{current});
2999
3000 $self->realloc;
3001}
3002
3003sub visible_children {
3004 $_[0]{current}
3005}
3006
3007sub size_request {
3008 my ($self) = @_;
3009
3010 $self->{current}->size_request
3011}
3012
3013sub size_allocate {
3014 my ($self, $w, $h) = @_;
3015
3016 $self->{current}->configure (0, 0, $w, $h);
3017}
3018
3019sub _draw {
3020 my ($self) = @_;
3021
3022 $self->{current}->draw;
3023}
3024
3025#############################################################################
3026
3027package CFClient::UI::Notebook;
3028
3029our @ISA = CFClient::UI::VBox::;
3030
3031sub new {
3032 my $class = shift;
3033
3034 my $self = $class->SUPER::new (
3035 buttonbar => (new CFClient::UI::Buttonbar),
3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self
3038 @_,
3039 );
2899 } 3040
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3042 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3043
3044 $self
3045}
3046
3047sub add {
3048 my ($self, $title, $widget, $tooltip) = @_;
3049
3050 Scalar::Util::weaken $self;
3051
3052 $self->{buttonbar}->add (new CFClient::UI::Button
3053 markup => $title,
3054 tooltip => $tooltip,
3055 on_activate => sub { $self->set_current_page ($widget) },
3056 );
3057
3058 $self->{multiplexer}->add ($widget);
3059}
3060
3061sub set_current_page {
3062 my ($self, $page) = @_;
3063
3064 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current});
2900} 3066}
2901 3067
2902############################################################################# 3068#############################################################################
2903 3069
2904package CFClient::UI::Statusbox; 3070package CFClient::UI::Statusbox;
3017 3183
3018sub new { 3184sub new {
3019 my $class = shift; 3185 my $class = shift;
3020 3186
3021 my $self = $class->SUPER::new ( 3187 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_, 3189 @_,
3024 ); 3190 );
3025 3191
3026 $self 3192 $self
3027} 3193}
3028 3194
3029sub set_items { 3195sub set_items {
3030 my ($self, $items) = @_; 3196 my ($self, $items) = @_;
3031 3197
3032 $self->{scrolled}->clear; 3198 $self->{child}->clear;
3033 return unless $items; 3199 return unless $items;
3034 3200
3035 my @items = sort { 3201 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3202 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3203 or ($a->{name} cmp $b->{name})
3041 3207
3042 my $row = 0; 3208 my $row = 0;
3043 for my $item (@items) { 3209 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3210 CFClient::Item::update_widgets $item;
3045 3211
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3212 $self->{child}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3213 $self->{child}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3214 $self->{child}->add (2, $row, $item->{weight_widget});
3049 3215
3050 $row++; 3216 $row++;
3051 } 3217 }
3052} 3218}
3053 3219
3151 $rec = $::CONN->stop_record if $::CONN; 3317 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY'; 3318 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec); 3319 $self->set_command_list ($rec);
3154} 3320}
3155 3321
3156# if $commit is true, the binding will be set after the user entered a key combo 3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3157sub ask_for_bind { 3328sub ask_for_bind {
3158 my ($self, $commit) = @_; 3329 my ($self, $commit) = @_;
3159 3330
3160 CFClient::Binder::open_binding_dialog (sub { 3331 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_; 3332 my ($mod, $sym) = @_;
3245 3416
3246############################################################################# 3417#############################################################################
3247 3418
3248package CFClient::UI::SpellList; 3419package CFClient::UI::SpellList;
3249 3420
3250our @ISA = CFClient::UI::FancyFrame::; 3421our @ISA = CFClient::UI::Table::;
3251 3422
3252sub new { 3423sub new {
3253 my $class = shift; 3424 my $class = shift;
3254 3425
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3426 my $self = $class->SUPER::new (
3256 3427 binding => [],
3257 $self->add (new CFClient::UI::ScrolledWindow 3428 commands => [],
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3429 @_,
3259 3430 )
3260 $self;
3261} 3431}
3262 3432
3263# XXX: Do sorting? Argl... 3433# XXX: Do sorting? Argl...
3264sub add_spell { 3434sub add_spell {
3265 my ($self, $spell) = @_; 3435 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell; 3436 $self->{spells}->{$spell->{name}} = $spell;
3267 3437
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face}, 3439 face => $spell->{face},
3270 can_hover => 1, 3440 can_hover => 1,
3271 can_events => 1, 3441 can_events => 1,
3272 tooltip => $spell->{message}); 3442 tooltip => $spell->{message});
3273 3443
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name}, 3445 text => $spell->{name},
3276 can_hover => 1, 3446 can_hover => 1,
3277 can_events => 1, 3447 can_events => 1,
3278 tooltip => $spell->{message}, 3448 tooltip => $spell->{message},
3279 expand => 1); 3449 expand => 1);
3280 3450
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1); 3454 expand => 1);
3285 3455
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key", 3457 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289} 3459}
3290 3460
3291sub rebuild_spell_list { 3461sub rebuild_spell_list {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines