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.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.71 by root, Sun Jul 2 21:07:26 2006 UTC

… …
65} 65}
66 66
67sub invoke_button_down { 67sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
69 69
70 return unless $::CONN;
71
72 $self->grab_focus;
73
74 if ($ev->{button} == 1) { 70 if ($ev->{button} == 1) {
71 $self->grab_focus;
72 return unless $::CONN;
73
75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 74 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 75 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
77 76
78 $x -= int 0.5 * $self->{sw}; 77 $x -= int 0.5 * $self->{sw};
79 $y -= int 0.5 * $self->{sh}; 78 $y -= int 0.5 * $self->{sh};
80 79
81 $::CONN->lookat ($x, $y) 80 $::CONN->lookat ($x, $y)
82 if $::CONN; 81 if $::CONN;
83 82
84 } elsif ($ev->{button} == 2) { 83 } elsif ($ev->{button} == 2) {
84 $self->grab_focus;
85 return unless $::CONN;
86
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 87 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 89
88 $self->{motion} = sub { 90 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 91 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 95 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 97
96 $self->update; 98 $self->update;
97 }; 99 };
100 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu
102 items => [
103 ["Help Browser… (F1)", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Stats & Skills… (F2)", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Inventory… (F3)", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells… (F4)", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… (F5)", sub { $::SETUP_DIALOG->toggle_visibility }],
108 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
109 [
110 $::PICKUP_ENABLE->{state}
111 ? "Disable automatic pickup"
112 : "Enable automatic pickup",
113 sub { $::PICKUP_ENABLE->toggle }
114 ],
115 ],
116 )->popup ($ev);
98 } 117 }
99 118
100 1 119 1
101} 120}
102 121
… …
151); 170);
152 171
153sub invoke_key_down { 172sub invoke_key_down {
154 my ($self, $ev) = @_; 173 my ($self, $ev) = @_;
155 174
156 return 0 unless $::CONN;
157
158 my $mod = $ev->{mod}; 175 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 176 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 177 my $uni = $ev->{unicode};
161 178
179 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
180
181 if ($uni == ord "\t") {
182 $::PL_WINDOW->toggle_visibility;
183 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
184 $::HELP_WINDOW->toggle_visibility;
185 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
186 ::toggle_player_page ($::STATS_PAGE);
187 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
188 ::toggle_player_page ($::INVENTORY_PAGE);
189 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
190 ::toggle_player_page ($::SPELL_PAGE);
191 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
192 $::SETUP_DIALOG->toggle_visibility;
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub {
196 my ($mod, $sym, $cmds) = @_;
197 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
198 });
199 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide;
205 } elsif (!$::CONN) {
206 return 0; # bindings further down need a valid connection
207
162 if ($sym == CFClient::SDLK_KP5) { 208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 209 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 210 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 211 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 212 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 213 $::CONN->user_send ("apply");
168 } elsif ($uni == ord ".") { 214 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 215 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 216 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
172 $::PL_WINDOW->toggle_visibility; 218 $::CONN->user_send ($_) for @$bind_cmd;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
175 $::CONN->user_send ("rotateshoottype +"); 220 $::CONN->user_send ("rotateshoottype +");
176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
177 $::CONN->user_send ("rotateshoottype -"); 222 $::CONN->user_send ("rotateshoottype -");
178 } elsif ($uni == ord '"') { 223 } elsif ($uni == ord '"') {
179 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 224 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
180 $self->{completer}->show; 225 $self->{completer}->show;
181 } elsif ($uni == ord "'") { 226 } elsif ($uni == ord "'") {
… …
192 $self->{ctrl}++; 237 $self->{ctrl}++;
193 $::CONN->user_send ("run $DIR{$sym}[0]"); 238 $::CONN->user_send ("run $DIR{$sym}[0]");
194 } else { 239 } else {
195 $::CONN->user_send ("$DIR{$sym}[1]"); 240 $::CONN->user_send ("$DIR{$sym}[1]");
196 } 241 }
197 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
198 $::BIND_EDITOR->set_binding (undef, undef, [],
199 sub {
200 my ($mod, $sym, $cmds) = @_;
201 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202 });
203 $::BIND_EDITOR->start;
204 $::BIND_EDITOR->show;
205 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206 $::BIND_EDITOR->stop;
207 $::BIND_EDITOR->ask_for_bind_and_commit;
208 $::BIND_EDITOR->hide;
209 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
210 $::CONN->user_send ($_) for @$bind_cmd;
211 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212 $self->{completer}->invoke_key_down ($ev); 243 $self->{completer}->invoke_key_down ($ev);
213 $self->{completer}->show; 244 $self->{completer}->show;
214 } else { 245 } else {
215 return 0; 246 return 0;

Diff Legend

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