BitHeaven/picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
776 Commits 1 Branch 0 Tags
198dcdb987a8fc734dd6e9f246ddd4728fcc0e0e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuxuan Shui 198dcdb987 gl_common: fix coordinate mismatch 
Xorg uses top left as origin, OpenGL uses lower left. So we need to flip
the y axis, and make sure we are using the right points as origin of
windows.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-28 01:14:41 +00:00
Yuxuan Shui 3b21365e94 gl_common: fix rendering 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-28 00:48:26 +00:00
Yuxuan Shui 6e454adff1 glx (new backend): Add some missing functions 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-28 00:04:01 +00:00
Yuxuan Shui 8c71f3fcbe Move some macros around 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-27 23:57:43 +00:00
Yuxuan Shui 5364c8ac9b Add backend_info_t::max_buffer_age 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-27 19:45:40 +00:00
Yuxuan Shui d92a546beb Fix includes and typos in new backends 2019-01-27 19:34:26 +00:00
Yuxuan Shui 22f0d10c65 Make backend_info_t::buffer_age optional 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-27 19:32:07 +00:00
Yuxuan Shui b50f15c835 Adapt paint_all_new to new interface 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-27 19:29:02 +00:00
Yuxuan Shui e898526afb Add glx_backend to backend_list 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-27 19:28:15 +00:00
Yuxuan Shui 99b3c4575f Fix handling of region == NULL in paint_all_new 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-27 18:21:42 +00:00
yshuiandGitHub 5a1975909a Merge pull request #93 from yshui/gl-reuse 
Reuse some code from the new gl backend
 2019-01-27 18:18:51 +00:00
Yuxuan Shui 061dd8e52e Reuse some code from the new gl backend 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-27 18:16:28 +00:00
Yuxuan Shui 290ec7fb04 Don't pretend that we have glStringMarker 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-27 17:45:38 +00:00
Yuxuan Shui 6c6dd6ad7d Remove unused session_t argument from gl_has_extension 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-26 23:08:32 +00:00
Yuxuan Shui 031356069a new glx: Add glx_present 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-26 18:01:24 +00:00
yshuiandGitHub 4bc2870ddf Merge pull request #86 from yshui/damage-ring 
Make buffer age not glx specific
 2019-01-26 15:11:13 +00:00
Yuxuan Shui e80ff8530e Make buffer age not glx specific 
Buffer age is not a glx specific concept. xrender backend can have
buffer age too, if double buffering is used (required if we want to use
Present). So, make buffer age a generic concept in compton is required
for further backend improvements.

Moved buffer age based damage aggragation out of glx as well.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-26 15:07:09 +00:00
Yuxuan Shui 5e49ab0861 Make sure draw_idle is stopped in all cases 
Previously, compton fails to stop draw_idle in some cases when sw_opti
is enabled.

sw_opti is a feature that limits the draw frequence to vblank frequence.
It adds a delay to drawing when the screen is updated more frequently
than the vblank frequence. However when the delay is not used (i.e. the
screen is updated infrequent enough), compton will start drawing the
frame directly without using the delay. And specically in this case,
compton will fail to stop the draw_idle, causing a callback to be called
once per loop of the mainloop, resulting in high CPU usage.

Fixes #92

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-25 00:35:24 +00:00
yshuiandGitHub 377b18a00f Merge pull request #89 from yshui/fmodules 
Even more includes
 2019-01-20 22:14:00 +00:00
Yuxuan Shui f649a949e2 Even more includes 
Expand the modulemap to cover some of the system headers too.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-20 22:09:22 +00:00
yshuiandGitHub 4bdbd48e55 Merge pull request #88 from yshui/fmodules 
Improve the header includes, cont'd
 2019-01-20 17:12:48 +00:00
Yuxuan Shui 916e23861a Improve the header includes, cont'd 
Also check in the modulemap file, and add a option to build with clang's
-fmodules.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-20 17:10:06 +00:00
Yuxuan Shui 1e0deea57f Improve the include situation 
Slightly clean up header inclusion with the help of clang's module system.
It's better for files to include the things you need directly.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-18 23:30:44 +00:00
Yuxuan Shui c93789f5e9 Enable the glStringMarker logger when available 
glStringMarker is usually only available when running under some
kind of GL debugger, and can be used to insert strings into the
GL command string. Writing logs using it can be useful, since it
lets us correspond GL calls with what happens in compton.

