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

More subwindow event handling fixes.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/trunk@174 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 1998-12-29 14:07:14 +00:00
parent 0aa5899fbe
commit 3b1a191025
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Fl_x.cxx
View File

@ -1,5 +1,5 @@
// //
// "$Id: Fl_x.cxx,v 1.15 1998/12/29 14:06:08 mike Exp $" // "$Id: Fl_x.cxx,v 1.16 1998/12/29 14:07:14 mike Exp $"
// //
// X specific code for the Fast Light Tool Kit (FLTK). // X specific code for the Fast Light Tool Kit (FLTK).
// //
@ -330,8 +330,11 @@ static Fl_Window* resize_bug_fix;
int fl_handle(const XEvent& xevent) int fl_handle(const XEvent& xevent)
{ {
fl_xevent = &xevent; fl_xevent = &xevent;
Window xid = xevent.xany.window;
switch (xevent.type) { // events where we don't care about window switch (xevent.type) {
// events where we don't care about window:
case KeymapNotify: case KeymapNotify:
memcpy(fl_key_vector, xevent.xkeymap.key_vector, 32); memcpy(fl_key_vector, xevent.xkeymap.key_vector, 32);
@ -340,10 +343,25 @@ int fl_handle(const XEvent& xevent)
case MappingNotify: case MappingNotify:
XRefreshKeyboardMapping((XMappingEvent*)&xevent.xmapping); XRefreshKeyboardMapping((XMappingEvent*)&xevent.xmapping);
return 0; return 0;
// events where interesting window id is in a different place:
case CirculateNotify:
case CirculateRequest:
case ConfigureNotify:
case ConfigureRequest:
case CreateNotify:
case DestroyNotify:
case GravityNotify:
case MapNotify:
case MapRequest:
case ReparentNotify:
case UnmapNotify:
xid = xevent.xmaprequest.window;
break;
} }
int event = 0; int event = 0;
Fl_Window* window = fl_find(xevent.xany.window); Fl_Window* window = fl_find(xid);
if (window) switch (xevent.type) { if (window) switch (xevent.type) {
@ -522,10 +540,6 @@ Fl_X* Fl_X::set_xid(Fl_Window* w, Window xid) {
x->region = 0; x->region = 0;
x->wait_for_expose = 1; x->wait_for_expose = 1;
Fl_X::first = x; Fl_X::first = x;
w->set_visible();
w->handle(FL_SHOW); // get child windows to appear
w->redraw();
fl_fix_focus(); // if this is modal we must fix focus now
return x; return x;
} }
@ -608,6 +622,10 @@ void Fl_X::make_xid(Fl_Window* w, XVisualInfo *visual, Colormap colormap)
InputOutput, InputOutput,
visual->visual, visual->visual,
mask, &attr)); mask, &attr));
w->set_visible();
w->handle(FL_SHOW); // get child windows to appear
w->redraw();
fl_fix_focus(); // if this is modal we must fix focus now
//XInstallColormap(fl_display, colormap); //XInstallColormap(fl_display, colormap);
if (!w->parent() && !attr.override_redirect) { if (!w->parent() && !attr.override_redirect) {
@ -798,5 +816,5 @@ void Fl_Window::make_current() {
#endif #endif
// //
// End of "$Id: Fl_x.cxx,v 1.15 1998/12/29 14:06:08 mike Exp $". // End of "$Id: Fl_x.cxx,v 1.16 1998/12/29 14:07:14 mike Exp $".
// //