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.42 by root, Mon May 29 18:33:23 2006 UTC vs.
Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC

… …
56sub button_down { 56sub 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
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
… …
155 $self->{ctrl}++; 177 $self->{ctrl}++;
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 }
182 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
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;
190 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
191 $::BIND_EDITOR->stop;
192 $::BIND_EDITOR->ask_for_bind_and_commit;
193 $::BIND_EDITOR->hide;
194 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
195 $::CONN->user_send ($_) for @$bind_cmd;
160 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 196 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
161 $self->{completer}->key_down ($ev); 197 $self->{completer}->key_down ($ev);
162 $self->{completer}->show; 198 $self->{completer}->show;
199 } else {
200 return 0;
201 }
202
163 } 203 1
164} 204}
165 205
166sub key_up { 206sub key_up {
167 my ($self, $ev) = @_; 207 my ($self, $ev) = @_;
168 208
209 my $res = 0;
169 my $mod = $ev->{mod}; 210 my $mod = $ev->{mod};
170 my $sym = $ev->{sym}; 211 my $sym = $ev->{sym};
171 212
172 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 213 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
173 $::CONN->user_send ("fire_stop"); 214 $::CONN->user_send ("fire_stop");
215 $res = 1;
174 } 216 }
217
175 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 218 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
176 $::CONN->user_send ("run_stop"); 219 $::CONN->user_send ("run_stop");
220 $res = 1;
177 } 221 }
222
223 $res
178} 224}
179 225
180sub draw { 226sub draw {
181 my ($self) = @_; 227 my ($self) = @_;
182 228
… …
277# 323#
278# $label->show; 324# $label->show;
279# $label->update; 325# $label->update;
280# 326#
281# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 327# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
282# $label->move ( 328# $label->move_abs (
283# ($::WIDTH - $label->{w}) * 0.5, 329# ($::WIDTH - $label->{w}) * 0.5,
284# ($::HEIGHT - $label->{h}) * 0.5, 330# ($::HEIGHT - $label->{h}) * 0.5,
285# ); 331# );
286# }); 332# });
287# 333#
… …
456 502
457sub size_allocate { 503sub size_allocate {
458 my ($self, $w, $h) = @_; 504 my ($self, $w, $h) = @_;
459 505
460 $self->SUPER::size_allocate ($w, $h); 506 $self->SUPER::size_allocate ($w, $h);
461 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 507 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
462} 508}
463 509
464sub show { 510sub show {
465 my ($self) = @_; 511 my ($self) = @_;
466 512
… …
476} 522}
477 523
478sub key_down { 524sub key_down {
479 my ($self, $ev) = @_; 525 my ($self, $ev) = @_;
480 526
481 $self->{entry}->key_down ($ev); 527 $self->{entry}->key_down ($ev)
482} 528}
483 529
484sub update_labels { 530sub update_labels {
485 my ($self) = @_; 531 my ($self) = @_;
486 532

Diff Legend

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