mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Robustness fix for the first window

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10278 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Lauri Kasanen 2014-09-05 13:14:16 +00:00
parent 7ebbe0baf4
commit 523c657f2e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Fl.cxx
View File

@ -113,7 +113,7 @@ unsigned char Fl::options_[] = { 0, 0 };
unsigned char Fl::options_read_ = 0; unsigned char Fl::options_read_ = 0;
Fl_Window *fl_xfocus; // which window X thinks has focus Fl_Window *fl_xfocus = NULL; // which window X thinks has focus
Fl_Window *fl_xmousewin;// which window X thinks has FL_ENTER Fl_Window *fl_xmousewin;// which window X thinks has FL_ENTER
Fl_Window *Fl::grab_; // most recent Fl::grab() Fl_Window *Fl::grab_; // most recent Fl::grab()
Fl_Window *Fl::modal_; // topmost modal() window Fl_Window *Fl::modal_; // topmost modal() window

13
src/Fl_x.cxx
View File

@ -2213,12 +2213,17 @@ void Fl_X::activate_window(Window w) {
if (!ewmh_supported()) if (!ewmh_supported())
return; return;
Fl_X *x = Fl_X::i(fl_xfocus); Window prev = 0;
if (!x)
return; if (fl_xfocus) {
Fl_X *x = Fl_X::i(fl_xfocus);
if (!x)
return;
prev = x->xid;
}
send_wm_event(w, fl_NET_ACTIVE_WINDOW, 1 /* application */, send_wm_event(w, fl_NET_ACTIVE_WINDOW, 1 /* application */,
0 /* timestamp */, x->xid /* previously active window */); 0 /* timestamp */, prev /* previously active window */);
} }
/* Change an existing window to fullscreen */ /* Change an existing window to fullscreen */