ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.43 by elmex, Mon May 29 19:30:28 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC

… …
56sub button_down { 56sub button_down {
57 my ($self, $ev, $x, $y) = @_; 57 my ($self, $ev, $x, $y) = @_;
58 58
59 $self->focus_in; 59 $self->focus_in;
60 60
61 if ($ev->{button} == 2) { 61 if ($ev->{button} == 1) {
62 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
63 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
64
65 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99;
66 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99;
67
68 $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
69
70 } elsif ($ev->{button} == 2) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 71 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 72 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 73
65 $self->{motion} = sub { 74 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 75 my ($ev, $x, $y) = @_;
… …
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 80 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 81
73 $self->update; 82 $self->update;
74 }; 83 };
75 } 84 }
85
86 1
76} 87}
77 88
78sub button_up { 89sub button_up {
79 my ($self, $ev, $x, $y) = @_; 90 my ($self, $ev, $x, $y) = @_;
80 91
81 delete $self->{motion}; 92 delete $self->{motion};
93
94 1
82} 95}
83 96
84sub mouse_motion { 97sub mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 98 my ($self, $ev, $x, $y) = @_;
86 99
100 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 101 $self->{motion}->($ev, $x, $y);
102 } else {
103 return 0;
104 }
105
106 1
88} 107}
89 108
90sub size_request { 109sub size_request {
91 ( 110 (
92 1 + 32 * int $::WIDTH / 32, 111 1 + 32 * int $::WIDTH / 32,
… …
118); 137);
119 138
120sub key_down { 139sub key_down {
121 my ($self, $ev) = @_; 140 my ($self, $ev) = @_;
122 141
123 return unless $::CONN; 142 return 0 unless $::CONN;
124 143
125 my $mod = $ev->{mod}; 144 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 145 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 146 my $uni = $ev->{unicode};
128 147
… …
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 175 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 176 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 177 $::CONN->user_send ("$DIR{$sym}[1]");
159 } 178 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 179 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 CFClient::Recorder::start (1); 180 $::BIND_EDITOR->set_binding (undef, undef, [],
181 sub {
182 my ($mod, $sym, $cmds) = @_;
183 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
184 });
185 $::BIND_EDITOR->start;
186 $::BIND_EDITOR->show;
162 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 187 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
163 CFClient::Recorder::stop (1); 188 $::BIND_EDITOR->stop;
189 $::BIND_EDITOR->ask_for_bind_and_commit;
190 $::BIND_EDITOR->hide;
164 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 191 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
165 $::CONN->user_send ($_) for @$bind_cmd; 192 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 193 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
167 $self->{completer}->key_down ($ev); 194 $self->{completer}->key_down ($ev);
168 $self->{completer}->show; 195 $self->{completer}->show;
196 } else {
197 return 0;
198 }
199
169 } 200 1
170} 201}
171 202
172sub key_up { 203sub key_up {
173 my ($self, $ev) = @_; 204 my ($self, $ev) = @_;
174 205
206 my $res = 0;
175 my $mod = $ev->{mod}; 207 my $mod = $ev->{mod};
176 my $sym = $ev->{sym}; 208 my $sym = $ev->{sym};
177 209
178 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 210 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
179 $::CONN->user_send ("fire_stop"); 211 $::CONN->user_send ("fire_stop");
212 $res = 1;
180 } 213 }
214
181 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 215 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
182 $::CONN->user_send ("run_stop"); 216 $::CONN->user_send ("run_stop");
217 $res = 1;
183 } 218 }
219
220 $res
184} 221}
185 222
186sub draw { 223sub draw {
187 my ($self) = @_; 224 my ($self) = @_;
188 225
… …
283# 320#
284# $label->show; 321# $label->show;
285# $label->update; 322# $label->update;
286# 323#
287# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 324# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
288# $label->move ( 325# $label->move_abs (
289# ($::WIDTH - $label->{w}) * 0.5, 326# ($::WIDTH - $label->{w}) * 0.5,
290# ($::HEIGHT - $label->{h}) * 0.5, 327# ($::HEIGHT - $label->{h}) * 0.5,
291# ); 328# );
292# }); 329# });
293# 330#
… …
462 499
463sub size_allocate { 500sub size_allocate {
464 my ($self, $w, $h) = @_; 501 my ($self, $w, $h) = @_;
465 502
466 $self->SUPER::size_allocate ($w, $h); 503 $self->SUPER::size_allocate ($w, $h);
467 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 504 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
468} 505}
469 506
470sub show { 507sub show {
471 my ($self) = @_; 508 my ($self) = @_;
472 509
… …
482} 519}
483 520
484sub key_down { 521sub key_down {
485 my ($self, $ev) = @_; 522 my ($self, $ev) = @_;
486 523
487 $self->{entry}->key_down ($ev); 524 $self->{entry}->key_down ($ev)
488} 525}
489 526
490sub update_labels { 527sub update_labels {
491 my ($self) = @_; 528 my ($self) = @_;
492 529

Diff Legend

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