diff options
Diffstat (limited to 'klipper/clipboardpoll.cpp')
| -rw-r--r-- | klipper/clipboardpoll.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp index 2f7ce4ddb..75d901446 100644 --- a/klipper/clipboardpoll.cpp +++ b/klipper/clipboardpoll.cpp @@ -71,7 +71,7 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent ) "KLIPPER_SELECTION_TIMESTAMP", "KLIPPER_CLIPBOARD_TIMESTAMP" }; Atom atoms[ 6 ]; - XInternAtoms( qt_xdisplay(), const_cast< char** >( names ), 6, False, atoms ); + XInternAtoms( tqt_xdisplay(), const_cast< char** >( names ), 6, False, atoms ); selection.sentinel_atom = atoms[ 0 ]; clipboard.sentinel_atom = atoms[ 1 ]; xa_clipboard = atoms[ 2 ]; @@ -82,13 +82,13 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent ) kapp->installX11EventFilter( this ); #ifdef HAVE_XFIXES int dummy; - if( XFixesQueryExtension( qt_xdisplay(), &xfixes_event_base, &dummy )) + if( XFixesQueryExtension( tqt_xdisplay(), &xfixes_event_base, &dummy )) { - XFixesSelectSelectionInput( qt_xdisplay(), qt_xrootwin( 0 ), XA_PRIMARY, + XFixesSelectSelectionInput( tqt_xdisplay(), tqt_xrootwin( 0 ), XA_PRIMARY, XFixesSetSelectionOwnerNotifyMask | XFixesSelectionWindowDestroyNotifyMask | XFixesSelectionClientCloseNotifyMask ); - XFixesSelectSelectionInput( qt_xdisplay(), qt_xrootwin( 0 ), xa_clipboard, + XFixesSelectSelectionInput( tqt_xdisplay(), tqt_xrootwin( 0 ), xa_clipboard, XFixesSetSelectionOwnerNotifyMask | XFixesSelectionWindowDestroyNotifyMask | XFixesSelectionClientCloseNotifyMask ); @@ -116,11 +116,11 @@ void ClipboardPoll::initPolling() selection.atom = XA_PRIMARY; clipboard.atom = xa_clipboard; selection.last_change = clipboard.last_change = GET_QT_X_TIME(); // don't trigger right after startup - selection.last_owner = XGetSelectionOwner( qt_xdisplay(), XA_PRIMARY ); + selection.last_owner = XGetSelectionOwner( tqt_xdisplay(), XA_PRIMARY ); #ifdef NOISY_KLIPPER_ kdDebug() << "(1) Setting last_owner for =" << "selection" << ":" << selection.last_owner << endl; #endif - clipboard.last_owner = XGetSelectionOwner( qt_xdisplay(), xa_clipboard ); + clipboard.last_owner = XGetSelectionOwner( tqt_xdisplay(), xa_clipboard ); #ifdef NOISY_KLIPPER_ kdDebug() << "(2) Setting last_owner for =" << "clipboard" << ":" << clipboard.last_owner << endl; #endif @@ -193,7 +193,7 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data ) unsigned long nitems; unsigned long after; unsigned char* prop = NULL; - if( XGetWindowProperty( qt_xdisplay(), qt_xrootwin( 0 ), data.sentinel_atom, 0, 2, False, + if( XGetWindowProperty( tqt_xdisplay(), tqt_xrootwin( 0 ), data.sentinel_atom, 0, 2, False, XA_WINDOW, &type, &format, &nitems, &after, &prop ) != Success || type != XA_WINDOW || format != 32 || nitems != 2 || prop == NULL ) { @@ -207,7 +207,7 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data ) } Window owner = reinterpret_cast< long* >( prop )[ 0 ]; // [0] is new owner, [1] is previous XFree( prop ); - Window current_owner = XGetSelectionOwner( qt_xdisplay(), data.atom ); + Window current_owner = XGetSelectionOwner( tqt_xdisplay(), data.atom ); data.owner_is_qt = ( owner == current_owner ); #ifdef REALLY_NOISY_KLIPPER_ kdDebug() << "owner=" << owner << "; current_owner=" << current_owner << endl; @@ -235,7 +235,7 @@ void ClipboardPoll::timeout() bool ClipboardPoll::checkTimestamp( SelectionData& data ) { - Window current_owner = XGetSelectionOwner( qt_xdisplay(), data.atom ); + Window current_owner = XGetSelectionOwner( tqt_xdisplay(), data.atom ); bool signal = false; updateQtOwnership( data ); if( data.owner_is_qt ) @@ -269,8 +269,8 @@ bool ClipboardPoll::checkTimestamp( SelectionData& data ) // We're already waiting for the timestamp of the last check return false; } - XDeleteProperty( qt_xdisplay(), winId(), data.timestamp_atom ); - XConvertSelection( qt_xdisplay(), data.atom, xa_timestamp, data.timestamp_atom, winId(), GET_QT_X_TIME() ); + XDeleteProperty( tqt_xdisplay(), winId(), data.timestamp_atom ); + XConvertSelection( tqt_xdisplay(), data.atom, xa_timestamp, data.timestamp_atom, winId(), GET_QT_X_TIME() ); data.waiting_for_timestamp = true; data.waiting_x_time = GET_QT_X_TIME(); #ifdef REALLY_NOISY_KLIPPER_ @@ -300,7 +300,7 @@ bool ClipboardPoll::changedTimestamp( SelectionData& data, const XEvent& ev ) unsigned long nitems; unsigned long after; unsigned char* prop = NULL; - if( XGetWindowProperty( qt_xdisplay(), winId(), ev.xselection.property, 0, 1, False, + if( XGetWindowProperty( tqt_xdisplay(), winId(), ev.xselection.property, 0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &prop ) != Success || format != 32 || nitems != 1 || prop == NULL ) { |