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.44 by root, Tue May 30 07:13:08 2006 UTC vs.
Revision 1.48 by elmex, Sat Jun 3 21:59:55 2006 UTC

… …
70 $::CFG->{map_shift_x} = $bw + $x - $ox; 70 $::CFG->{map_shift_x} = $bw + $x - $ox;
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 71 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 72
73 $self->update; 73 $self->update;
74 }; 74 };
75 } elsif ($ev->{button} == 1) {
76 my ($ox, $oy) = ($ev->{x}, $ev->{y});
77
78 my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99);
79 my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99);
80 $fx += $::MAP->x;
81 $fy += $::MAP->y;
82
83 $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
84
85 warn "FOOX: $fx (".$::MAP->ox.")\n";
86 warn "FOOY: $fy (".$::MAP->oy.")\n";
87 }
88
75 } 89 1
76} 90}
77 91
78sub button_up { 92sub button_up {
79 my ($self, $ev, $x, $y) = @_; 93 my ($self, $ev, $x, $y) = @_;
80 94
81 delete $self->{motion}; 95 delete $self->{motion};
96
97 1
82} 98}
83 99
84sub mouse_motion { 100sub mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 101 my ($self, $ev, $x, $y) = @_;
86 102
103 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 104 $self->{motion}->($ev, $x, $y);
105 } else {
106 return 0;
107 }
108
109 1
88} 110}
89 111
90sub size_request { 112sub size_request {
91 ( 113 (
92 1 + 32 * int $::WIDTH / 32, 114 1 + 32 * int $::WIDTH / 32,
… …
118); 140);
119 141
120sub key_down { 142sub key_down {
121 my ($self, $ev) = @_; 143 my ($self, $ev) = @_;
122 144
123 return unless $::CONN; 145 return 0 unless $::CONN;
124 146
125 my $mod = $ev->{mod}; 147 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 148 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 149 my $uni = $ev->{unicode};
128 150
… …
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 178 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 179 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 180 $::CONN->user_send ("$DIR{$sym}[1]");
159 } 181 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 182 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 CFClient::Recorder::start (1); 183 $::BIND_EDITOR->set_binding (undef, undef, [],
184 sub {
185 my ($mod, $sym, $cmds) = @_;
186 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
187 });
188 $::BIND_EDITOR->start;
189 $::BIND_EDITOR->show;
162 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 190 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
163 CFClient::Recorder::stop (1); 191 $::BIND_EDITOR->stop;
192 $::BIND_EDITOR->ask_for_bind_and_commit;
193 $::BIND_EDITOR->hide;
164 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 194 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
165 $::CONN->user_send ($_) for @$bind_cmd; 195 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 196 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
167 $self->{completer}->key_down ($ev); 197 $self->{completer}->key_down ($ev);
168 $self->{completer}->show; 198 $self->{completer}->show;
199 } else {
200 return 0;
201 }
202
169 } 203 1
170} 204}
171 205
172sub key_up { 206sub key_up {
173 my ($self, $ev) = @_; 207 my ($self, $ev) = @_;
174 208
209 my $res = 0;
175 my $mod = $ev->{mod}; 210 my $mod = $ev->{mod};
176 my $sym = $ev->{sym}; 211 my $sym = $ev->{sym};
177 212
178 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 213 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
179 $::CONN->user_send ("fire_stop"); 214 $::CONN->user_send ("fire_stop");
215 $res = 1;
180 } 216 }
217
181 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 218 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
182 $::CONN->user_send ("run_stop"); 219 $::CONN->user_send ("run_stop");
220 $res = 1;
183 } 221 }
222
223 $res
184} 224}
185 225
186sub draw { 226sub draw {
187 my ($self) = @_; 227 my ($self) = @_;
188 228
… …
482} 522}
483 523
484sub key_down { 524sub key_down {
485 my ($self, $ev) = @_; 525 my ($self, $ev) = @_;
486 526
487 $self->{entry}->key_down ($ev); 527 $self->{entry}->key_down ($ev)
488} 528}
489 529
490sub update_labels { 530sub update_labels {
491 my ($self) = @_; 531 my ($self) = @_;
492 532

Diff Legend

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