… | |
… | |
56 | sub button_down { |
56 | sub 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 ($ox, $oy) = ($ev->{x}, $ev->{y}); |
|
|
63 | |
|
|
64 | my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99); |
|
|
65 | my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99); |
|
|
66 | $fx += $::MAP->x; |
|
|
67 | $fy += $::MAP->y; |
|
|
68 | |
|
|
69 | $::CONN->send (sprintf "lookat %d %d", $fx, $fy); |
|
|
70 | |
|
|
71 | warn "FOOX: $fx (".$::MAP->ox.")\n"; |
|
|
72 | warn "FOOY: $fy (".$::MAP->oy.")\n"; |
|
|
73 | } elsif ($ev->{button} == 2) { |
62 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
74 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
63 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
75 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
64 | |
76 | |
65 | $self->{motion} = sub { |
77 | $self->{motion} = sub { |
66 | my ($ev, $x, $y) = @_; |
78 | my ($ev, $x, $y) = @_; |
… | |
… | |
71 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
83 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
72 | |
84 | |
73 | $self->update; |
85 | $self->update; |
74 | }; |
86 | }; |
75 | } |
87 | } |
|
|
88 | |
|
|
89 | 1 |
76 | } |
90 | } |
77 | |
91 | |
78 | sub button_up { |
92 | sub 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 | |
84 | sub mouse_motion { |
100 | sub 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 | |
90 | sub size_request { |
112 | sub size_request { |
91 | ( |
113 | ( |
92 | 1 + 32 * int $::WIDTH / 32, |
114 | 1 + 32 * int $::WIDTH / 32, |
… | |
… | |
118 | ); |
140 | ); |
119 | |
141 | |
120 | sub key_down { |
142 | sub 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 | |
… | |
… | |
165 | }); |
187 | }); |
166 | $::BIND_EDITOR->start; |
188 | $::BIND_EDITOR->start; |
167 | $::BIND_EDITOR->show; |
189 | $::BIND_EDITOR->show; |
168 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
190 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
169 | $::BIND_EDITOR->stop; |
191 | $::BIND_EDITOR->stop; |
170 | $::BIND_EDITOR->ask_for_bind (1); |
192 | $::BIND_EDITOR->ask_for_bind_and_commit; |
171 | $::BIND_EDITOR->hide; |
193 | $::BIND_EDITOR->hide; |
172 | } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { |
194 | } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { |
173 | $::CONN->user_send ($_) for @$bind_cmd; |
195 | $::CONN->user_send ($_) for @$bind_cmd; |
174 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
196 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
175 | $self->{completer}->key_down ($ev); |
197 | $self->{completer}->key_down ($ev); |
176 | $self->{completer}->show; |
198 | $self->{completer}->show; |
|
|
199 | } else { |
|
|
200 | return 0; |
|
|
201 | } |
|
|
202 | |
177 | } |
203 | 1 |
178 | } |
204 | } |
179 | |
205 | |
180 | sub key_up { |
206 | sub key_up { |
181 | my ($self, $ev) = @_; |
207 | my ($self, $ev) = @_; |
182 | |
208 | |
|
|
209 | my $res = 0; |
183 | my $mod = $ev->{mod}; |
210 | my $mod = $ev->{mod}; |
184 | my $sym = $ev->{sym}; |
211 | my $sym = $ev->{sym}; |
185 | |
212 | |
186 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
213 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
187 | $::CONN->user_send ("fire_stop"); |
214 | $::CONN->user_send ("fire_stop"); |
|
|
215 | $res = 1; |
188 | } |
216 | } |
|
|
217 | |
189 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
218 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
190 | $::CONN->user_send ("run_stop"); |
219 | $::CONN->user_send ("run_stop"); |
|
|
220 | $res = 1; |
191 | } |
221 | } |
|
|
222 | |
|
|
223 | $res |
192 | } |
224 | } |
193 | |
225 | |
194 | sub draw { |
226 | sub draw { |
195 | my ($self) = @_; |
227 | my ($self) = @_; |
196 | |
228 | |
… | |
… | |
490 | } |
522 | } |
491 | |
523 | |
492 | sub key_down { |
524 | sub key_down { |
493 | my ($self, $ev) = @_; |
525 | my ($self, $ev) = @_; |
494 | |
526 | |
495 | $self->{entry}->key_down ($ev); |
527 | $self->{entry}->key_down ($ev) |
496 | } |
528 | } |
497 | |
529 | |
498 | sub update_labels { |
530 | sub update_labels { |
499 | my ($self) = @_; |
531 | my ($self) = @_; |
500 | |
532 | |