Misc bug fixes

Author: dannye

src/block-window.cpp

@@ -109,7 +109,7 @@ void Block_Window::initialize() {
 	_metatile_group->end();
 	// Initialize window
 	_window->box(OS_BG_BOX);
-	_window->callback((Fl_Callback *)close_cb, this);
+	_window->callback((Fl_Callback *)cancel_cb, this);
 	_window->set_modal();
 	// Initialize window's children
 	_multiedit_heading->align(FL_ALIGN_RIGHT | FL_ALIGN_INSIDE);
@@ -221,13 +221,16 @@ void Block_Window::metatile(const Metatile *mt, bool has_collisions, bool bin_co
 void Block_Window::show(const Fl_Widget *p, bool show_priority) {
 	initialize();
 	refresh();
+	Fl_Window *prev_grab = Fl::grab();
+	Fl::grab(NULL);
 	_show_priority = show_priority;
 	int x = p->x() + (p->w() - _window->w()) / 2;
 	int y = p->y() + (p->h() - _window->h()) / 2;
 	_window->position(x, y);
 	_ok_button->take_focus();
 	_window->show();
 	while (_window->shown()) { Fl::wait(); }
+	Fl::grab(prev_grab);
 }
 
 void Block_Window::draw_tile(uint8_t id, int x, int y, int s) const {

src/modal-dialog.cpp

@@ -49,7 +49,7 @@ void Modal_Dialog::initialize() {
 	// Initialize dialog
 	_dialog->box(OS_BG_BOX);
 	_dialog->resizable(NULL);
-	_dialog->callback((Fl_Callback *)close_cb, this);
+	_dialog->callback((Fl_Callback *)cancel_cb, this);
 	_dialog->set_modal();
 	// Initialize dialog's children
 	_icon->align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
@@ -150,6 +150,8 @@ void Modal_Dialog::refresh() {
 void Modal_Dialog::show(const Fl_Widget *p) {
 	initialize();
 	refresh();
+	Fl_Window *prev_grab = Fl::grab();
+	Fl::grab(NULL);
 	int x = p->x() + (p->w() - _dialog->w()) / 2;
 	int y = p->y() + (p->h() - _dialog->h()) / 2;
 	_dialog->position(x, y);
@@ -170,6 +172,7 @@ void Modal_Dialog::show(const Fl_Widget *p) {
 	}
 #endif
 	while (_dialog->shown()) { Fl::wait(); }
+	Fl::grab(prev_grab);
 }
 
 void Modal_Dialog::close_cb(Fl_Widget *, Modal_Dialog *md) {

src/option-dialogs.cpp

@@ -77,12 +77,15 @@ void Option_Dialog::refresh() {
 void Option_Dialog::show(const Fl_Widget *p) {
 	initialize();
 	refresh();
+	Fl_Window *prev_grab = Fl::grab();
+	Fl::grab(NULL);
 	int x = p->x() + (p->w() - _dialog->w()) / 2;
 	int y = p->y() + (p->h() - _dialog->h()) / 2;
 	_dialog->position(x, y);
 	_ok_button->take_focus();
 	_dialog->show();
 	while (_dialog->shown()) { Fl::wait(); }
+	Fl::grab(prev_grab);
 }
 
 void Option_Dialog::close_cb(Fl_Widget *, Option_Dialog *od) {
@@ -1209,12 +1212,15 @@ void Print_Options_Dialog::refresh() {
 void Print_Options_Dialog::show(const Fl_Widget *p) {
 	initialize();
 	refresh();
+	Fl_Window *prev_grab = Fl::grab();
+	Fl::grab(NULL);
 	int x = p->x() + (p->w() - _dialog->w()) / 2;
 	int y = p->y() + (p->h() - _dialog->h()) / 2;
 	_dialog->position(x, y);
 	_export_button->take_focus();
 	_dialog->show();
 	while (_dialog->shown()) { Fl::wait(); }
+	Fl::grab(prev_grab);
 }
 
 void Print_Options_Dialog::close_cb(Fl_Widget *, Print_Options_Dialog *pd) {

src/palette-window.cpp

@@ -62,7 +62,7 @@ void Abstract_Palette_Window::initialize() {
 	initial_setup();
 	// Initialize window
 	_window->box(OS_BG_BOX);
-	_window->callback((Fl_Callback *)close_cb, this);
+	_window->callback((Fl_Callback *)cancel_cb, this);
 	_window->set_modal();
 	// Initialize window's children
 	_red_spinner->range(0, 31);
@@ -193,12 +193,15 @@ void Abstract_Palette_Window::update_color(Fl_Widget *wgt) {
 void Abstract_Palette_Window::show(const Fl_Widget *p) {
 	initialize();
 	refresh();
+	Fl_Window *prev_grab = Fl::grab();
+	Fl::grab(NULL);
 	int x = p->x() + (p->w() - _window->w()) / 2;
 	int y = p->y() + (p->h() - _window->h()) / 2;
 	_window->position(x, y);
 	_ok_button->take_focus();
 	_window->show();
 	while (_window->shown()) { Fl::wait(); }
+	Fl::grab(prev_grab);
 }
 
 void Abstract_Palette_Window::select(Color_Button *cb) {

src/roof-window.cpp

@@ -120,7 +120,7 @@ void Roof_Window::initialize() {
 	_tile_group->end();
 	// Initialize window
 	_window->box(OS_BG_BOX);
-	_window->callback((Fl_Callback *)close_cb, this);
+	_window->callback((Fl_Callback *)cancel_cb, this);
 	_window->set_modal();
 	// Initialize window's children
 	_roof_group->box(OS_SPACER_THIN_DOWN_FRAME);
@@ -184,12 +184,15 @@ void Roof_Window::tileset(Tileset *t) {
 void Roof_Window::show(const Fl_Widget *p) {
 	initialize();
 	refresh();
+	Fl_Window *prev_grab = Fl::grab();
+	Fl::grab(NULL);
 	int x = p->x() + (p->w() - _window->w()) / 2;
 	int y = p->y() + (p->h() - _window->h()) / 2;
 	_window->position(x, y);
 	_ok_button->take_focus();
 	_window->show();
 	while (_window->shown()) { Fl::wait(); }
+	Fl::grab(prev_grab);
 }
 
 void Roof_Window::apply_modifications() {

src/tileset-window.cpp

@@ -135,7 +135,7 @@ void Tileset_Window::initialize() {
 	_tile_group->end();
 	// Initialize window
 	_window->box(OS_BG_BOX);
-	_window->callback((Fl_Callback *)close_cb, this);
+	_window->callback((Fl_Callback *)cancel_cb, this);
 	_window->set_modal();
 	// Initialize window's children
 	_tileset_group->box(OS_SPACER_THIN_DOWN_FRAME);
@@ -237,13 +237,16 @@ void Tileset_Window::tileset(Tileset *t) {
 void Tileset_Window::show(const Fl_Widget *p, bool show_priority) {
 	initialize();
 	refresh();
+	Fl_Window *prev_grab = Fl::grab();
+	Fl::grab(NULL);
 	_show_priority = show_priority;
 	int x = p->x() + (p->w() - _window->w()) / 2;
 	int y = p->y() + (p->h() - _window->h()) / 2;
 	_window->position(x, y);
 	_ok_button->take_focus();
 	_window->show();
 	while (_window->shown()) { Fl::wait(); }
+	Fl::grab(prev_grab);
 }
 
 void Tileset_Window::draw_tile(int x, int y, uint8_t id) const {