BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into richardgv-dev 

Conflicts:
	src/compton.c
This commit is contained in:
Richard Grenville 2013-01-29 07:58:40 +08:00
parent 6d36ef2d0f e8d854bcf1
commit 152ad5fb57
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/compton-trans
View File

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

13
src/compton.c
View File

@ -3822,13 +3822,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"
@ -3879,9 +3883,12 @@ 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
;
fputs(usage_text , stderr); fputs(usage_text , stderr);
exit(1); exit(1);