Merge pull request #85 from hasufell/master

hide disabled features from help output
This commit is contained in:
Richard Grenville 2013-01-28 15:49:55 -08:00
commit e8d854bcf1
2 changed files with 15 additions and 6 deletions

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# #
# compton-trans # compton-trans

View File

@ -4036,13 +4036,17 @@ usage(void) {
" Specify refresh rate of the screen. If not specified or 0, compton\n" " Specify refresh rate of the screen. If not specified or 0, compton\n"
" will try detecting this with X RandR extension.\n" " will try detecting this with X RandR extension.\n"
"--vsync vsync-method\n" "--vsync vsync-method\n"
" Set VSync method. There are 2 VSync methods currently available:\n" " Set VSync method. There are up to 2 VSync methods currently available\n"
" depending on your compile time settings:\n"
" none = No VSync\n" " none = No VSync\n"
#ifdef CONFIG_VSYNC_DRM
" drm = VSync with DRM_IOCTL_WAIT_VBLANK. May only work on some\n" " drm = VSync with DRM_IOCTL_WAIT_VBLANK. May only work on some\n"
" drivers. Experimental.\n" " drivers. Experimental.\n"
#endif
#ifdef CONFIG_VSYNC_OPENGL
" opengl = Try to VSync with SGI_swap_control OpenGL extension. Only\n" " opengl = Try to VSync with SGI_swap_control OpenGL extension. Only\n"
" work on some drivers. Experimental.\n" " work on some drivers. Experimental.\n"
" (Note some VSync methods may not be enabled at compile time.)\n" #endif
"--alpha-step val\n" "--alpha-step val\n"
" Step for pregenerating alpha pictures. 0.01 - 1.0. Defaults to\n" " Step for pregenerating alpha pictures. 0.01 - 1.0. Defaults to\n"
" 0.03.\n" " 0.03.\n"
@ -4093,9 +4097,11 @@ usage(void) {
"--invert-color-include condition\n" "--invert-color-include condition\n"
" Specify a list of conditions of windows that should be painted with\n" " Specify a list of conditions of windows that should be painted with\n"
" inverted color. Resource-hogging, and is not well tested.\n" " inverted color. Resource-hogging, and is not well tested.\n"
#ifdef CONFIG_DBUS
"--dbus\n" "--dbus\n"
" Enable remote control via D-Bus. See the D-BUS API section in the\n" " Enable remote control via D-Bus. See the D-BUS API section in the\n"
" man page for more details.\n" " man page for more details.\n"
#endif
"\n" "\n"
"Format of a condition:\n" "Format of a condition:\n"
"\n" "\n"
@ -4106,9 +4112,12 @@ usage(void) {
" (window role).\n" " (window role).\n"
"\n" "\n"
" <type> is one of \"e\" (exact match), \"a\" (match anywhere),\n" " <type> is one of \"e\" (exact match), \"a\" (match anywhere),\n"
" \"s\" (match from start), \"w\" (wildcard), and \"p\" (PCRE\n" " \"s\" (match from start), \"w\" (wildcard)"
" regular expressions, if compiled with the support).\n" #ifdef CONFIG_REGEX_PCRE
"\n" " and \"p\" (PCRE\n"
" regular expressions)."
#endif
"\n\n"
" <flags> could be a series of flags. Currently the only defined\n" " <flags> could be a series of flags. Currently the only defined\n"
" flag is \"i\" (ignore case).\n" " flag is \"i\" (ignore case).\n"
"\n" "\n"