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.51 by root, Thu Jun 8 01:51:32 2006 UTC

… …
14 14
15 my $self = $class->SUPER::new ( 15 my $self = $class->SUPER::new (
16 z => -1, 16 z => -1,
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19
20 smooth_matrix => [
21 0.05, 0.13, 0.05,
22 0.13, 0.30, 0.13,
23 0.05, 0.13, 0.05,
24 ],
25
19 @_ 26 @_
20 ); 27 );
21 28
22 $self->{completer} = new CFClient::MapWidget::Command:: 29 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 30 command => $self->{command},
… …
56sub button_down { 63sub button_down {
57 my ($self, $ev, $x, $y) = @_; 64 my ($self, $ev, $x, $y) = @_;
58 65
59 $self->focus_in; 66 $self->focus_in;
60 67
61 if ($ev->{button} == 2) { 68 if ($ev->{button} == 1) {
69 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
71
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99;
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99;
74
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
76
77 } elsif ($ev->{button} == 2) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 78 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 79 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 80
65 $self->{motion} = sub { 81 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 82 my ($ev, $x, $y) = @_;
… …
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 87 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 88
73 $self->update; 89 $self->update;
74 }; 90 };
75 } 91 }
92
93 1
76} 94}
77 95
78sub button_up { 96sub button_up {
79 my ($self, $ev, $x, $y) = @_; 97 my ($self, $ev, $x, $y) = @_;
80 98
81 delete $self->{motion}; 99 delete $self->{motion};
100
101 1
82} 102}
83 103
84sub mouse_motion { 104sub mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 105 my ($self, $ev, $x, $y) = @_;
86 106
107 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 108 $self->{motion}->($ev, $x, $y);
109 } else {
110 return 0;
111 }
112
113 1
88} 114}
89 115
90sub size_request { 116sub size_request {
91 ( 117 (
92 1 + 32 * int $::WIDTH / 32, 118 1 + 32 * int $::WIDTH / 32,
… …
118); 144);
119 145
120sub key_down { 146sub key_down {
121 my ($self, $ev) = @_; 147 my ($self, $ev) = @_;
122 148
123 return unless $::CONN; 149 return 0 unless $::CONN;
124 150
125 my $mod = $ev->{mod}; 151 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 152 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 153 my $uni = $ev->{unicode};
128 154
… …
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 182 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 183 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 184 $::CONN->user_send ("$DIR{$sym}[1]");
159 } 185 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 186 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 CFClient::Recorder::start (1); 187 $::BIND_EDITOR->set_binding (undef, undef, [],
188 sub {
189 my ($mod, $sym, $cmds) = @_;
190 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
191 });
192 $::BIND_EDITOR->start;
193 $::BIND_EDITOR->show;
162 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 194 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
163 CFClient::Recorder::stop (1); 195 $::BIND_EDITOR->stop;
196 $::BIND_EDITOR->ask_for_bind_and_commit;
197 $::BIND_EDITOR->hide;
164 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 198 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
165 $::CONN->user_send ($_) for @$bind_cmd; 199 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 200 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
167 $self->{completer}->key_down ($ev); 201 $self->{completer}->key_down ($ev);
168 $self->{completer}->show; 202 $self->{completer}->show;
203 } else {
204 return 0;
205 }
206
169 } 207 1
170} 208}
171 209
172sub key_up { 210sub key_up {
173 my ($self, $ev) = @_; 211 my ($self, $ev) = @_;
174 212
213 my $res = 0;
175 my $mod = $ev->{mod}; 214 my $mod = $ev->{mod};
176 my $sym = $ev->{sym}; 215 my $sym = $ev->{sym};
177 216
178 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 217 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
179 $::CONN->user_send ("fire_stop"); 218 $::CONN->user_send ("fire_stop");
219 $res = 1;
180 } 220 }
221
181 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 222 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
182 $::CONN->user_send ("run_stop"); 223 $::CONN->user_send ("run_stop");
224 $res = 1;
183 } 225 }
226
227 $res
184} 228}
185 229
186sub draw { 230sub draw {
187 my ($self) = @_; 231 my ($self) = @_;
188 232
… …
215 glConvolutionFilter2D ( 259 glConvolutionFilter2D (
216 GL_CONVOLUTION_2D, 260 GL_CONVOLUTION_2D,
217 GL_ALPHA, 261 GL_ALPHA,
218 3, 3, 262 3, 3,
219 GL_ALPHA, GL_FLOAT, 263 GL_ALPHA, GL_FLOAT,
220 pack "f*", 264 (pack "f*", @{ $self->{smooth_matrix} }),
221 0.05, 0.13, 0.05,
222 0.13, 0.30, 0.13,
223 0.05, 0.13, 0.05,
224 ); 265 );
225 glEnable GL_CONVOLUTION_2D; 266 glEnable GL_CONVOLUTION_2D;
226 } 267 }
227 268
228 $self->{fow_texture_name} ||= glGenTexture; 269 $self->{fow_texture_name} ||= glGenTexture;
… …
482} 523}
483 524
484sub key_down { 525sub key_down {
485 my ($self, $ev) = @_; 526 my ($self, $ev) = @_;
486 527
487 $self->{entry}->key_down ($ev); 528 $self->{entry}->key_down ($ev)
488} 529}
489 530
490sub update_labels { 531sub update_labels {
491 my ($self) = @_; 532 my ($self) = @_;
492 533

Diff Legend

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