← Back to branch summary

~compiz-team/compiz-core/oneiric.force_output_detection

« back to all changes in this revision

Viewing changes to src/screen.cpp

  • Committer: Sam Spilsbury
  • Date: 2011-08-22 10:48:12 UTC
  • mfrom: (2753.21.15 compiz-core)
  • Revision ID: sam.spilsbury@canonical.com-20110822104812-kounfdbe90q0sw96
Merge in changes from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/screen.cpp
2036
2036
        priv->attrib.height = ce->height;
2037
2037
    }
2038
2038
 
2039
 
        priv->reshape (ce->width, ce->height);
 
2039
    priv->reshape (ce->width, ce->height);
2040
2040
 
2041
 
        priv->detectOutputDevices ();
 
2041
    priv->detectOutputDevices ();
2042
2042
}
2043
2043
 
2044
2044
void
4663
4663
        boost::bind (&PrivateScreen::handleStartupSequenceTimeout, this));
4664
4664
    startupSequenceTimer.setTimes (1000, 1500);
4665
4665
 
 
4666
    memset (&history, 0, sizeof (Window) * ACTIVE_WINDOW_HISTORY_NUM);
 
4667
 
4666
4668
    optionSetCloseWindowKeyInitiate (CompScreen::closeWin);
4667
4669
    optionSetCloseWindowButtonInitiate (CompScreen::closeWin);
4668
4670
    optionSetRaiseWindowKeyInitiate (CompScreen::raiseWin);