← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/compiz/jaunty-proposed

« back to all changes in this revision

Viewing changes to src/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-02-10 10:39:03 UTC
  • mfrom: (0.101.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090210103903-lbxs9kycjwydh5s8
Tags: 1:0.7.9+git20090211-0ubuntu1
https://launchpad.net/bugs/274407
https://launchpad.net/bugs/327793
* build from the 0.8 git branch
  - fixes focus problem (LP: #274407)
  - fixes problem with latest libmetacity decoration (LP: #327793)
  - enable new gnomecompat plugin by default
* debian/patches:
 - updated 013-add-cursor-theme-support.patch
 - updated 018_use_metacity_settings.patch
 - updated 029_default_options
 - updated 035_ignore_workspaces
 - updated 037_fullscreen_stacking_fixes.patch (mostly merged upstream
   just the move plugin changes remain)
 - dropped 027_default_to_gnome_terminal
 - dropped 040_resolve-animation-fade-conflict_from_upstream.patch
 - dropped 047_no_display_compiz_desktop.patch
 - dropped 048_from_git_fix_placement.patch
 - dropped 050-scale-keybinding-toggle.patch
 - dropped 051-new-kde4-plasma-api.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.c
61
61
Bool indirectRendering = FALSE;
62
62
Bool strictBinding = TRUE;
63
63
Bool noDetection = FALSE;
64
 
Bool useDesktopHints = TRUE;
 
64
Bool useDesktopHints = FALSE;
65
65
Bool onlyCurrentScreen = FALSE;
66
66
 
67
67
#ifdef USE_COW
79
79
            "[--refresh-rate RATE]\n       "
80
80
            "[--fast-filter] "
81
81
            "[--indirect-rendering] "
 
82
            "[--no-detection]\n       "
 
83
            "[--keep-desktop-hints] "
82
84
            "[--loose-binding] "
83
85
            "[--replace]\n       "
84
86
            "[--sm-disable] "
85
87
            "[--sm-client-id ID] "
86
 
            "[--no-detection]\n       "
87
 
            "[--ignore-desktop-hints] "
88
 
            "[--only-current-screen]"
 
88
            "[--only-current-screen]\n      "
89
89
 
90
90
#ifdef USE_COW
91
 
            " [--use-root-window]\n       "
92
 
#else
93
 
            "\n       "
 
91
            " [--use-root-window] "
94
92
#endif
95
93
 
96
94
            "[--version] "
314
312
        }
315
313
        else if (!strcmp (argv[i], "--indirect-rendering"))
316
314
        {
 
315
            /* force Mesa libGL into indirect rendering mode, because
 
316
               glXQueryExtensionsString is context-independant */
 
317
            setenv ("LIBGL_ALWAYS_INDIRECT", "1", True);
317
318
            indirectRendering = TRUE;
318
319
        }
319
320
        else if (!strcmp (argv[i], "--loose-binding"))
322
323
        }
323
324
        else if (!strcmp (argv[i], "--ignore-desktop-hints"))
324
325
        {
 
326
            /* keep command line parameter for backward compatibility */
325
327
            useDesktopHints = FALSE;
326
328
        }
 
329
        else if (!strcmp (argv[i], "--keep-desktop-hints"))
 
330
        {
 
331
            useDesktopHints = TRUE;
 
332
        }
327
333
        else if (!strcmp (argv[i], "--only-current-screen"))
328
334
        {
329
335
            onlyCurrentScreen = TRUE;