Attachment #820 for bug #1130

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1130
Collapse All | Expand All

Lines 573-581 void PasswordDlg::gplugActivity() Link Here

(-)a/kdesktop/lock/lockdlg.cc (-2 / +12 lines)
573		573
574	void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )	574	void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
575	{	575	{
576	TQDialog dialog( this, 0, true, (WFlags)WX11BypassWM );	576	TQDialog dialog( this, 0, true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
		577	if (trinity_desktop_lock_use_system_modal_dialogs) {
		578	// Signal that we do not want any window controls to be shown at all
		579	Atom kde_wm_system_modal_notification;
		580	kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
		581	XChangeProperty(qt_xdisplay(), dialog.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
		582	}
		583	dialog.setCaption(i18n("Authentication Subsystem Notice"));
577	TQFrame *winFrame = new TQFrame( &dialog );	584	TQFrame *winFrame = new TQFrame( &dialog );
578	winFrame->setFrameStyle( TQFrame::WinPanel \| TQFrame::Raised );	585	if (trinity_desktop_lock_use_system_modal_dialogs)
		586	winFrame->setFrameStyle( TQFrame::NoFrame );
		587	else
		588	winFrame->setFrameStyle( TQFrame::WinPanel \| TQFrame::Raised );
579	winFrame->setLineWidth( 2 );	589	winFrame->setLineWidth( 2 );
580	TQVBoxLayout *vbox = new TQVBoxLayout( &dialog );	590	TQVBoxLayout *vbox = new TQVBoxLayout( &dialog );
581	vbox->addWidget( winFrame );	591	vbox->addWidget( winFrame );





    setGeometry(0, 0, mRootWidth, mRootHeight);

    // HACK
    // Close all tooltips and notification windows
    {
        Window rootWindow = RootWindow(x11Display(), x11Screen());
        Window parent;
        Window* children = NULL;
        unsigned int noOfChildren = 0;
        XWindowAttributes childAttr;
        Window childTransient;

        if (XQueryTree(x11Display(), rootWindow, &rootWindow, &parent, &children, &noOfChildren) && noOfChildren>0 ) {
            for (unsigned int i=0; i<noOfChildren; i++) {
                if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
                    if ((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
                        XUnmapWindow(x11Display(), children[i]);
                    }
                }
            }
        }
    }

    kdDebug(1204) << "Saver window Id: " << winId() << endl;
}



void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
{
    TQDialog box( 0, "messagebox", true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
    if (trinity_desktop_lock_use_system_modal_dialogs) {
        // Signal that we do not want any window controls to be shown at all
        Atom kde_wm_system_modal_notification;
        kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
        XChangeProperty(qt_xdisplay(), box.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
    }
    box.setCaption(i18n("Authentication Subsystem Notice"));
    TQFrame *winFrame = new TQFrame( &box );
    if (trinity_desktop_lock_use_system_modal_dialogs)
        winFrame->setFrameStyle( TQFrame::NoFrame );
    else
        winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
    winFrame->setLineWidth( 2 );
    TQLabel *label1 = new TQLabel( winFrame );
    label1->setPixmap( TQMessageBox::standardIcon( type ) );

    int y = XDisplayHeight( qt_xdisplay(), qt_xscreen()) - attr_geom.height;
    if( managed ) {
        XSetWindowAttributes attr;
        if (!trinity_desktop_lock_use_system_modal_dialogs) {
            attr.override_redirect = True;
            XChangeWindowAttributes( qt_xdisplay(), w, CWOverrideRedirect, &attr );
        }
        XReparentWindow( qt_xdisplay(), w, qt_xrootwin(), x, y );
        XMapWindow( qt_xdisplay(), w );
    }




            emit activity();
        }
    }
    else if (ev->type == MapNotify) {
        // HACK
        // Close all tooltips and notification windows
        XMapEvent map_event = ev->xmap;
        XWindowAttributes childAttr;
        Window childTransient;
        if (XGetWindowAttributes(map_event.display, map_event.window, &childAttr) && XGetTransientForHint(map_event.display, map_event.window, &childTransient)) {
            if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
                XUnmapWindow(map_event.display, map_event.window);
            }
        }
    }
    else if (ev->type == CreateNotify) {
        // HACK
        // Close all tooltips and notification windows
        XCreateWindowEvent create_event = ev->xcreatewindow;
        XWindowAttributes childAttr;
        Window childTransient;
        if (XGetWindowAttributes(create_event.display, create_event.window, &childAttr) && XGetTransientForHint(create_event.display, create_event.window, &childTransient)) {
            if ((childAttr.override_redirect) && (childTransient)) {
                XDestroyWindow(create_event.display, create_event.window);
            }
        }
    }
    return KApplication::x11EventFilter( ev );
}


Return to bug 1130

Lines 960-965 void LockProcess::createSaverWindow() Link Here

(-)a/kdesktop/lock/lockprocess.cc (-4 / +37 lines)
960		960
961	setGeometry(0, 0, mRootWidth, mRootHeight);	961	setGeometry(0, 0, mRootWidth, mRootHeight);
962		962
		963	// HACK
		964	// Close all tooltips and notification windows
		965	{
		966	Window rootWindow = RootWindow(x11Display(), x11Screen());
		967	Window parent;
		968	Window* children = NULL;
		969	unsigned int noOfChildren = 0;
		970	XWindowAttributes childAttr;
		971	Window childTransient;
		972
		973	if (XQueryTree(x11Display(), rootWindow, &rootWindow, &parent, &children, &noOfChildren) && noOfChildren>0 ) {
		974	for (unsigned int i=0; i<noOfChildren; i++) {
		975	if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
		976	if ((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
		977	XUnmapWindow(x11Display(), children[i]);
		978	}
		979	}
		980	}
		981	}
		982	}
		983
963	kdDebug(1204) << "Saver window Id: " << winId() << endl;	984	kdDebug(1204) << "Saver window Id: " << winId() << endl;
964	}	985	}
965		986
Lines 2162-2170 void LockProcess::unlockXF86() Link Here
2162		2183
2163	void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )	2184	void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
2164	{	2185	{
2165	TQDialog box( 0, "messagebox", true, (WFlags)WX11BypassWM );	2186	TQDialog box( 0, "messagebox", true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
		2187	if (trinity_desktop_lock_use_system_modal_dialogs) {
		2188	// Signal that we do not want any window controls to be shown at all
		2189	Atom kde_wm_system_modal_notification;
		2190	kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
		2191	XChangeProperty(qt_xdisplay(), box.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
		2192	}
		2193	box.setCaption(i18n("Authentication Subsystem Notice"));
2166	TQFrame *winFrame = new TQFrame( &box );	2194	TQFrame *winFrame = new TQFrame( &box );
2167	winFrame->setFrameStyle( TQFrame::WinPanel \| TQFrame::Raised );	2195	if (trinity_desktop_lock_use_system_modal_dialogs)
		2196	winFrame->setFrameStyle( TQFrame::NoFrame );
		2197	else
		2198	winFrame->setFrameStyle( TQFrame::WinPanel \| TQFrame::Raised );
2168	winFrame->setLineWidth( 2 );	2199	winFrame->setLineWidth( 2 );
2169	TQLabel *label1 = new TQLabel( winFrame );	2200	TQLabel *label1 = new TQLabel( winFrame );
2170	label1->setPixmap( TQMessageBox::standardIcon( type ) );	2201	label1->setPixmap( TQMessageBox::standardIcon( type ) );
Lines 2264-2271 void LockProcess::windowAdded( WId w, bool managed ) Link Here
2264	int y = XDisplayHeight( qt_xdisplay(), qt_xscreen()) - attr_geom.height;	2295	int y = XDisplayHeight( qt_xdisplay(), qt_xscreen()) - attr_geom.height;
2265	if( managed ) {	2296	if( managed ) {
2266	XSetWindowAttributes attr;	2297	XSetWindowAttributes attr;
2267	attr.override_redirect = True;	2298	if (!trinity_desktop_lock_use_system_modal_dialogs) {
2268	XChangeWindowAttributes( qt_xdisplay(), w, CWOverrideRedirect, &attr );	2299	attr.override_redirect = True;
		2300	XChangeWindowAttributes( qt_xdisplay(), w, CWOverrideRedirect, &attr );
		2301	}
2269	XReparentWindow( qt_xdisplay(), w, qt_xrootwin(), x, y );	2302	XReparentWindow( qt_xdisplay(), w, qt_xrootwin(), x, y );
2270	XMapWindow( qt_xdisplay(), w );	2303	XMapWindow( qt_xdisplay(), w );
2271	}	2304	}

Lines 76-81 bool MyApp::x11EventFilter( XEvent *ev ) Link Here

(-)a/kdesktop/lock/main.cc (+24 lines)
76	emit activity();	76	emit activity();
77	}	77	}
78	}	78	}
		79	else if (ev->type == MapNotify) {
		80	// HACK
		81	// Close all tooltips and notification windows
		82	XMapEvent map_event = ev->xmap;
		83	XWindowAttributes childAttr;
		84	Window childTransient;
		85	if (XGetWindowAttributes(map_event.display, map_event.window, &childAttr) && XGetTransientForHint(map_event.display, map_event.window, &childTransient)) {
		86	if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
		87	XUnmapWindow(map_event.display, map_event.window);
		88	}
		89	}
		90	}
		91	else if (ev->type == CreateNotify) {
		92	// HACK
		93	// Close all tooltips and notification windows
		94	XCreateWindowEvent create_event = ev->xcreatewindow;
		95	XWindowAttributes childAttr;
		96	Window childTransient;
		97	if (XGetWindowAttributes(create_event.display, create_event.window, &childAttr) && XGetTransientForHint(create_event.display, create_event.window, &childTransient)) {
		98	if ((childAttr.override_redirect) && (childTransient)) {
		99	XDestroyWindow(create_event.display, create_event.window);
		100	}
		101	}
		102	}
79	return KApplication::x11EventFilter( ev );	103	return KApplication::x11EventFilter( ev );
80	}	104	}
81		105