ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/gde/GCE/MapEditor.pm
(Generate patch)

Comparing deliantra/gde/GCE/MapEditor.pm (file contents):
Revision 1.11 by root, Tue Feb 21 18:07:34 2006 UTC vs.
Revision 1.29 by elmex, Mon Mar 20 04:11:41 2006 UTC

… …
13use Crossfire; 13use Crossfire;
14use Crossfire::Map; 14use Crossfire::Map;
15use Crossfire::MapWidget; 15use Crossfire::MapWidget;
16 16
17use GCE::AttrEdit; 17use GCE::AttrEdit;
18use GCE::Util;
18 19
19use Glib::Object::Subclass 20use Glib::Object::Subclass
20 Gtk2::Window; 21 Gtk2::Window;
21 22
22use strict; 23use strict;
… …
30 children => [ 31 children => [
31 "_Save" => { 32 "_Save" => {
32 callback => sub { $self->save_map }, 33 callback => sub { $self->save_map },
33 accelerator => '<ctrl>S' 34 accelerator => '<ctrl>S'
34 }, 35 },
35 ],
36 children => [
37 "Save As" => { 36 "Save As" => {
38 callback => sub { $self->save_map_as }, 37 callback => sub { $self->save_map_as },
38 },
39 "Close" => {
40 callback => sub { $self->delete; 1 },
39 }, 41 },
40 ] 42 ]
41 }, 43 },
42 _Edit => { 44 _Edit => {
43 item_type => '<Branch>', 45 item_type => '<Branch>',
44 children => [ 46 children => [
45 "_Undo" => { 47 "_Undo" => {
46 callback => sub { $self->undo }, 48 callback => sub { $self->undo },
47 accelerator => "<ctrl>Z" 49 accelerator => "<ctrl>Z"
48 }, 50 },
49 "_Redo" => { 51 "_Redo" => {
50 callback => sub { $self->redo }, 52 callback => sub { $self->redo },
51 accelerator => "<ctrl>Y" 53 accelerator => "<ctrl>Y"
52 }, 54 },
53 55 "_Map Properties" => {
56 callback => sub { $self->open_map_prop },
57 accelerator => "<ctrl>P"
58 },
59 "_Map Resize" => {
60 callback => sub { $self->open_resize_map },
61 accelerator => "<ctrl>R"
62 },
54 ] 63 ]
55 }, 64 },
56 65 _Go => {
66 item_type => '<Branch>',
67 children => [
68 "_Up" => {
69 callback => sub { $self->follow ('u') },
70 accelerator => "<ctrl>U"
71 },
72 "_Down" => {
73 callback => sub { $self->follow ('d') },
74 accelerator => "<ctrl>D"
75 },
76 "_Right" => {
77 callback => sub { $self->follow ('r') },
78 accelerator => "<ctrl>R"
79 },
80 "_Left" => {
81 callback => sub { $self->follow ('l') },
82 accelerator => "<ctrl>L"
83 },
84 ]
85 },
86 _Help => {
87 item_type => '<Branch>',
88 children => [
89 _Help => {
90 callback => sub { $::MAINWIN->show_help_window },
91 accelerator => "<ctrl>H"
92 },
93 ]
94 },
57 ]; 95 ];
58 96
59 my $men = 97 my $men =
60 Gtk2::SimpleMenu->new ( 98 Gtk2::SimpleMenu->new (
61 menu_tree => $menu_tree, 99 menu_tree => $menu_tree,
62 default_callback => \&default_cb, 100 default_callback => \&default_cb,
63 ); 101 );
64 102
103 for (
104 [i => 'pick'],
105 [p => 'place'],
106 [e => 'erase'],
107 [s => 'select'],
108 [l => 'eval'],
109 [x => 'connectexit'],
110 [f => 'followexit']
111 )
112 {
113 my $tool = $_->[1];
114 $men->{accel_group}->connect ($Gtk2::Gdk::Keysyms{$_->[0]}, [], 'visible',
115 sub { $::MAINWIN->set_edit_tool ($tool) });
116 }
117
65 $self->add_accel_group ($men->{accel_group}); 118 $self->add_accel_group ($men->{accel_group});
66 119
67 return $men->{widget}; 120 return $men->{widget};
121}
122
123sub ea {
124 my ($self) = @_;
125 $self->{ea_alt} || $::MAINWIN->{sel_editaction};
68} 126}
69 127
70sub INIT_INSTANCE { 128sub INIT_INSTANCE {
71 my ($self) = @_; 129 my ($self) = @_;
72 130
73 $self->set_title ('gce - map editor'); 131 $self->set_title ('gce - map editor');
74 $self->add (my $vb = Gtk2::VBox->new); 132 $self->add (my $vb = Gtk2::VBox->new);
75 133
134 $self->signal_connect (delete_event => sub { $self->delete; 1 });
135
76 $vb->pack_start (my $menu = $self->build_menu, 0, 1, 0); 136 $vb->pack_start (my $menu = $self->build_menu, 0, 1, 0);
77 137
78 $vb->pack_start (my $map = $self->{map} = Crossfire::MapWidget->new, 1, 1, 0); 138 $vb->pack_start (my $map = $self->{map} = Crossfire::MapWidget->new, 1, 1, 0);
79 139
140 $self->signal_connect (focus_in_event => sub {
141 my $ea = $::MAINWIN->{sel_editaction};
142 if ($ea->special_arrow) {
143 $self->{map}->{window}->set_cursor (Gtk2::Gdk::Cursor->new ($ea->special_arrow));
144 } else {
145 $self->{map}->{window}->set_cursor (Gtk2::Gdk::Cursor->new ('GDK_LEFT_PTR'));
146 }
147 delete $self->{ea_alt};
148 });
149
150 $map->signal_connect (key_press_event => sub {
151 my ($map, $event) = @_;
152
153 my $kv = $event->keyval;
154
155 my ($x, $y) = $map->coord ($map->get_pointer);
156 for ([Control_L => sub { $self->{ea_alt} = $::MAINWIN->{edit_collection}{erase} }],
157 [Alt_L => sub { $self->{ea_alt} = $::MAINWIN->{edit_collection}{pick} }],
158 [c => sub { $::MAINWIN->{edit_collection}{select}->copy }],
159 [v => sub { $::MAINWIN->{edit_collection}{select}->paste ($map, $x, $y) }],
160 [n => sub { $::MAINWIN->{edit_collection}{select}->invoke }],
161 )
162 {
163 if ($kv == $Gtk2::Gdk::Keysyms{$_->[0]}) {
164 $_->[1]->();
165 }
166 }
167
168 if ($self->ea->special_arrow) {
169 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ($self->ea->special_arrow));
170 }
171 1;
172 });
173 $map->signal_connect (key_release_event => sub {
174 my ($map, $event) = @_;
175
176 if ($event->keyval == $Gtk2::Gdk::Keysyms{Control_L}
177 or $event->keyval == $Gtk2::Gdk::Keysyms{Alt_L})
178 {
179 delete $self->{ea_alt};
180 }
181
182 if ($self->ea->special_arrow) {
183 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ($self->ea->special_arrow));
184 } else {
185 # XXX: Get the original cursor and insert it here
186 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ('GDK_LEFT_PTR'));
187 }
188 1;
189 });
80 $map->signal_connect (button_press_event => sub { 190 $map->signal_connect (button_press_event => sub {
81 my ($map, $event) = @_; 191 my ($map, $event) = @_;
82 192
83 my ($x, $y) = $map->coord ($event->x, $event->y); 193 my ($x, $y) = $map->coord ($event->x, $event->y);
84 my $as = $map->get ($x, $y); 194 my $as = $map->get ($x, $y);
85 195
86 my $btn = $event->button; 196 if ((not $self->{draw_mode}) and $event->button != 2) {
87 197
88 if ((not $self->{draw_mode}) 198 my $ea = $self->ea;
89 and $btn != 2
90 and my $ea = $::MAINWIN->{sel_editaction}) {
91 199
92 $ea->begin ($map, $x, $y, $btn); 200 $ea->begin ($map, $x, $y, $self)
201 if $x >= 0 and $y >= 0 and $x < $map->{map}{width} and $y < $map->{map}{height};
93 202
94 $self->{draw_mode} = [$ea, $x, $y, $btn]; 203 $self->{draw_mode} = [$x, $y];
95 204
96 $ea->want_cursor 205 $ea->want_cursor
97 or $map->disable_tooltip; 206 or $map->disable_tooltip;
98 207
99 if ($ea->special_arrow) {
100
101 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ($ea->special_arrow));
102 #'GDK_QUESTION_ARROW'));
103 }
104
105 return 1; 208 return 1;
106 } 209 }
107
108 0 210 0
109 }); 211 });
110 212
111 $map->signal_connect_after (motion_notify_event => sub { 213 $map->signal_connect_after (motion_notify_event => sub {
112 my ($map, $event) = @_; 214 my ($map, $event) = @_;
113 215
114 $self->{draw_mode} 216 $self->{draw_mode}
115 or return; 217 or return;
116 218
219 my $ea = $self->ea;
220
117 my ($X, $Y) = @{$self->{draw_mode}}[1,2]; 221 my ($X, $Y) = @{$self->{draw_mode}}[0,1];
118 my ($x, $y) = $map->coord ($map->get_pointer); 222 my ($x, $y) = $map->coord ($map->get_pointer);
119 223
120 while ($x != $X || $y != $Y) { 224 while ($x != $X || $y != $Y) {
121 225
122 $X++ if $X < $x; 226 $X++ if $X < $x;
123 $X-- if $X > $x; 227 $X-- if $X > $x;
124 $Y++ if $Y < $y; 228 $Y++ if $Y < $y;
125 $Y-- if $Y > $y; 229 $Y-- if $Y > $y;
126 230
127 $self->{draw_mode}[0]->edit ($map, $X, $Y, $self->{draw_mode}[3]); 231 $ea->edit ($map, $X, $Y, $self)
232 if $X >= 0 and $Y >= 0 and $X < $map->{map}{width} and $Y < $map->{map}{height};
128 } 233 }
129 234
130 @{$self->{draw_mode}}[1,2] = ($X, $Y); 235 @{$self->{draw_mode}}[0,1] = ($X, $Y);
131 236
132 1 237 1
133 }); 238 });
134 239
135 $map->signal_connect (button_release_event => sub { 240 $map->signal_connect (button_release_event => sub {
136 my ($map, $event) = @_; 241 my ($map, $event) = @_;
137 242
138 if ($self->{draw_mode} 243 if ($self->{draw_mode}) {
139 and my $ea = $self->{draw_mode}[0]
140 and $self->{draw_mode}[3] == $event->button) {
141
142 my ($x, $y) = $map->coord ($map->get_pointer); 244 my ($x, $y) = $map->coord ($map->get_pointer);
143 245
246 my $ea = $self->ea;
144 $ea->end ($map, $x, $y, $event->button); 247 $ea->end ($map, $x, $y, $self);
145
146 if ($ea->special_arrow) {
147
148 # XXX: Get the original cursor and insert it here
149 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ('GDK_LEFT_PTR'));
150 }
151 248
152 delete $self->{draw_mode}; 249 delete $self->{draw_mode};
153 250
154 $ea->want_cursor 251 $ea->want_cursor
155 or $map->enable_tooltip; 252 or $map->enable_tooltip;
… …
159 256
160 0 257 0
161 }); 258 });
162} 259}
163 260
261# FIXME: Fix the automatic update of the attribute editor! and also the stack view!
164sub undo { 262sub undo {
165 my ($self) = @_; 263 my ($self) = @_;
166 264
167 my $map = $self->{map}; # the Crossfire::MapWidget 265 my $map = $self->{map}; # the Crossfire::MapWidget
168 266
… …
175sub redo { 273sub redo {
176 my ($self) = @_; 274 my ($self) = @_;
177 275
178 my $map = $self->{map}; # the Crossfire::MapWidget 276 my $map = $self->{map}; # the Crossfire::MapWidget
179 277
278 $map->{undo_stack}
180 $map->{undo_stack_pos} < @{$map->{undo_stack}} 279 and $map->{undo_stack_pos} < @{$map->{undo_stack}}
280 or return;
281
282 $map->change_swap ($map->{undo_stack}[$map->{undo_stack_pos}++]);
283}
284
285sub delete {
286 my ($self) = @_;
287
288 # check and modla dialog if "dirty"
289
290 if ($self->{mapkey}) {
291 # XXX: This should be in a delete event handler in the MainWindow.pm... but it doesnt work
292 delete $::MAINWIN->{loaded_maps}->{$self->{mapkey}};
293 }
294
295 $self->destroy;
296}
297
298sub open_map {
299 my ($self, $path, $key) = @_;
300
301 $self->{mapkey} = $key;
302
303 if (ref $path) {
304 $self->{map}->set_map ($path);
305
306 } else {
307 $self->{path} = $path;
308# print "OPENMAP $path\n";
309 $self->{map}->set_map (my $m = new_from_file Crossfire::Map $path);
310 require Data::Dumper;
311# print "FOO:" .Data::Dumper::Dumper ($m) . "\n";
312 }
313}
314
315sub save_map {
316 my ($self) = @_;
317
318 if ($self->{path}) {
319 $self->{map}{map}->write_file ($self->{path});
320 quick_msg ($self, "saved to $self->{path}");
321 } else {
322 $self->save_map_as;
323 }
324}
325
326sub save_map_as {
327 my ($self) = @_;
328
329 my $fc = $::MAINWIN->new_filechooser ('gce - save map', 1, $self->{path});
330
331 if ('ok' eq $fc->run) {
332
333 $::MAINWIN->{fc_last_folder} = $fc->get_current_folder;
334 $::MAINWIN->{fc_last_folders}->{$self->{fc_last_folder}}++;
335
336 $self->{map}{map}->write_file ($self->{path} = $fc->get_filename);
337 quick_msg ($self, "saved to $self->{path}");
338 }
339
340 $fc->destroy;
341}
342
343sub _add_prop_entry {
344 my ($self, $table, $idx, $key, $desc, $type, $changecb) = @_;
345
346 my $edwid;
347
348 if ($type eq 'string') {
349 $table->attach_defaults (my $lbl = Gtk2::Label->new ($desc), 0, 1, $idx, $idx + 1);
350 $edwid = Gtk2::Entry->new;
351 $edwid->set_text ($self->{map}{map}{info}{$key});
352 $edwid->signal_connect (changed => sub {
353 $self->{map}{map}{info}{$key} = $_[0]->get_text;
354 if ($changecb) {
355 $changecb->($_[0]->get_text);
356 }
357 });
358 $table->attach_defaults ($edwid, 1, 2, $idx, $idx + 1);
359
360 } elsif ($type eq 'button') {
361 $table->attach_defaults (my $b = Gtk2::Button->new_with_label ($desc), 0, 2, $idx, $idx + 1);
362 $b->signal_connect (clicked => ($changecb || sub {}));
363
364 } elsif ($type eq 'label') {
365 $table->attach_defaults (my $lbl = Gtk2::Label->new ($desc), 0, 1, $idx, $idx + 1);
366 $edwid = Gtk2::Label->new ($self->{map}{map}{info}{$key});
367 $table->attach_defaults ($edwid, 1, 2, $idx, $idx + 1);
368
369 } elsif ($type eq 'check') {
370 $table->attach_defaults (my $lbl1 = Gtk2::Label->new ($desc), 0, 1, $idx, $idx + 1);
371 $table->attach_defaults (my $lbl = Gtk2::CheckButton->new, 1, 2, $idx, $idx + 1);
372 $lbl->set_active ($self->{map}{map}{info}{$key});
373 $lbl->signal_connect (toggled => sub {
374 my ($lbl) = @_;
375 $self->{map}{map}{info}{$key} = $lbl->get_active * 1;
376 ($changecb || sub {})->($lbl->get_active);
377 });
378
379 } elsif ($type eq 'sep') {
380 $table->attach_defaults (my $lbl1 = Gtk2::HSeparator->new, 0, 2, $idx, $idx + 1);
381 } else {
382 $edwid = Gtk2::Label->new ("FOO");
383 }
384}
385
386sub open_resize_map {
387 my ($self) = @_;
388
389 my $w = Gtk2::Window->new ('toplevel');
390 $w->set_default_size (250, 150);
391 $w->add (my $sw = Gtk2::ScrolledWindow->new);
392 $sw->add_with_viewport (my $v = Gtk2::VBox->new);
393 $sw->set_policy ('automatic', 'automatic');
394 $v->pack_start (my $t = Gtk2::Table->new (2, 10), 0, 0, 0);
395
396 my $i = 0;
397 for (
398 [qw/width Width string/],
399 [qw/height Height string/],
400 [qw/save Save button/,
401 sub {
402 $self->{map}{map}->resize ($self->{map}{map}{info}{width}, $self->{map}{map}{info}{height});
403 $self->{map}->invalidate_all;
404 $w->destroy;
405 }
406 ],
407 )
408 {
409 $self->_add_prop_entry ($t, $i++, @$_);
410 }
411
412 $w->show_all;
413}
414
415sub follow {
416 my ($self, $dir) = @_;
417
418 my %dir_to_path = (
419 u => 'tile_path_1',
420 d => 'tile_path_3',
421 r => 'tile_path_2',
422 l => 'tile_path_4',
423 );
424
425 defined $dir_to_path{$dir}
181 or return; 426 or return;
182 427 my $map = $self->{map}{map}{info}{$dir_to_path{$dir}}
183 $map->change_swap ($map->{undo_stack}[$map->{undo_stack_pos}++]);
184}
185
186sub delete_arch {
187 my ($self, $x, $y) = @_;
188
189 defined $self->{map}
190 or return 0; 428 or return;
191 429
192 my $as = $self->{map}->get ($x, $y); 430 $map = map2abs ($map, $self);
193 pop @$as; 431 $::MAINWIN->open_map_editor ($map);
194 $self->{map}->set ($x, $y, $as);
195} 432}
196 433
197sub place_pick {
198 my ($self, $x, $y) = @_;
199
200 my $pick = $::MAINWIN->get_pick;
201 my $as = $self->{map}->get ($x, $y);
202
203 my $arch = { _name => $pick->{_name} };
204
205 push @$as, $arch
206 unless @$as && $as->[-1]->{_name} eq $arch->{_name};
207
208 $self->{map}->set ($x, $y, $as);
209}
210
211sub open_map { 434sub open_map_prop {
212 my ($self, $path) = @_; 435 my ($self) = @_;
213 436
214 $self->{map}->set_map (new_from_file Crossfire::Map $path); 437
438 my $w = Gtk2::Window->new ('toplevel');
439 $w->set_default_size (500, 500);
440 $w->add (my $sw = Gtk2::ScrolledWindow->new);
441 $sw->add_with_viewport (my $v = Gtk2::VBox->new);
442 $sw->set_policy ('automatic', 'automatic');
443 $v->pack_start (my $t = Gtk2::Table->new (2, 10), 0, 0, 0);
444
445 my $i = 0;
446 for (
447 [qw/name Name string/],
448 [qw/region Region string/],
449 [qw/enter_x Enter-x string/],
450 [qw/enter_y Enter-y string/],
451 [qw/reset_timeout Reset-timeout string/],
452 [qw/swap_time Swap-timeout string/],
453 [qw/x x sep/],
454 [qw/difficulty Difficulty string/],
455 [qw/windspeed Windspeed string/],
456 [qw/pressure Pressure string/],
457 [qw/humid Humid string/],
458 [qw/temp Temp string/],
459 [qw/darkness Darkness string/],
460 [qw/sky Sky string/],
461 [qw/winddir Winddir string/],
462 [qw/x x sep/],
463 [qw/width Width label/], # sub { $self->{map}{map}->resize ($_[0], $self->{map}{map}{height}) }],
464 [qw/height Height label/], # sub { $self->{map}{map}->resize ($self->{map}{map}{width}, $_[0]) }],
465 [qw/x x sep/],
466 [qw/msg Text text/],
467 [qw/maplore Maplore text/],
468 [qw/outdoor Outdoor check/],
469 [qw/unique Unique check/],
470 [qw/fixed_resettime Fixed-resettime check/],
471 [qw/x x sep/],
472 [qw/tile_path_1 Northpath string/],
473 [qw/tile_path_2 Eastpath string/],
474 [qw/tile_path_3 Southpath string/],
475 [qw/tile_path_4 Westpath string/],
476 [qw/tile_path_5 Toppath string/],
477 [qw/tile_path_6 Bottompath string/],
478 )
479 {
480 $self->_add_prop_entry ($t, $i++, @$_);
481 }
482
483 $w->show_all;
215} 484}
216 485
217=head1 AUTHOR 486=head1 AUTHOR
218 487
219 Marc Lehmann <schmorp@schmorp.de> 488 Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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