Ticket #6036: 6036-dbg-v3.patch

File 6036-dbg-v3.patch, 6.3 KB (added by danielk, 11 years ago)

updated version

  • libs/libmythtv/guidegrid.cpp

     
    3535#include "remoteutil.h"
    3636#include "channelutil.h"
    3737#include "cardutil.h"
     38#include "util-x11.h"
    3839
    3940QWaitCondition epgIsVisibleCond;
    4041
     
    21322133{
    21332134    RunProgramFind(false, true);
    21342135
     2136    X11L;
    21352137    activateWindow();
    21362138    setFocus();
     2139    X11U;
    21372140
    21382141    EmbedTVWindow();
    21392142}
     
    21962199
    21972200    setFocusPolicy(storeFocus);
    21982201
     2202    X11L;
    21992203    activateWindow();
    22002204    setFocus();
     2205    X11U;
    22012206
    22022207    m_recList.FromScheduler();
    22032208    fillProgramInfos();
     
    22232228
    22242229    setFocusPolicy(storeFocus);
    22252230
     2231    X11L;
    22262232    activateWindow();
    22272233    setFocus();
     2234    X11U;
    22282235
    22292236    m_recList.FromScheduler();
    22302237    fillProgramInfos();
  • libs/libmythtv/tv_play.cpp

     
    5656#include "mythmainwindow.h"
    5757#include "mythscreenstack.h"
    5858
     59extern QMutex x11_lock;
     60#define X11L x11_lock.lock()
     61#define X11U x11_lock.unlock()
     62#define X11S(arg) do { X11L; arg; X11U; } while (0)
     63
    5964#ifndef HAVE_ROUND
    6065#define round(x) ((int) ((x) + 0.5))
    6166#endif
     
    873878        mainWindow->installEventFilter(this);
    874879
    875880        // finally we put the player window on screen...
    876         myWindow->show();
     881        X11S(myWindow->show());
    877882        QPalette p = myWindow->palette();
    878883        p.setColor(myWindow->backgroundRole(), Qt::black);
    879884        myWindow->setPalette(p);
     
    910915        MythMainWindow* mwnd = gContext->GetMainWindow();
    911916        mwnd->resize(saved_gui_bounds.size());
    912917        mwnd->setFixedSize(saved_gui_bounds.size());
    913         mwnd->show();
     918        X11S(mwnd->show());
    914919        if (!db_use_gui_size_for_tv)
    915920            mwnd->move(saved_gui_bounds.topLeft());
    916921    }
  • libs/libmythtv/progfind.cpp

     
    3535#include "tv.h"
    3636#include "guidegrid.h"
    3737#include "mythdb.h"
     38#include "util-x11.h"
    3839
    3940using namespace std;
    4041
     
    502503
    503504        selectShowData(curPick->title, curShow);
    504505
     506        X11L;
    505507        activateWindow();
    506508        setFocus();
     509        X11U;
    507510    }
    508511}
    509512
  • libs/libmythui/mythmainwindow.cpp

     
    5656/* from libmyth */
    5757#include "screensaver.h"
    5858
     59#include "util-x11.h"
     60
    5961#ifdef USING_VDPAU
    6062#include "mythpainter_vdpau.h"
    6163#endif
     
    785787
    786788    d->paintwin->move(0, 0);
    787789    d->paintwin->setFixedSize(size());
     790    X11L;
    788791    d->paintwin->raise();
    789792    d->paintwin->show();
     793    X11U;
    790794}
    791795
    792796void MythMainWindow::Show(void)
    793797{
     798    X11L;
    794799    show();
    795800#ifdef Q_WS_MACX
    796801    if (d->does_fill_screen)
     
    804809
    805810    //-=>TODO: The following method does not exist in Qt4
    806811    //qApp->wakeUpGuiThread();    // ensures that setActiveWindow() occurs
     812    X11U;
    807813}
    808814
    809815/* FIXME compatability only */
     
    826832
    827833    d->widgetList.push_back(child);
    828834    child->winId();
     835    X11L;
    829836    child->raise();
    830837    child->setFocus();
     838    X11U;
    831839}
    832840
    833841void MythMainWindow::detach(QWidget *child)
  • libs/libmythui/mythuiwebbrowser.cpp

     
    3131#include "mythdb.h"
    3232#include "mythdirs.h"
    3333#include "mythuihelper.h"
     34#include "util-x11.h"
    3435
    3536#include "mythuiwebbrowser.h"
    3637
     
    313314        if (m_HasFocus)
    314315        {
    315316            m_browser->setUpdatesEnabled(false);
     317            X11L;
    316318            m_browser->setFocus();
    317319            m_browser->show();
    318320            m_browser->raise();
     321            X11U;
    319322            m_browser->setUpdatesEnabled(true);
    320323        }
    321324    }
     
    323326    {
    324327        if (m_HasFocus)
    325328        {
     329            X11L;
    326330            m_browser->clearFocus();
    327331            m_browser->hide();
     332            X11U;
    328333            UpdateBuffer();
    329334        }
    330335    }
     
    480485    if (m_active)
    481486    {
    482487        m_browser->setUpdatesEnabled(false);
     488        X11L;
    483489        m_browser->setFocus();
    484490        m_browser->show();
    485491        m_browser->raise();
     492        X11U;
    486493        m_browser->setUpdatesEnabled(true);
    487494    }
    488495    else
     
    491498
    492499void MythUIWebBrowser::slotLosingFocus(void)
    493500{
     501    X11L;
    494502    m_browser->clearFocus();
    495503    m_browser->hide();
     504    X11U;
    496505
    497506    UpdateBuffer();
    498507}
  • libs/libmyth/mythdialogs.cpp

     
    3131#include "mythfontproperties.h"
    3232#include "mythuihelper.h"
    3333#include "mythverbose.h"
     34#include "util-x11.h"
    3435
    3536#ifdef USING_MINGW
    3637#undef LoadImage
     
    17571758    connect(password_editor, SIGNAL(textChanged(const QString &)),
    17581759            this, SLOT(checkPassword(const QString &)));
    17591760
    1760     activateWindow();
     1761    X11S(activateWindow());
    17611762    password_editor->setFocus();
    17621763}
    17631764
  • programs/mythfrontend/playbackbox.cpp

     
    4646#include "util.h"
    4747#include "x11colors.h"
    4848#include "mythuihelper.h"
     49#include "util-x11.h"
    4950
    5051#define LOC QString("PlaybackBox: ")
    5152#define LOC_ERR QString("PlaybackBox Error: ")
     
    33523353    paintSkipUpdate = false;
    33533354    paintSkipCount = 2;
    33543355
    3355     activateWindow();
     3356    X11S(activateWindow());
    33563357
    33573358    EmbedTVWindow();
    33583359}
     
    48664867    paintSkipUpdate = false;
    48674868    paintSkipCount = 2;
    48684869
    4869     activateWindow();
     4870    X11S(activateWindow());
    48704871}
    48714872
    48724873void PlaybackBox::initRecGroupPopup(QString title, QString name)
     
    49064907    paintSkipUpdate = false;
    49074908    paintSkipCount = 2;
    49084909
    4909     activateWindow();
     4910    X11S(activateWindow());
    49104911
    49114912    EmbedTVWindow();
    49124913