More info about the extension can be found here:

https://www.khronos.org/registry/OpenGL/extensions/GREMEDY/GREMEDY_string_marker.txt

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-09 21:58:16 +00:00
Yuxuan Shui fed4634250 Check in .clang-format 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-08 22:14:09 +00:00
Yuxuan Shui dd02ea31ae Fix copying damage region with wrong size 
Fortunately this hasn't caused problems...

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-08 21:34:56 +00:00
Yuxuan Shui 72e3468694 Add backend_info_t::buffer_age 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-08 21:32:54 +00:00
Yuxuan Shui 3e475d00b3 Enable more build tests 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-02 20:43:01 +00:00
Yuxuan Shui 82e8b09d56 Move paint_all_new to backend.c 
Fix build with -Dnew_backends=false. And more build test for this case.

Fixes #83

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-02 20:36:33 +00:00
Yuxuan Shui 34eb14fb0f Tweak the default shadow-radius 
We need to make the radius 1.5x bigger to achieve the same effect.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-02 11:14:27 +00:00
Yuxuan Shui 6d3ea3564b Implement vsync for the new xrender backend 
We use the Present extension for that, since it is the best option we
have.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-01 14:59:56 +00:00
Yuxuan Shui 6413ccbd71 Improve XSync extension detection 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-01 14:09:55 +00:00
Yuxuan Shui 428c24a6fa Speed up shadow generation for small windows 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-01 11:35:59 +00:00
Yuxuan Shui 3686bf7a33 Use functions in backend/backend_common.c 
Build backend_common.c even when new_backend=false.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-01 11:01:47 +00:00
Yuxuan Shui 4aeffa36b8 Refactor shadow generation 
Trying to make the code easier to understand. The logic is unchanged.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-01-01 10:54:21 +00:00
Yuxuan Shui edb1139507 Add some comments to backend.h 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 23:30:45 +00:00
Yuxuan Shui 86713c8170 Add make_shadow and paint_all_new to backend_common.c 
Also made make_shadow private in render.c

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 14:30:58 +00:00
Yuxuan Shui 3b2e149369 Add missing include in x.h 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 14:30:53 +00:00
Yuxuan Shui 0b94bde004 Remove unused variable in backend/xrender.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 14:08:35 +00:00
Yuxuan Shui 6226ab1228 Fix memory leak in backend/xrender.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 08:22:57 +00:00
Yuxuan Shui cb12430633 Use options_t::shadow_radius for shadow size calculation 
No need to access gaussian_map

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 08:15:36 +00:00
Yuxuan Shui 4039a6db64 Remove all use of psglx from backend/glx.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 07:37:49 +00:00
Yuxuan Shui a2022661e6 Move glx_init_blur to gl_common.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 07:18:38 +00:00
Yuxuan Shui 8629fee78f Fix some static analyzer complains in glx.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 06:54:59 +00:00
Yuxuan Shui f322bd4a53 Remove backend/gl/glx.h 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 01:53:25 +00:00
Yuxuan Shui 61f55f69a6 Add backend/gl/glx.c to build 
Still a long way to go for the glx backend.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 01:32:31 +00:00
Yuxuan Shui 3e7b7bd608 Move glx_fbconfig_t to opengl.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-31 00:38:13 +00:00
Yuxuan Shui e7a8adf2cc Clear ps->sync_fence after error, part 2 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-30 22:13:30 +00:00
Yuxuan Shui 14f357ea2b Clean up ps->sync_fence after error 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-30 08:05:16 +00:00
Yuxuan Shui d12b3c1e1d Add missing header files 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-30 08:00:22 +00:00
Yuxuan Shui 4bfed7f7e3 Use one global XSync fence 
And only sync once per frame.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-30 07:43:24 +00:00
Yuxuan Shui 80847dd3fa Refactor the XSync fence code 
Use a temporary fence everytime. Convert the Xlib XSync functions to use
xcb_sync_*.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-30 07:06:47 +00:00
Yuxuan Shui bc0382d962 Remove usage of Xlib from x.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-30 06:05:39 +00:00
Yuxuan Shui 2e26c511c4 Fix allocation with 0 size 
Thanks to the static analyzer

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-27 20:56:05 +00:00
Yuxuan Shui 669cbcdb14 Fix some static analyzer errors 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-27 20:47:58 +00:00
Yuxuan Shui 51d03132bf A bit more xcb conversion 
None -> XCB_NONE
Window -> xcb_window_t
Atom -> xcb_atom_t

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-27 20:45:38 +00:00
Yuxuan Shui 86e744345e Fix build with gcc 6 
gcc want _Noreturn to be the first thing in declaration.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-25 14:55:01 +00:00
Yuxuan Shui 311fa65840 Mark report_allocation_failure as noreturn 
Silence an static analyzer warning

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-25 04:11:29 +00:00
Yuxuan Shui 1c0770dc66 Fix typo in man page 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-25 01:31:54 +00:00
yshuiandGitHub 9881e1168e Merge pull request #80 from yshui/wintypes 
Fix wintypes options handling
 2018-12-24 21:40:12 +00:00
