FCL/sf/mw/qt: comparison src/gui/kernel/qapplication

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 "_QT_INPUT_ENCODING\0"
 "_MOTIF_WM_HINTS\0"
 "DTWM_IS_RUNNING\0"
-"KDE_FULL_SESSION\0"
-"KWIN_RUNNING\0"
-"KWM_RUNNING\0"
-"GNOME_BACKGROUND_PROPERTIES\0"
 "ENLIGHTENMENT_DESKTOP\0"
+"_DT_SAVE_MODE\0"
 "_SGI_DESKS_MANAGER\0"
 // EWMH (aka NETWM)
 "_NET_SUPPORTED\0"
 "_NET_VIRTUAL_ROOTS\0"
 "_NET_WM_CM_S0\0"
 "_NET_SYSTEM_TRAY_VISUAL\0"
+"_NET_ACTIVE_WINDOW\0"
 // Property formats
 "COMPOUND_TEXT\0"
 "TEXT\0"
 "UTF8_STRING\0"
 static int (*original_x_errhandler)(Display *dpy, XErrorEvent *);
 static int (*original_xio_errhandler)(Display *dpy);
 static int qt_x_errhandler(Display *dpy, XErrorEvent *err)
 {
+if (X11->display != dpy) {
+// only handle X errors for our display
+return 0;
+}
 switch (err->error_code) {
 case BadAtom:
 if (err->request_code == 20 /* X_GetProperty */
 && (err->resourceid == XA_RESOURCE_MANAGER
 || err->resourceid == XA_RGB_DEFAULT_MAP
 || err->resourceid == ATOM(_NET_SUPPORTED)
 || err->resourceid == ATOM(_NET_SUPPORTING_WM_CHECK)
-|| err->resourceid == ATOM(KDE_FULL_SESSION)
-|| err->resourceid == ATOM(KWIN_RUNNING)
 || err->resourceid == ATOM(XdndProxy)
 || err->resourceid == ATOM(XdndAware))) {
 // Perhaps we're running under SECURITY reduction? :/
 return 0;
 }
 qDebug("xdndHandleBadwindow returned true");
 return 0;
 }
 }
 if (X11->ignore_badwindow)
-return 0;
-break;
-case BadMatch:
-if (err->request_code == 42 /* X_SetInputFocus */)
 return 0;
 break;
 default:
 #if !defined(QT_NO_XINPUT)
 extensionName = "RANDR";
 else if (err->request_code == X11->xinput_major)
 extensionName = "XInputExtension";
 else if (err->request_code == X11->mitshm_major)
 extensionName = "MIT-SHM";
+#ifndef QT_NO_XKB
+else if(err->request_code == X11->xkb_major)
+extensionName = "XKEYBOARD";
+#endif
 char minor_str[256];
 if (extensionName) {
 qsnprintf(buffer, 256, "%s.%d", extensionName, err->minor_code);
 XGetErrorDatabaseText(dpy, "XRequest", buffer, "", minor_str, 256);
 // XInputExtension
 X11->use_xinput = false;
 X11->xinput_major = 0;
 X11->xinput_eventbase = 0;
 X11->xinput_errorbase = 0;
+X11->use_xkb = false;
+X11->xkb_major = 0;
+X11->xkb_eventbase = 0;
+X11->xkb_errorbase = 0;
 // MIT-SHM
 X11->use_mitshm = false;
 X11->use_mitshm_pixmaps = false;
 X11->mitshm_major = 0;
 X11->ptrXFreeDeviceList = XINPUT_LOAD(XFreeDeviceList);
 X11->ptrXSelectExtensionEvent = XINPUT_LOAD(XSelectExtensionEvent);
 }
 #endif // QT_NO_XINPUT
