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.29 by elmex, Mon Mar 20 04:11:41 2006 UTC vs.
Revision 1.55 by elmex, Thu Jun 7 15:28:21 2007 UTC

14use Crossfire::Map; 14use Crossfire::Map;
15use Crossfire::MapWidget; 15use Crossfire::MapWidget;
16 16
17use GCE::AttrEdit; 17use GCE::AttrEdit;
18use GCE::Util; 18use GCE::Util;
19use GCE::HashDialog;
20
21use POSIX qw/strftime/;
19 22
20use Glib::Object::Subclass 23use Glib::Object::Subclass
21 Gtk2::Window; 24 Gtk2::Window;
22 25
26use Storable qw/dclone/;
27
23use strict; 28use strict;
29
30#################################################################
31###### WINDOW MANAGEMENT ########################################
32#################################################################
33
34sub save_layout {
35 my ($self) = @_;
36
37 $self->{attach_editor}->save_layout if $self->{attach_editor};
38 $self->{map_properties}->save_layout if $self->{map_properties};
39 $self->{meta_info_win}->save_layout if $self->{meta_info_win};
40
41 $main::CFG->{map_info} = main::get_pos_and_size ($self->{map_info})
42 if $self->{map_info};
43}
44
45sub close_windows {
46 my ($self) = @_;
47
48 $self->{attach_editor}->destroy if $self->{attach_editor};
49 $self->{map_properties}->destroy if $self->{map_properties};
50 $self->{meta_info_win}->destroy if $self->{meta_info_win};
51}
52
53#################################################################
54###### MENU MANAGEMENT ##########################################
55#################################################################
56
57sub do_context_menu {
58 my ($self, $map, $event) = @_;
59
60 my ($x, $y) = $map->coord ($event->x, $event->y);
61
62 my $menu = Gtk2::Menu->new;
63 foreach my $cm (
64 [
65 Follow => sub {
66 $::MAINWIN->{edit_collection}{followexit}->edit ($map, $x, $y, $self)
67 },
68 ]
69 ) {
70 my $item = Gtk2::MenuItem->new ($cm->[0]);
71 $menu->append ($item);
72 $item->show;
73 $item->signal_connect (activate => $cm->[1]);
74 }
75
76 $menu->append (my $sep = new Gtk2::SeparatorMenuItem);
77 $sep->show;
78
79 for my $sr (reverse $self->get_stack_refs ($map, $x, $y)) {
80 my $item = Gtk2::MenuItem->new ($sr->longname);
81 $menu->append ($item);
82 $item->set_submenu (my $smenu = new Gtk2::Menu);
83
84 for my $act (
85 [ 'Add inventory' => sub { $_[0]->add_inv ($::MAINWIN->get_pick) } ],
86 [ 'Find in picker' => sub { $::MAINWIN->open_pick_window ({ selection => $sr->picker_folder }) } ],
87 ) {
88 my $sitem = Gtk2::MenuItem->new ($act->[0]);
89 $smenu->append ($sitem);
90 $sitem->signal_connect (activate => sub { $act->[1]->($sr) });
91 $sitem->show;
92 }
93
94 $item->show;
95 }
96
97 $menu->popup (undef, undef, undef, undef, $event->button, $event->time);
98}
24 99
25sub build_menu { 100sub build_menu {
26 my ($self) = @_; 101 my ($self) = @_;
27 102
28 my $menu_tree = [ 103 my $menu_tree = [
34 accelerator => '<ctrl>S' 109 accelerator => '<ctrl>S'
35 }, 110 },
36 "Save As" => { 111 "Save As" => {
37 callback => sub { $self->save_map_as }, 112 callback => sub { $self->save_map_as },
38 }, 113 },
114 "Map _Info" => {
115 callback => sub { $self->open_map_info },
116 accelerator => "<ctrl>I",
117 },
118 "Map _Properties" => {
119 callback => sub { $self->open_map_prop },
120 accelerator => "<ctrl>P"
121 },
122 "Map _Attachments" => {
123 callback => sub { $self->open_attach_edit },
124 accelerator => "<ctrl>A"
125 },
126 "Map Meta _Info" => {
127 callback => sub { $self->open_meta_info },
128 },
129 Upload => {
130 item_type => '<Branch>',
131 children => [
132 "Upload for testing" => {
133 callback => sub { $self->upload_map_test },
134 },
135 "Upload for inclusion" => {
136 callback => sub { $self->upload_map_incl },
137 },
138 ]
139 },
140 "_Map Resize" => {
141 callback => sub { $self->open_resize_map },
142 },
39 "Close" => { 143 "Close" => {
40 callback => sub { $self->delete; 1 }, 144 callback => sub { $self->destroy },
41 }, 145 },
42 ] 146 ]
43 }, 147 },
44 _Edit => { 148 _Edit => {
45 item_type => '<Branch>', 149 item_type => '<Branch>',
50 }, 154 },
51 "_Redo" => { 155 "_Redo" => {
52 callback => sub { $self->redo }, 156 callback => sub { $self->redo },
53 accelerator => "<ctrl>Y" 157 accelerator => "<ctrl>Y"
54 }, 158 },
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 },
63 ] 159 ]
64 }, 160 },
65 _Go => { 161 _Go => {
66 item_type => '<Branch>', 162 item_type => '<Branch>',
67 children => [ 163 children => [
68 "_Up" => { 164 "_Up" => {
69 callback => sub { $self->follow ('u') }, 165 callback => sub { $self->follow ('u') },
70 accelerator => "<ctrl>U" 166 accelerator => "<ctrl>Up"
71 }, 167 },
72 "_Down" => { 168 "_Down" => {
73 callback => sub { $self->follow ('d') }, 169 callback => sub { $self->follow ('d') },
74 accelerator => "<ctrl>D" 170 accelerator => "<ctrl>Down"
75 }, 171 },
76 "_Right" => { 172 "_Right" => {
77 callback => sub { $self->follow ('r') }, 173 callback => sub { $self->follow ('r') },
78 accelerator => "<ctrl>R" 174 accelerator => "<ctrl>Right"
79 }, 175 },
80 "_Left" => { 176 "_Left" => {
81 callback => sub { $self->follow ('l') }, 177 callback => sub { $self->follow ('l') },
82 accelerator => "<ctrl>L" 178 accelerator => "<ctrl>Left"
83 }, 179 },
84 ] 180 ]
85 }, 181 },
86 _Help => { 182 _Help => {
87 item_type => '<Branch>', 183 item_type => '<Branch>',
88 children => [ 184 children => [
89 _Help => { 185 _Manual => {
90 callback => sub { $::MAINWIN->show_help_window }, 186 callback => sub { $::MAINWIN->show_help_window },
91 accelerator => "<ctrl>H" 187 accelerator => "<ctrl>H"
92 }, 188 },
93 ] 189 ]
94 }, 190 },
104 [i => 'pick'], 200 [i => 'pick'],
105 [p => 'place'], 201 [p => 'place'],
106 [e => 'erase'], 202 [e => 'erase'],
107 [s => 'select'], 203 [s => 'select'],
108 [l => 'eval'], 204 [l => 'eval'],
109 [x => 'connectexit'], 205 [t => 'connect'],
110 [f => 'followexit'] 206 [f => 'followexit']
111 ) 207 )
112 { 208 {
113 my $tool = $_->[1]; 209 my $tool = $_->[1];
114 $men->{accel_group}->connect ($Gtk2::Gdk::Keysyms{$_->[0]}, [], 'visible', 210 $men->{accel_group}->connect ($Gtk2::Gdk::Keysyms{$_->[0]}, [], 'visible',
115 sub { $::MAINWIN->set_edit_tool ($tool) }); 211 sub { $::MAINWIN->set_edit_tool ($tool) });
116 } 212 }
117 213
214 $men->{accel_group}->connect ($Gtk2::Gdk::Keysyms{'r'}, ['control-mask'], 'visible',
215 sub { $self->redo });
216
118 $self->add_accel_group ($men->{accel_group}); 217 $self->add_accel_group ($men->{accel_group});
119 218
120 return $men->{widget}; 219 return $men->{widget};
121} 220}
122 221
222#################################################################
223###### EDIT TOOL STUFF ##########################################
224#################################################################
225
226sub set_edit_tool {
227 my ($self, $tool) = @_;
228
229 $self->{etool} = $tool;
230
231 if ($self->ea->special_arrow) {
232 $self->{map}{window}->set_cursor (Gtk2::Gdk::Cursor->new ($self->ea->special_arrow));
233 } else {
234 # FIXME: Get the original cursor and insert it here
235 $self->{map}{window}->set_cursor (Gtk2::Gdk::Cursor->new ('GDK_LEFT_PTR'));
236 }
237}
238
123sub ea { 239sub ea {
124 my ($self) = @_; 240 my ($self) = @_;
125 $self->{ea_alt} || $::MAINWIN->{sel_editaction}; 241 $self->{ea_alt} || $self->{etool};
126} 242}
243
244sub start_drawmode {
245 my ($self, $map) = @_;
246
247 $self->{draw_mode} and return;
248
249 # XXX: is this okay? my ($x, $y) = $map->coord ($event->x, $event->y);
250 my ($x, $y) = $map->coord ($map->get_pointer);
251
252 my $ea = $self->ea;
253
254 $ea->begin ($map, $x, $y, $self);
255
256 $ea->edit ($map, $x, $y, $self)
257 if $x >= 0 and $y >= 0 and $x < $map->{map}{width} and $y < $map->{map}{height};
258
259 $self->{draw_mode} = [$x, $y];
260}
261
262sub stop_drawmode {
263 my ($self, $map) = @_;
264
265 $self->{draw_mode} or return;
266
267 my ($x, $y) = $map->coord ($map->get_pointer);
268
269 my $ea = $self->ea;
270 $ea->end ($map, $x, $y, $self);
271
272 delete $self->{draw_mode};
273}
274
275#################################################################
276###### UTILITY FUNCTIONS ########################################
277#################################################################
278
279sub follow {
280 my ($self, $dir) = @_;
281
282 my %dir_to_path = (
283 u => 'tile_path_1',
284 d => 'tile_path_3',
285 r => 'tile_path_2',
286 l => 'tile_path_4',
287 );
288
289 defined $dir_to_path{$dir}
290 or return;
291 my $map = $self->{map}{map}{info}{$dir_to_path{$dir}}
292 or return;
293
294 $map = map2abs ($map, $self);
295 $::MAINWIN->open_map_editor ($map);
296}
297
298# FIXME: Fix the automatic update of the attribute editor! and also the stack view!
299sub undo {
300 my ($self) = @_;
301
302 my $map = $self->{map}; # the Crossfire::MapWidget
303
304 $map->{undo_stack_pos}
305 or return;
306
307 $map->change_swap ($map->{undo_stack}[--$map->{undo_stack_pos}]);
308}
309
310sub get_stack_refs {
311 my ($self, $map, $x, $y) = @_;
312
313 my $cstack = $map->get ($x, $y);
314
315 return [] unless @$cstack;
316
317 my @refs;
318
319 for my $arch (@$cstack) {
320 my ($ox, $oy) = ($x, $y);
321 if ($arch->{_virtual}) {
322 $ox = $arch->{virtual_x};
323 $oy = $arch->{virtual_y};
324 $arch = $arch->{_virtual};
325 $cstack = $map->get ($ox, $oy);
326 # XXX: This heavily blows up if $arch isn't on $cstack now.. and it actually really does :(
327 }
328
329 push @refs,
330 GCE::ArchRef->new (
331 arch => $arch,
332 cb => sub {
333 $map->change_begin ('attredit');
334 $map->change_stack ($ox, $oy, $cstack);
335
336 if (my $changeset = $map->change_end) {
337 splice @{ $map->{undo_stack} ||= [] },
338 $map->{undo_stack_pos}++, 1e6,
339 $changeset;
340 }
341 }
342 );
343 }
344
345 return @refs;
346}
347
348sub redo {
349 my ($self) = @_;
350
351 my $map = $self->{map}; # the Crossfire::MapWidget
352
353 $map->{undo_stack}
354 and $map->{undo_stack_pos} < @{$map->{undo_stack}}
355 or return;
356
357 $map->change_swap ($map->{undo_stack}[$map->{undo_stack_pos}++]);
358}
359
360sub load_meta_info {
361 my ($mapfile) = @_;
362 if (-e "$mapfile.meta") {
363 open my $metafh, "<", "$mapfile.meta"
364 or warn "Couldn't open meta file $mapfile.meta: $!";
365 my $metadata = do { local $/; <$metafh> };
366 return Crossfire::from_json ($metadata);
367 }
368}
369
370sub save_meta_info {
371 my ($mapfile, $metainfo) = @_;
372 open my $metafh, ">", "$mapfile.meta"
373 or warn "Couldn't write meta file $mapfile.meta: $!";
374 print $metafh Crossfire::to_json ($metainfo);
375}
376
377sub open_map {
378 my ($self, $path, $key) = @_;
379
380 $self->{mapkey} = $key;
381
382 if (ref $path) {
383 $self->{map}->set_map ($path);
384 delete $self->{meta_info};
385 $self->set_title ('<ram>');
386
387 } else {
388 my $ok = 0;
389 if (-e $path && -f $path) {
390 $ok = 1;
391 } else {
392 unless ($path =~ m/\.map$/) { # yuck
393 my $p = $path . '.map';
394 if ($ok = -e $p && -f $p) {
395 $path = $p;
396 }
397 }
398 }
399 unless ($ok) {
400 die "Couldn't open '$path' or find '$path.map': No such file or it is not a file.\n";
401 }
402 $self->{path} = $path;
403 $self->{map}->set_map (my $m = new_from_file Crossfire::Map $path);
404 $self->{meta_info} = load_meta_info ($path);
405 $self->set_title ("gce - map editor - $self->{path}");
406 }
407 $self->close_windows;
408}
409
410sub save_map {
411 my ($self) = @_;
412
413 if ($self->{path}) {
414 $self->{map}{map}->write_file ($self->{path});
415 if ($self->{meta_info}) {
416 save_meta_info ($self->{path}, $self->{meta_info});
417 }
418 quick_msg ($self, "saved to $self->{path}");
419 $self->set_title ("gce - map editor - $self->{path}");
420 } else {
421 $self->save_map_as;
422 }
423}
424
425sub save_map_as {
426 my ($self) = @_;
427
428 my $fc = $::MAINWIN->new_filechooser ('gce - save map', 1, $self->{path});
429
430 if ('ok' eq $fc->run) {
431
432 $::MAINWIN->{fc_last_folder} = $fc->get_current_folder;
433 $::MAINWIN->{fc_last_folders}->{$self->{fc_last_folder}}++;
434
435 $self->{map}{map}->write_file ($self->{path} = $fc->get_filename);
436 if ($self->{meta_info}) {
437 save_meta_info ($self->{path}, $self->{meta_info});
438 }
439 quick_msg ($self, "saved to $self->{path}");
440 $self->set_title ("gce - map editor - $self->{path}");
441 }
442
443 $fc->destroy;
444}
445
446#################################################################
447###### DIALOGOUES ###############################################
448#################################################################
449
450sub open_resize_map {
451 my ($self) = @_;
452
453 return if $self->{meta_info_win};
454
455 my $w = $self->{meta_info_win} = GCE::HashDialogue->new ();
456
457 $w->init (
458 dialog_default_size => [500, 200, 220, 20],
459 layout_name => 'resize_win',
460 title => 'resize map',
461 ref_hash => $self->{map}{map}{info},
462 dialog => [
463 [width => 'Width' => 'string'],
464 [height => 'Height' => 'string'],
465 ],
466 close_on_save => 1,
467 save_cb => sub {
468 my ($info) = @_;
469 $self->{map}{map}->resize ($info->{width}, $info->{height});
470 $self->{map}->invalidate_all;
471 }
472 );
473
474 $w->signal_connect (destroy => sub { delete $self->{meta_info_win} });
475
476 $w->show_all;
477}
478
479sub open_attach_edit {
480 my ($self) = @_;
481
482 my $w = GCE::AttachEditor->new;
483 $w->set_attachment (
484 $self->{map}{map}{info}{attach},
485 sub {
486 if (@{$_[0]}) {
487 $self->{map}{map}{info}{attach} = $_[0]
488 } else {
489 delete $self->{map}{map}{info}{attach};
490 }
491 }
492 );
493 $self->{attach_editor} = $w;
494 $w->signal_connect (destroy => sub { delete $self->{attach_editor} });
495 $w->show_all;
496}
497
498sub upload_map_incl {
499 my ($self) = @_;
500
501 my $meta = dclone $self->{meta_info};
502
503 my $w = $self->{meta_info_win} = GCE::HashDialogue->new ();
504
505 $w->init (
506 dialog_default_size => [500, 300, 220, 20],
507 layout_name => 'map_upload_incl',
508 title => 'gce - map inclusion upload',
509 ref_hash => $meta,
510 text_entry => { key => 'changes', label => 'Changes (required for inclusion):' },
511 dialog => [
512 [gameserver => 'Game server' => 'label'],
513 [testserver => 'Test server' => 'label'],
514 [undef => x => 'sep' ],
515 [cf_login => 'Server login name' => 'string'],
516 [cf_password=> 'Password' => 'password'],
517 [path => 'Map path' => 'string'],
518 ],
519 close_on_save => 1,
520 save_cb => sub {
521 my ($meta) = @_;
522 warn "UPLOAD[".Crossfire::to_json ($meta)."]\n";
523 }
524 );
525
526 $w->signal_connect (destroy => sub { delete $self->{meta_info_win} });
527
528 $w->show_all;
529}
530
531sub upload_map_test {
532 my ($self) = @_;
533
534 my $meta = dclone $self->{meta_info};
535
536 my $w = $self->{meta_info_win} = GCE::HashDialogue->new ();
537
538 $w->init (
539 dialog_default_size => [500, 300, 220, 20],
540 layout_name => 'map_upload_test',
541 title => 'gce - map test upload',
542 ref_hash => $meta,
543 dialog => [
544 [gameserver => 'Game server' => 'string'],
545 [testserver => 'Test server' => 'string'],
546 [undef => x => 'sep' ],
547 [cf_login => 'Server login name' => 'string'],
548 [cf_password=> 'Password' => 'password'],
549 [path => 'Map path' => 'string'],
550 ],
551 save_cb => sub {
552 my ($meta) = @_;
553 warn "UPLOAD[".Crossfire::to_json ($meta)."]\n";
554 }
555 );
556
557 $w->signal_connect (destroy => sub { delete $self->{meta_info_win} });
558
559 $w->show_all;
560
561
562}
563
564sub open_meta_info {
565 my ($self) = @_;
566
567 return if $self->{meta_info_win};
568
569 my $w = $self->{meta_info_win} = GCE::HashDialogue->new ();
570
571 $w->init (
572 dialog_default_size => [500, 300, 220, 20],
573 layout_name => 'meta_info_win',
574 title => 'meta info',
575 ref_hash => $self->{meta_info},
576 dialog => [
577 [path => 'Map path' => 'string'],
578 [cf_login => 'Login name' => 'string'],
579 [revision => 'CVS Revision' => 'label'],
580 [cvs_root => 'CVS Root' => 'label'],
581 [lib_root => 'LIB Root' => 'label'],
582 [testserver => 'Test server' => 'label'],
583 [gameserver => 'Game server' => 'label'],
584 ],
585 );
586
587 $w->signal_connect (destroy => sub { delete $self->{meta_info_win} });
588
589 $w->show_all;
590}
591
592sub open_map_info {
593 my ($self) = @_;
594 return if $self->{map_info};
595
596 my $w = $self->{map_info} = Gtk2::Window->new ('toplevel');
597 $w->set_title ("gcrossedit - map info");
598
599 $w->add (my $vb = Gtk2::VBox->new);
600 $vb->add (my $sw = Gtk2::ScrolledWindow->new);
601 $sw->set_policy ('automatic', 'automatic');
602 $sw->add (my $txt = Gtk2::TextView->new);
603 $vb->pack_start (my $hb = Gtk2::HBox->new (1, 1), 0, 1, 0);
604 $hb->pack_start (my $svbtn = Gtk2::Button->new ("save"), 1, 1, 0);
605 $hb->pack_start (my $logbtn = Gtk2::Button->new ("add log"), 1, 1, 0);
606 $hb->pack_start (my $closebtn = Gtk2::Button->new ("close"), 1, 1, 0);
607
608 my $buf = $txt->get_buffer ();
609 $buf->set_text ($self->{map}{map}{info}{msg});
610
611 $svbtn->signal_connect (clicked => sub {
612 my $buf = $txt->get_buffer ();
613 my $txt = $buf->get_text ($buf->get_start_iter, $buf->get_end_iter, 0);
614 $self->{map}{map}{info}{msg} = $txt;
615 });
616
617 $logbtn->signal_connect (clicked => sub {
618 my $buf = $txt->get_buffer ();
619 $buf->insert ($buf->get_start_iter, "- " . strftime ("%F %T %Z", localtime (time)) . " by " . ($main::CFG->{username} || $ENV{USER}) . ":\n");
620 $txt->set_buffer ($buf);
621 });
622
623 $closebtn->signal_connect (clicked => sub {
624 $w->destroy;
625 });
626
627 ::set_pos_and_size ($w, $main::CFG->{map_info}, 400, 400, 220, 20);
628 $w->signal_connect (destroy => sub {
629 delete $self->{map_info};
630 });
631 $w->show_all;
632}
633
634sub open_map_prop {
635 my ($self) = @_;
636
637 return if $self->{map_properties};
638
639 my $w = $self->{map_properties} = GCE::HashDialogue->new ();
640
641 $w->init (
642 dialog_default_size => [500, 500, 220, 20],
643 layout_name => 'map_prop_win',
644 title => 'map properties',
645 ref_hash => $self->{map}{map}{info},
646 close_on_save => 1,
647 dialog => [
648 [qw/name Name string/],
649 [qw/region Region string/],
650 [qw/enter_x Enter-x string/],
651 [qw/enter_y Enter-y string/],
652 [qw/reset_timeout Reset-timeout string/],
653 [qw/swap_time Swap-timeout string/],
654 [undef, qw/x sep/],
655 [qw/difficulty Difficulty string/],
656 [qw/windspeed Windspeed string/],
657 [qw/pressure Pressure string/],
658 [qw/humid Humid string/],
659 [qw/temp Temp string/],
660 [qw/darkness Darkness string/],
661 [qw/sky Sky string/],
662 [qw/winddir Winddir string/],
663 [undef, qw/x sep/],
664 [qw/width Width label/], # sub { $self->{map}{map}->resize ($_[0], $self->{map}{map}{height}) }],
665 [qw/height Height label/], # sub { $self->{map}{map}->resize ($self->{map}{map}{width}, $_[0]) }],
666 [undef, qw/x sep/],
667 # [qw/msg Text text/],
668# [qw/maplore Maplore text/],
669 [qw/outdoor Outdoor check/],
670 [qw/unique Unique check/],
671 [qw/fixed_resettime Fixed-resettime check/],
672 [per_player => 'Per player' => 'check'],
673 [per_party => 'Per party' => 'check'],
674 [no_reset => 'No reset' => 'check'],
675 [undef, qw/x sep/],
676 [qw/tile_path_1 Northpath string/],
677 [qw/tile_path_2 Eastpath string/],
678 [qw/tile_path_3 Southpath string/],
679 [qw/tile_path_4 Westpath string/],
680 [qw/tile_path_5 Toppath string/],
681 [qw/tile_path_6 Bottompath string/],
682 [undef, qw/x sep/],
683 [undef, 'For shop description look in the manual',
684 'button', sub { $::MAINWIN->show_help_window }],
685 [qw/shopmin Shopmin string/],
686 [qw/shopmax Shopmax string/],
687 [qw/shoprace Shoprace string/],
688 [qw/shopgreed Shopgreed string/],
689 [qw/shopitems Shopitems string/],
690 ]
691 );
692
693 $w->signal_connect (destroy => sub { delete $self->{map_properties} });
694 $w->show_all;
695}
696
697#################################################################
698###### MAP EDITOR INIT ##########################################
699#################################################################
127 700
128sub INIT_INSTANCE { 701sub INIT_INSTANCE {
129 my ($self) = @_; 702 my ($self) = @_;
130 703
131 $self->set_title ('gce - map editor'); 704 $self->set_title ('gce - map editor');
132 $self->add (my $vb = Gtk2::VBox->new); 705 $self->add (my $vb = Gtk2::VBox->new);
133 706
134 $self->signal_connect (delete_event => sub { $self->delete; 1 });
135
136 $vb->pack_start (my $menu = $self->build_menu, 0, 1, 0); 707 $vb->pack_start (my $menu = $self->build_menu, 0, 1, 0);
137 708
138 $vb->pack_start (my $map = $self->{map} = Crossfire::MapWidget->new, 1, 1, 0); 709 $vb->pack_start (my $map = $self->{map} = Crossfire::MapWidget->new, 1, 1, 0);
139 710
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 { 711 $map->signal_connect_after (key_press_event => sub {
151 my ($map, $event) = @_; 712 my ($map, $event) = @_;
152 713
153 my $kv = $event->keyval; 714 my $kv = $event->keyval;
715
716 my $ret = 0;
154 717
155 my ($x, $y) = $map->coord ($map->get_pointer); 718 my ($x, $y) = $map->coord ($map->get_pointer);
156 for ([Control_L => sub { $self->{ea_alt} = $::MAINWIN->{edit_collection}{erase} }], 719 for ([Control_L => sub { $self->{ea_alt} = $::MAINWIN->{edit_collection}{erase} }],
157 [Alt_L => sub { $self->{ea_alt} = $::MAINWIN->{edit_collection}{pick} }], 720 [Alt_L => sub { $self->{ea_alt} = $::MAINWIN->{edit_collection}{pick} }],
158 [c => sub { $::MAINWIN->{edit_collection}{select}->copy }], 721 [c => sub { $::MAINWIN->{edit_collection}{select}->copy }],
159 [v => sub { $::MAINWIN->{edit_collection}{select}->paste ($map, $x, $y) }], 722 [v => sub { $::MAINWIN->{edit_collection}{select}->paste ($map, $x, $y) }],
160 [n => sub { $::MAINWIN->{edit_collection}{select}->invoke }], 723 [n => sub { $::MAINWIN->{edit_collection}{select}->invoke }],
161 ) 724 )
162 { 725 {
726 my $ed = $_;
727
163 if ($kv == $Gtk2::Gdk::Keysyms{$_->[0]}) { 728 if ($kv == $Gtk2::Gdk::Keysyms{$ed->[0]}) {
729 my $was_in_draw = defined $self->{draw_mode};
730
731 $self->stop_drawmode ($map)
732 if $was_in_draw && grep { $ed->[0] eq $_ } qw/Control_L Alt_L/;
733
164 $_->[1]->(); 734 $ed->[1]->();
735 $ret = 1;
736
737 $self->start_drawmode ($map)
738 if $was_in_draw && grep { $ed->[0] eq $_ } qw/Control_L Alt_L/;
165 } 739 }
166 } 740 }
167 741
168 if ($self->ea->special_arrow) { 742 if ($self->ea->special_arrow) {
169 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ($self->ea->special_arrow)); 743 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ($self->ea->special_arrow));
170 } 744 } else {
745 # FIXME: Get the original cursor and insert it here
746 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ('GDK_LEFT_PTR'));
171 1; 747 }
748
749 $ret
172 }); 750 });
751
173 $map->signal_connect (key_release_event => sub { 752 $map->signal_connect_after (key_release_event => sub {
174 my ($map, $event) = @_; 753 my ($map, $event) = @_;
754
755 my $ret = 0;
175 756
176 if ($event->keyval == $Gtk2::Gdk::Keysyms{Control_L} 757 if ($event->keyval == $Gtk2::Gdk::Keysyms{Control_L}
177 or $event->keyval == $Gtk2::Gdk::Keysyms{Alt_L}) 758 or $event->keyval == $Gtk2::Gdk::Keysyms{Alt_L})
178 { 759 {
760 my $was_in_draw = defined $self->{draw_mode};
761
762 $self->stop_drawmode ($map)
763 if $was_in_draw;
764
179 delete $self->{ea_alt}; 765 delete $self->{ea_alt};
766 $ret = 1;
767
768 $self->start_drawmode ($map)
769 if $was_in_draw;
180 } 770 }
181 771
182 if ($self->ea->special_arrow) { 772 if ($self->ea->special_arrow) {
183 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ($self->ea->special_arrow)); 773 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ($self->ea->special_arrow));
184 } else { 774 } else {
185 # XXX: Get the original cursor and insert it here 775 # FIXME: Get the original cursor and insert it here
186 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ('GDK_LEFT_PTR')); 776 $map->{window}->set_cursor (Gtk2::Gdk::Cursor->new ('GDK_LEFT_PTR'));
187 } 777 }
188 1; 778
779 $ret
189 }); 780 });
190 $map->signal_connect (button_press_event => sub { 781 $map->signal_connect_after (button_press_event => sub {
191 my ($map, $event) = @_; 782 my ($map, $event) = @_;
192 783
193 my ($x, $y) = $map->coord ($event->x, $event->y);
194 my $as = $map->get ($x, $y);
195
196 if ((not $self->{draw_mode}) and $event->button != 2) { 784 if ((not $self->{draw_mode}) and $event->button == 1) {
197
198 my $ea = $self->ea; 785 my $ea = $self->ea;
199 786
200 $ea->begin ($map, $x, $y, $self) 787 $self->start_drawmode ($map);
201 if $x >= 0 and $y >= 0 and $x < $map->{map}{width} and $y < $map->{map}{height};
202
203 $self->{draw_mode} = [$x, $y];
204 788
205 $ea->want_cursor 789 $ea->want_cursor
206 or $map->disable_tooltip; 790 or $map->disable_tooltip;
207 791
208 return 1; 792 return 1;
793 } elsif ($event->button == 3) {
794 $self->do_context_menu ($map, $event);
795 return 1;
209 } 796 }
797
210 0 798 0
211 }); 799 });
212 800
213 $map->signal_connect_after (motion_notify_event => sub { 801 $map->signal_connect_after (motion_notify_event => sub {
214 my ($map, $event) = @_; 802 my ($map, $event) = @_;
226 $X++ if $X < $x; 814 $X++ if $X < $x;
227 $X-- if $X > $x; 815 $X-- if $X > $x;
228 $Y++ if $Y < $y; 816 $Y++ if $Y < $y;
229 $Y-- if $Y > $y; 817 $Y-- if $Y > $y;
230 818
819 unless ($ea->only_on_click) {
231 $ea->edit ($map, $X, $Y, $self) 820 $ea->edit ($map, $X, $Y, $self)
232 if $X >= 0 and $Y >= 0 and $X < $map->{map}{width} and $Y < $map->{map}{height}; 821 if $X >= 0 and $Y >= 0 and $X < $map->{map}{width} and $Y < $map->{map}{height};
822 }
233 } 823 }
234 824
235 @{$self->{draw_mode}}[0,1] = ($X, $Y); 825 @{$self->{draw_mode}}[0,1] = ($X, $Y);
236 826
237 1 827 1
238 }); 828 });
239 829
240 $map->signal_connect (button_release_event => sub { 830 $map->signal_connect_after (button_release_event => sub {
241 my ($map, $event) = @_; 831 my ($map, $event) = @_;
242 832
243 if ($self->{draw_mode}) { 833 if ($self->{draw_mode} and $event->button == 1) {
244 my ($x, $y) = $map->coord ($map->get_pointer);
245
246 my $ea = $self->ea; 834 my $ea = $self->ea;
247 $ea->end ($map, $x, $y, $self);
248 835
249 delete $self->{draw_mode}; 836 $self->stop_drawmode ($map);
250 837
251 $ea->want_cursor 838 $ea->want_cursor
252 or $map->enable_tooltip; 839 or $map->enable_tooltip;
253 840
254 return 1; 841 return 1;
255 } 842 }
256 843
257 0 844 0
258 }); 845 });
259}
260 846
261# FIXME: Fix the automatic update of the attribute editor! and also the stack view! 847 ::set_pos_and_size ($self, $main::CFG->{map_window}, 500, 500, 200, 0);
262sub undo {
263 my ($self) = @_;
264
265 my $map = $self->{map}; # the Crossfire::MapWidget
266
267 $map->{undo_stack_pos}
268 or return;
269
270 $map->change_swap ($map->{undo_stack}[--$map->{undo_stack_pos}]);
271}
272
273sub redo {
274 my ($self) = @_;
275
276 my $map = $self->{map}; # the Crossfire::MapWidget
277
278 $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}
426 or return;
427 my $map = $self->{map}{map}{info}{$dir_to_path{$dir}}
428 or return;
429
430 $map = map2abs ($map, $self);
431 $::MAINWIN->open_map_editor ($map);
432}
433
434sub open_map_prop {
435 my ($self) = @_;
436
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;
484} 848}
485 849
486=head1 AUTHOR 850=head1 AUTHOR
487 851
488 Marc Lehmann <schmorp@schmorp.de> 852 Marc Lehmann <schmorp@schmorp.de>
490 854
491 Robin Redeker <elmex@ta-sa.org> 855 Robin Redeker <elmex@ta-sa.org>
492 http://www.ta-sa.org/ 856 http://www.ta-sa.org/
493 857
494=cut 858=cut
4951;
496 859
8601
861

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines