x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch

   1 --- src/kernel/qapplication_x11.cpp.sav 2006-06-01 13:31:04.000000000 +0200
   2 +++ src/kernel/qapplication_x11.cpp     2006-06-01 13:33:07.000000000 +0200
   3 @@ -271,6 +271,7 @@ Atom                qt_net_wm_frame_strut           = 0;    // KDE
   4  Atom           qt_net_wm_state_stays_on_top    = 0;    // KDE extension
   5  Atom           qt_net_wm_pid           = 0;
   6  Atom           qt_net_wm_user_time     = 0;
   7 +Atom            qt_net_wm_full_placement = 0; // KDE extension
   8  // Enlightenment support
   9  Atom           qt_enlightenment_desktop        = 0;
  10
  11 @@ -1922,6 +1923,7 @@ void qt_init_internal( int *argcptr, cha
  12                             &qt_net_wm_state_stays_on_top );
  13         qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid );
  14         qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time );
  15 +       qt_x11_intern_atom( "_NET_WM_FULL_PLACEMENT", &qt_net_wm_full_placement );
  16         qt_x11_intern_atom( "ENLIGHTENMENT_DESKTOP", &qt_enlightenment_desktop );
  17         qt_x11_intern_atom( "_NET_WM_NAME", &qt_net_wm_name );
  18         qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name );
  19 --- src/dialogs/qdialog.cpp.sav 2006-03-17 14:33:44.000000000 +0100
  20 +++ src/dialogs/qdialog.cpp     2006-06-01 13:38:00.000000000 +0200
  21 @@ -670,6 +670,11 @@ bool QDialog::event( QEvent *e )
  22
  23  #if defined(Q_WS_X11)
  24  extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
  25 +#include <private/qt_x11_p.h>
  26 +#undef FocusIn
  27 +// defined in qapplication_x11.cpp
  28 +extern Atom qt_net_wm_full_placement;
  29 +extern bool qt_net_supports(Atom atom);
  30  #endif // Q_WS_X11
  31
  32  /*!
  33 @@ -691,10 +696,12 @@ void QDialog::show()
  34
  35      if ( !did_resize )
  36         adjustSize();
  37 -    if ( has_relpos && !did_move ) {
  38 -       adjustPositionInternal( parentWidget(), TRUE );
  39 -    } else if ( !did_move ) {
  40 -       adjustPositionInternal( parentWidget() );
  41 +    if( !qt_net_supports( qt_net_wm_full_placement )) {
  42 +       if ( has_relpos && !did_move ) {
  43 +           adjustPositionInternal( parentWidget(), TRUE );
  44 +       } else if ( !did_move ) {
  45 +           adjustPositionInternal( parentWidget() );
  46 +       }
  47      }
  48
  49      if (windowState() != state)