… | |
… | |
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 $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 | |
78 | sub button_up { |
89 | sub 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 | |
84 | sub mouse_motion { |
97 | sub 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 | |
90 | sub size_request { |
109 | sub size_request { |
91 | ( |
110 | ( |
92 | 1 + 32 * int $::WIDTH / 32, |
111 | 1 + 32 * int $::WIDTH / 32, |
… | |
… | |
118 | ); |
137 | ); |
119 | |
138 | |
120 | sub key_down { |
139 | sub 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 | |
… | |
… | |
165 | }); |
184 | }); |
166 | $::BIND_EDITOR->start; |
185 | $::BIND_EDITOR->start; |
167 | $::BIND_EDITOR->show; |
186 | $::BIND_EDITOR->show; |
168 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
187 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
169 | $::BIND_EDITOR->stop; |
188 | $::BIND_EDITOR->stop; |
170 | $::BIND_EDITOR->ask_for_bind (1); |
189 | $::BIND_EDITOR->ask_for_bind_and_commit; |
171 | $::BIND_EDITOR->hide; |
190 | $::BIND_EDITOR->hide; |
172 | } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { |
191 | } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { |
173 | $::CONN->user_send ($_) for @$bind_cmd; |
192 | $::CONN->user_send ($_) for @$bind_cmd; |
174 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
193 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
175 | $self->{completer}->key_down ($ev); |
194 | $self->{completer}->key_down ($ev); |
176 | $self->{completer}->show; |
195 | $self->{completer}->show; |
|
|
196 | } else { |
|
|
197 | return 0; |
|
|
198 | } |
|
|
199 | |
177 | } |
200 | 1 |
178 | } |
201 | } |
179 | |
202 | |
180 | sub key_up { |
203 | sub key_up { |
181 | my ($self, $ev) = @_; |
204 | my ($self, $ev) = @_; |
182 | |
205 | |
|
|
206 | my $res = 0; |
183 | my $mod = $ev->{mod}; |
207 | my $mod = $ev->{mod}; |
184 | my $sym = $ev->{sym}; |
208 | my $sym = $ev->{sym}; |
185 | |
209 | |
186 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
210 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
187 | $::CONN->user_send ("fire_stop"); |
211 | $::CONN->user_send ("fire_stop"); |
|
|
212 | $res = 1; |
188 | } |
213 | } |
|
|
214 | |
189 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
215 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
190 | $::CONN->user_send ("run_stop"); |
216 | $::CONN->user_send ("run_stop"); |
|
|
217 | $res = 1; |
191 | } |
218 | } |
|
|
219 | |
|
|
220 | $res |
192 | } |
221 | } |
193 | |
222 | |
194 | sub draw { |
223 | sub draw { |
195 | my ($self) = @_; |
224 | my ($self) = @_; |
196 | |
225 | |
… | |
… | |
490 | } |
519 | } |
491 | |
520 | |
492 | sub key_down { |
521 | sub key_down { |
493 | my ($self, $ev) = @_; |
522 | my ($self, $ev) = @_; |
494 | |
523 | |
495 | $self->{entry}->key_down ($ev); |
524 | $self->{entry}->key_down ($ev) |
496 | } |
525 | } |
497 | |
526 | |
498 | sub update_labels { |
527 | sub update_labels { |
499 | my ($self) = @_; |
528 | my ($self) = @_; |
500 | |
529 | |