Yuxuan Shui 4f1dddd072 -C and -G *disables* shadow, not enabling them 
Well, I made a mistake.

Fixes #79

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-24 19:58:25 +00:00
Yuxuan Shui f41765fca5 Refactor setting the default winopts 
Move filling winopts with default values to after command line options have
been parsed, not after parsing the config file. This is more intuitive.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-24 19:57:16 +00:00
Yuxuan Shui b434451abb Lower x_print_error to log_debug 
This information is only really useful for debugging anyway.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-22 14:29:26 +00:00
Yuxuan Shui 1b947658ff Enable opengl by default 
Was disabled by accident in 0c4b690b2

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-22 00:58:38 +00:00
yshuiandGitHub 068611e2e7 Merge pull request #76 from yshui/split-backends-part1 
First step of split backend into modules
 2018-12-22 00:53:47 +00:00
Yuxuan Shui 0c4b690b2b First step of split backend into modules 
This commit introduced a new, modular backend interface. The interface
is not very good, since I don't think I fully understand all the
requirements writing a backend have. But this is a good first step.

This commit also includes an initial xrender backend written using the
new interface, and some opengl backend related helper functions, which
are taken from the old opengl backend.

However, there is not integration with the core compton yet. compton
will still use the old backend code. This commit is here so we can get
the automated build test.

What is implemented in the new xrender backend:

* Windows with transparency
* Shadow
* Opacity
* Wallpaper (getting the root pixmap)
* Blur

Known problem with the xrender backend:

* It is slower

Things that still need to be figured out:

* What is the better way to add vsync to the new backends

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-22 00:50:25 +00:00
yshuiandGitHub d6a54c25e9 Merge pull request #75 from yshui/split-backend-prepare 
Split backend prepare
 2018-12-22 00:36:06 +00:00
Yuxuan Shui 2cf04544d8 Add some window related helper 
For the backend refactoring.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-22 00:34:08 +00:00
Yuxuan Shui db5a78790c Make make_shadow() public 
Some the refactored backends can use it.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-22 00:30:45 +00:00
Yuxuan Shui af9d5ece00 Update CONTRIBUTORS 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-22 00:15:09 +00:00
yshuiandGitHub 7993758bf9 Merge pull request #74 from Avi-D-coder/next 
Fix compile errors triggered by vsync-drm option
 2018-12-22 00:13:52 +00:00
yshuiandGitHub 699d40fce9 Merge pull request #73 from yshui/x-helpers 
Some new x helper functions
 2018-12-21 23:57:46 +00:00
Yuxuan Shui 6c00d46d7a Some new x helper functions 
They should be useful for the refactored backends.