+#ifndef QT_NO_XKB
+int xkblibMajor = XkbMajorVersion;
+int xkblibMinor = XkbMinorVersion;
+X11->use_xkb = XkbQueryExtension(X11->display,
+&X11->xkb_major,
+&X11->xkb_eventbase,
+&X11->xkb_errorbase,
+&xkblibMajor,
+&xkblibMinor);
+if (X11->use_xkb) {
+// If XKB is detected, set the GrabsUseXKBState option so input method
+// compositions continue to work (ie. deadkeys)
+unsigned int state = XkbPCF_GrabsUseXKBStateMask;
+(void) XkbSetPerClientControls(X11->display, state, &state);
+// select for group change events
+XkbSelectEventDetails(X11->display,
+XkbUseCoreKbd,
+XkbStateNotify,
+XkbAllStateComponentsMask,
+XkbGroupStateMask);
+// current group state is queried when creating the keymapper, no need to do it here
+}
+#endif
 #if !defined(QT_NO_FONTCONFIG)
 int dpi = 0;
 getXDefault("Xft", FC_DPI, &dpi);
 if (dpi) {
 for (int s = 0; s < ScreenCount(X11->display); ++s) {
 #endif // QT_NO_XRENDER
 // initialize key mapper
 QKeyMapper::changeKeyboard();
-#ifndef QT_NO_XKB
-if (qt_keymapper_private()->useXKB) {
-// If XKB is detected, set the GrabsUseXKBState option so input method
-// compositions continue to work (ie. deadkeys)
-unsigned int state = XkbPCF_GrabsUseXKBStateMask;
-(void) XkbSetPerClientControls(X11->display, state, &state);
-}
-#endif // QT_NO_XKB
 // Misc. initialization
 #if 0 //disabled for now..
 QSegfaultHandler::initialize(priv->argv, priv->argc);
 #endif
 QCursorData::initialize();
 X11->compositingManagerRunning = XGetSelectionOwner(X11->display,
 ATOM(_NET_WM_CM_S0));
 X11->desktopEnvironment = DE_UNKNOWN;
 X11->desktopVersion = 0;
-// See if the current window manager is using the freedesktop.org spec to give its name
+Atom type;
-Window windowManagerWindow = XNone;
+int format;
-Atom typeReturned;
+unsigned long length, after;
-int formatReturned;
+uchar *data = 0;
-unsigned long nitemsReturned;
+int rc;
-unsigned long unused;
-unsigned char *data = 0;
+do {
-if (XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(),
+if (!qgetenv("KDE_FULL_SESSION").isEmpty()) {
-ATOM(_NET_SUPPORTING_WM_CHECK),
+X11->desktopEnvironment = DE_KDE;
-0, 1024, False, XA_WINDOW, &typeReturned,
+X11->desktopVersion = qgetenv("KDE_SESSION_VERSION").toInt();
-&formatReturned, &nitemsReturned, &unused, &data)
+break;
-== Success) {
+}
-if (typeReturned == XA_WINDOW && formatReturned == 32)
-windowManagerWindow = *((Window*) data);
+if (qgetenv("DESKTOP_SESSION") == "gnome") {
-if (data)
+X11->desktopEnvironment = DE_GNOME;
+break;
+}
+// GNOME_DESKTOP_SESSION_ID is deprecated for some reason, but still check it
+if (!qgetenv("GNOME_DESKTOP_SESSION_ID").isEmpty()) {
+X11->desktopEnvironment = DE_GNOME;
+break;
+}
+rc = XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(_DT_SAVE_MODE),
+0, 2, False, XA_STRING, &type, &format, &length,
+&after, &data);
+if (rc == Success && length) {
+if (!strcmp(reinterpret_cast<char *>(data), "xfce4")) {
+// Pretend that xfce4 is gnome, as it uses the same libraries.
+// The detection above is stolen from xdg-open.
+X11->desktopEnvironment = DE_GNOME;
+break;
+}
+// We got the property but it wasn't xfce4. Free data before it gets overwritten.
 XFree(data);
+data = 0;
-if (windowManagerWindow != XNone) {
+}
-QString wmName;
-Atom utf8atom = ATOM(UTF8_STRING);
+rc = XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(DTWM_IS_RUNNING),
-if (XGetWindowProperty(QX11Info::display(), windowManagerWindow, ATOM(_NET_WM_NAME),
+0, 1, False, AnyPropertyType, &type, &format, &length,
-0, 1024, False, utf8atom, &typeReturned,
+&after, &data);
-&formatReturned, &nitemsReturned, &unused, &data)
+if (rc == Success && length) {
-== Success) {
-if (typeReturned == utf8atom && formatReturned == 8)
-wmName = QString::fromUtf8((const char*)data);
-if (data)
-XFree(data);
-if (wmName == QLatin1String("KWin"))
-X11->desktopEnvironment = DE_KDE;
-if (wmName == QLatin1String("Metacity"))
-X11->desktopEnvironment = DE_GNOME;
-}
-}
-}
-// Running a different/newer/older window manager?  Try some other things
-if (X11->desktopEnvironment == DE_UNKNOWN){
-Atom type;
-int format;
-unsigned long length, after;
-uchar *data = 0;
-QString session = QString::fromLocal8Bit(qgetenv("DESKTOP_SESSION"));
-if (session == QLatin1String("kde")) {
-X11->desktopEnvironment = DE_KDE;
-} else if (session == QLatin1String("gnome") || session == QLatin1String("xfce")) {
-X11->desktopEnvironment = DE_GNOME;
-} else if (XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(DTWM_IS_RUNNING),
-0, 1, False, AnyPropertyType, &type, &format, &length,
-&after, &data) == Success && length) {
 // DTWM is running, meaning most likely CDE is running...
 X11->desktopEnvironment = DE_CDE;
-} else if (XGetWindowProperty(X11->display, QX11Info::appRootWindow(),
+break;
-ATOM(GNOME_BACKGROUND_PROPERTIES), 0, 1, False, AnyPropertyType,
+}
-&type, &format, &length, &after, &data) == Success && length) {
-X11->desktopEnvironment = DE_GNOME;
+rc = XGetWindowProperty(X11->display, QX11Info::appRootWindow(),
-} else if (!qgetenv("GNOME_DESKTOP_SESSION_ID").isEmpty()) {
+ATOM(_SGI_DESKS_MANAGER), 0, 1, False, XA_WINDOW,
-X11->desktopEnvironment = DE_GNOME;
+&type, &format, &length, &after, &data);
-} else if ((XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(KDE_FULL_SESSION),
+if (rc == Success && length) {
-0, 1, False, AnyPropertyType, &type, &format, &length, &after, &data) == Success
-&& length)
-|| (XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(KWIN_RUNNING),
-0, 1, False, AnyPropertyType, &type, &format, &length,
-&after, &data) == Success
-&& length)
-|| (XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(KWM_RUNNING),
-0, 1, False, AnyPropertyType, &type, &format, &length,
-&after, &data) == Success && length)) {
-X11->desktopEnvironment = DE_KDE;
-} else if (XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(_SGI_DESKS_MANAGER),
-0, 1, False, XA_WINDOW, &type, &format, &length, &after, &data) == Success
-&& length) {
 X11->desktopEnvironment = DE_4DWM;
-}
+break;
-if (data)
+}
-XFree((char *)data);
+} while(0);
-}
+if (data)
-if (X11->desktopEnvironment == DE_KDE)
+XFree((char *)data);
-X11->desktopVersion = QString::fromLocal8Bit(qgetenv("KDE_SESSION_VERSION")).toInt();
 #if !defined(QT_NO_STYLE_GTK)
 if (X11->desktopEnvironment == DE_GNOME) {
 static bool menusHaveIcons = QGtkStyle::getGConfBool(QLatin1String("/desktop/gnome/interface/menus_have_icons"), true);
 QApplication::setAttribute(Qt::AA_DontShowIconsInMenus, !menusHaveIcons);
 }
 else if (a == ATOM(WM_TAKE_FOCUS)) {
 if ((ulong) event->xclient.data.l[1] > X11->time)
 X11->time = event->xclient.data.l[1];
 QWidget *amw = activeModalWidget();
+if (amw && amw->testAttribute(Qt::WA_X11DoNotAcceptFocus))
+amw = 0;
 if (amw && !QApplicationPrivate::tryModalHelper(widget, 0)) {
 QWidget *p = amw->parentWidget();
 while (p && p != widget)
 p = p->parentWidget();
 if (!p || !X11->net_supported_list)
 XRefreshKeyboardMapping(&event->xmapping);
 QKeyMapper::changeKeyboard();
 return 0;
 }
+#ifndef QT_NO_XKB
+else if (X11->use_xkb && event->type == X11->xkb_eventbase) {
+XkbAnyEvent *xkbevent = (XkbAnyEvent *) event;
+switch (xkbevent->xkb_type) {
+case XkbStateNotify:
+{
+XkbStateNotifyEvent *xkbstateevent = (XkbStateNotifyEvent *) xkbevent;
+if ((xkbstateevent->changed & XkbGroupStateMask) != 0) {
+qt_keymapper_private()->xkb_currentGroup = xkbstateevent->group;
+QKeyMapper::changeKeyboard();
+}
+break;
+}
+default:
+break;
+}
+}
+#endif
 if (!widget) {                                // don't know this windows
 QWidget* popup = QApplication::activePopupWidget();
 if (popup) {

changeset 30	5dc02b23752f
parent 19	fcece45ef507
child 33	3e2da88830cd