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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.168 by elmex, Mon Apr 24 08:50:38 2006 UTC

… …
39 delete $TOOLTIP->{owner}; 39 delete $TOOLTIP->{owner};
40} 40}
41 41
42# class methods for events 42# class methods for events
43sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
45} 46}
46 47
47sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
49} 51}
50 52
51sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
52 my ($ev) = @_; 54 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 63 check_tooltip;
62 } 64 }
63 65
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 67
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
67} 72}
68 73
69sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
70 my ($ev) = @_; 75 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
72 77
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 79
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 81
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
78 86
79 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 89 $grab->update if $grab;
82 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 107
100 check_tooltip; 108 check_tooltip;
101 } 109 }
102 110
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
104} 115}
105 116
106# convert position array to integers 117# convert position array to integers
107sub harmonize { 118sub harmonize {
108 my ($vals) = @_; 119 my ($vals) = @_;
… …
126 137
127sub new { 138sub new {
128 my $class = shift; 139 my $class = shift;
129 140
130 my $self = bless { 141 my $self = bless {
131 x => 0, 142 x => 0,
132 y => 0, 143 y => 0,
133 z => 0, 144 z => 0,
134 can_events => 1, 145 can_events => 1,
135 @_ 146 @_
136 }, $class; 147 }, $class;
137 148
138 for (keys %$self) { 149 for (keys %$self) {
… …
160} 171}
161 172
162sub hide { 173sub hide {
163 my ($self) = @_; 174 my ($self) = @_;
164 175
165 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
166 178
167 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
168} 181}
169 182
170sub move { 183sub move {
171 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
172 185
… …
402} 415}
403 416
404sub emit { 417sub emit {
405 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
406 419
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 421}
411 422
412sub DESTROY { 423sub DESTROY {
413 my ($self) = @_; 424 my ($self) = @_;
414 425
… …
481sub new { 492sub new {
482 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
483 494
484 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
485 496
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 497 my $self = $class->SUPER::new (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
487 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
488 503
489 $self 504 $self
490} 505}
491 506
… …
506 521
507sub remove { 522sub remove {
508 my ($self, $child) = @_; 523 my ($self, $child) = @_;
509 524
510 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
511 527
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 529
514 $self->check_size; 530 $self->check_size;
515 $self->update; 531 $self->update;
516} 532}
517 533
518sub clear { 534sub clear {
519 my ($self) = @_; 535 my ($self) = @_;
520 536
521 delete $_->{parent} 537 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
525} 544}
526 545
527sub find_widget { 546sub find_widget {
528 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
529 548
… …
733 my $class = shift; 752 my $class = shift;
734 753
735 # TODO: user_x, user_y, overwrite moveto? 754 # TODO: user_x, user_y, overwrite moveto?
736 755
737 my $self = $class->SUPER::new ( 756 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 757 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 758 border_bg => [1, 1, 1, 1],
740 border => 0.8, 759 border => 0.8,
741 can_events => 1, 760 can_events => 1,
742 @_ 761 @_
743 ); 762 );
744 763
745 $self->{title} &&= new CFClient::UI::Label 764 $self->{title} &&= new CFClient::UI::Label
… …
897 916
898# TODO: move to container class maybe? send childs a signal on removal? 917# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 918sub clear {
900 my ($self) = @_; 919 my ($self) = @_;
901 920
902 delete $self->{children}; 921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
903 $self->update; 928 $self->update;
904} 929}
905 930
906sub get_wh { 931sub get_wh {
907 my ($self) = @_; 932 my ($self) = @_;
… …
1130 1155
1131sub new { 1156sub new {
1132 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1133 1158
1134 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
1136 #font => default_font 1161 #font => default_font
1137 fontsize => 1, 1162 fontsize => 1,
1138 text => "", 1163 text => "",
1139 align => -1, 1164 align => -1,
1140 valign => -1, 1165 valign => -1,
1141 padding => 2, 1166 padding => 2,
1142 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1143 can_events => 0, 1168 can_events => 0,
1144 %arg 1169 %arg
1145 ); 1170 );
1146 1171
1147 if (exists $self->{template}) { 1172 if (exists $self->{template}) {
… …
1271 1296
1272sub new { 1297sub new {
1273 my $class = shift; 1298 my $class = shift;
1274 1299
1275 $class->SUPER::new ( 1300 $class->SUPER::new (
1276 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1280 can_hover => 1, 1305 can_hover => 1,
1281 can_focus => 1, 1306 can_focus => 1,
1282 valign => 0, 1307 valign => 0,
1283 can_events => 1, 1308 can_events => 1,
1284 @_ 1309 @_
1285 ) 1310 )
1286} 1311}
1287 1312
… …
1441 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1442 1467
1443 my $sym = $ev->{sym}; 1468 my $sym = $ev->{sym};
1444 1469
1445 if ($sym == 13) { 1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1446 $self->emit (activate => $self->get_text); 1474 $self->emit (activate => $txt);
1447 $self->update; 1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history} || []} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1448 1496
1449 } else { 1497 } else {
1450 $self->SUPER::key_down ($ev); 1498 $self->SUPER::key_down ($ev);
1451 } 1499 }
1452 1500
… …
1466 1514
1467sub new { 1515sub new {
1468 my $class = shift; 1516 my $class = shift;
1469 1517
1470 $class->SUPER::new ( 1518 $class->SUPER::new (
1471 padding => 4, 1519 padding => 4,
1472 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1521 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1522 active_fg => [0, 0, 1],
1475 can_hover => 1, 1523 can_hover => 1,
1476 align => 0, 1524 align => 0,
1477 valign => 0, 1525 valign => 0,
1478 can_events => 1, 1526 can_events => 1,
1479 @_ 1527 @_
1480 ) 1528 )
1481} 1529}
1482 1530
… …
1773 1821
1774sub new { 1822sub new {
1775 my ($class, %arg) = @_; 1823 my ($class, %arg) = @_;
1776 1824
1777 my $self = $class->SUPER::new ( 1825 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1826 tooltip => $arg{type},
1779 can_events => 1,
1780 can_hover => 1, 1827 can_hover => 1,
1781 %arg, 1828 %arg,
1782 ); 1829 );
1783 1830
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
… …
1957 2004
1958sub new { 2005sub new {
1959 my $class = shift; 2006 my $class = shift;
1960 2007
1961 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1962 fontsize => 1, 2009 fontsize => 1,
2010 can_events => 0,
1963 #font => default_font 2011 #font => default_font
1964 @_, 2012 @_,
1965 2013
1966 layout => (new CFClient::Layout), 2014 layout => (new CFClient::Layout),
1967 par => [], 2015 par => [],
1968 height => 0, 2016 height => 0,
1969 children => [ 2017 children => [
1970 (new CFClient::UI::Empty expand => 1), 2018 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2019 (new CFClient::UI::Slider vertical => 1),
1972 ], 2020 ],
1973 ); 2021 );
1974 2022
… …
2159 2207
2160sub new { 2208sub new {
2161 my $class = shift; 2209 my $class = shift;
2162 2210
2163 my $self = $class->SUPER::new ( 2211 my $self = $class->SUPER::new (
2164 state => 0, 2212 state => 0,
2165 connect_activate => \&toggle_flopper, 2213 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2214 @_
2168 ); 2215 );
2169 2216
2170 if ($self->{state}) { 2217 if ($self->{state}) {
2171 $self->{state} = 0; 2218 $self->{state} = 0;

Diff Legend

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