Renamed x_create_picture to x_create_picture_with_pictfmt.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 23:47:31 +00:00
Yuxuan Shui f8c86d51b3 Mark fallthrough switch case 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 23:04:51 +00:00
Yuxuan Shui e211c395fa Append to log file, not overwrite 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 23:02:19 +00:00
Yuxuan Shui 8bb7027393 Fix memory leak in get_cfg 
When setting --shadow-exclude-reg from both the config file and the
command line, one of the strings is not freed.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 22:59:28 +00:00
Yuxuan Shui 7915ade1be Make --logpath work again 
Also add a new option "log-file" to config file and command line, it
doesn the same thing as --logpath.

--logpath was never documented, and "log-file" is more consistent with
the naming of options.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 22:59:21 +00:00
Yuxuan Shui fa98564040 Update README 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 21:23:45 +00:00
yshuiandGitHub 4dce20fab4 Merge pull request #72 from yshui/clean-opt2 
Option/config parsing clean up
 2018-12-21 17:23:47 +00:00
Yuxuan Shui c8a9f32b05 Add debug logging to get_atom 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 17:22:10 +00:00
Yuxuan Shui cb7d852b0f Clean up options/config file parsing 
* Pass a options_t, not session_t
* Slightly improve error handling when setting vsync method via dbus

The goal here is to limit the scope of what a given function can access.
And session_t contains basically everything, so don't pass it around.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 17:21:52 +00:00
Yuxuan Shui ee2be09958 Rename argparse.* to options.* 
Seems to be a more appropriate name.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-21 13:10:49 +00:00
yshuiandGitHub d2cc4e0243 Merge pull request #69 from yshui/arg 
Clean ups
 2018-12-21 00:01:48 +00:00
Yuxuan Shui 2a2958b68d Split the first and second pass of get_cfg 
They are not separate functions

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 23:58:47 +00:00
Yuxuan Shui 9b121447b9 Remove a couple of unwanted options 
* -d: because the standard way is to use $DISPLAY
* no-name-pixmap: undocumented debugging option
* -S: debugging option, not very useful

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 23:44:38 +00:00
Yuxuan Shui 9880245200 Move get_cfg and usage out of compton.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 23:12:38 +00:00
Yuxuan Shui 4ff9e810ff Sort out the dbus function prototypes 
* Moved dbus prototypes from common.h to dbus.h
* Removed private function prototypes from dbus.h
* Removed private macros from dbus.h
* Hide dbus types from common.h

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 23:12:27 +00:00
Yuxuan Shui eeb1f8f286 Remove Makefile 
It hasn't been working for a while now.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 18:22:19 +00:00
yshuiandGitHub 729cffbf69 Merge pull request #68 from yshui/better-log 
Convert print_errf in win.c and compton.c
 2018-12-20 17:43:59 +00:00
Yuxuan Shui abeb294508 Remove printf_* macros 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 17:36:23 +00:00
Yuxuan Shui a6fef8e8fb Convert printf_* from config.c and config_libconfig.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 17:35:45 +00:00
Yuxuan Shui d8198926dc Convert printf_* in opengl.h 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 17:24:03 +00:00
Yuxuan Shui 24dd8ee120 Convert printf_* in vsync.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 17:19:41 +00:00
Yuxuan Shui 9b5db1f0aa Convert printf_* in c2.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 17:16:20 +00:00
Yuxuan Shui 832601354a Convert printf_* in render.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 17:03:27 +00:00
Yuxuan Shui b5b0f4af7f Convert printf_errf/dbgf in several files 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 16:54:51 +00:00
Yuxuan Shui 3966491846 Convert printf_errf/dbgf in opengl.c 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 16:50:11 +00:00
Yuxuan Shui 22669889eb Don't report allocation failure via logging 
They will be reported by allocchk and will abort the program. There is
no point to log them.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 14:23:06 +00:00
Yuxuan Shui 1ea611c90e Improved allocation failure reporting 
Now it reports file and line number of the function too.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 14:19:10 +00:00
Yuxuan Shui 6f0daf8076 Add a writev interface for log targets 
So some log targets can be more efficient and allocate less memory.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2018-12-20 04:45:07 +00:00