← Back to branch summary

~smspillaz/compiz/experimental

« back to all changes in this revision

Viewing changes to src/screen.cpp

Merge lp:compiz

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/screen.cpp
526
526
    XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "%d", str, 128);
527
527
    fprintf (stderr, str, e->request_code);
528
528
 
529
 
    sprintf (str, "%d", e->request_code);
 
529
    snprintf (str, 128, "%d", e->request_code);
530
530
    XGetErrorDatabaseText (dpy, "XRequest", str, "", str, 128);
531
531
    if (strcmp (str, ""))
532
532
        fprintf (stderr, " (%s)", str);
2697
2697
    {
2698
2698
        /* Traverse down the stack */
2699
2699
        for (cps::WindowManager::reverse_iterator rit = windowManager.rbegin();
2700
 
             rit != windowManager.rend(); rit++)
 
2700
             rit != windowManager.rend(); ++rit)
2701
2701
        {
2702
2702
            w = (*rit);
2703
2703
 
4490
4490
        privateScreen.optionSetLowerWindowButtonInitiate (CompScreenImpl::lowerWin);
4491
4491
 
4492
4492
        privateScreen.optionSetUnmaximizeWindowKeyInitiate (CompScreenImpl::unmaximizeWin);
 
4493
        privateScreen.optionSetUnmaximizeOrMinimizeWindowKeyInitiate (CompScreenImpl::unmaximizeOrMinimizeWin);
4493
4494
 
4494
4495
        privateScreen.optionSetMinimizeWindowKeyInitiate (CompScreenImpl::minimizeWin);
4495
4496
        privateScreen.optionSetMinimizeWindowButtonInitiate (CompScreenImpl::minimizeWin);
4878
4879
    /* Check for other window managers */
4879
4880
 
4880
4881
    char                 buf[128];
4881
 
    sprintf (buf, "WM_S%d", DefaultScreen (dpy));
 
4882
    snprintf (buf, 128, "WM_S%d", DefaultScreen (dpy));
4882
4883
    wmSnAtom = XInternAtom (dpy, buf, 0);
4883
4884
 
4884
4885
    Window currentWmSnOwner = XGetSelectionOwner (dpy, wmSnAtom);