summaryrefslogtreecommitdiffstats
path: root/cursor
Commit message (Collapse)AuthorAgeFilesLines
* cursor: add forward declaration for struct wl_bufferEmil Velikov2017-12-041-2/+2
| | | | | | | | | | | This makes the header self-contained, since the struct is considered opaque from waylad-cursor POV. As we're here move the wl_shm fwd. declaration alongside the others. Making it easier to read and track. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
* cursor: Fix heap overflows when parsing malicious files.Tobias Stoeckmann2017-11-291-1/+7
| | | | | | | | | | | | | | | | | It is possible to trigger heap overflows due to an integer overflow while parsing images. The integer overflow occurs because the chosen limit 0x10000 for dimensions is too large for 32 bit systems, because each pixel takes 4 bytes. Properly chosen values allow an overflow which in turn will lead to less allocated memory than needed for subsequent reads. See also: https://cgit.freedesktop.org/xorg/lib/libXcursor/commit/?id=4794b5dd34688158fb51a2943032569d3780c4b8 Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=103961 Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org> [Pekka: add link to the corresponding libXcursor commit] Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
* cursor: Remove "weston" from anonymous shm filenamesDerek Foreman2016-11-211-1/+1
| | | | | | | | | | | This mildly confused me during some debugging, so I guess it wouldn't hurt to make the filename more indicative of where it was actually created. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
* (multiple): Include stdint.hYong Bakos2016-07-252-0/+3
| | | | | | | | | | Some headers and source files have been using types such as uint32_t without explicitly including stdint.h. Explicitly include stdint.h where appropriate. Signed-off-by: Yong Bakos <ybakos@humanoriented.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
* cursor: Update printed license from MIT "X11" to MIT "Expat"Bryce Harrington2015-06-221-22/+30
| | | | | | | | | The code generates a cursor-data.h file, with licensing information. Change this from the MIT "X11" license to MIT "Expat" license for consistency with the rest of Wayland. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
* xcursor: Change keithp licensed code from X11 to Expat licenseBryce Harrington2015-06-122-32/+38
| | | | | | | | | | | The license text for this file mentions Keith Packard specifically, however it is otherwise identical to all the other MIT X11 licensed code in Wayland, and so can be changed to the substantially identical MIT Expat license. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Acked-by: Keith Packard <keithp@keithp.com>
* cursor-data.h: Change SuSE licensed code from X11 to ExpatBryce Harrington2015-06-121-15/+19
| | | | | | | | | | The license text for this file mentions SuSE specifically, however it is otherwise identical to all the other MIT X11 licensed code in Wayland, and so can be changed to the substantially identical MIT Expat license. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Acked-by: Keith Packard <keithp@keithp.com>
* cursor: Update boilerplate from MIT X11 license to MIT Expat licenseBryce Harrington2015-06-125-80/+95
| | | | | Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
* remove trailing whitespacesMichael Vetter2015-05-151-502/+502
| | | | | Remove trailing whitespaces because they are not needed and jumping to the end of al ine should do just that and not jump to the whitespace.
* cursor: free the array from which images are linkedEmmanuel Gil Peyrot2015-03-181-0/+1
|
* cursor: add wl_cursor_frame_and_durationDerek Foreman2015-03-052-3/+46
| | | | | | | | It's useful to know how long the current cursor frame should be displayed so we can wait that long to change it. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
* Add error handling for wl_cursorsHardening2014-04-011-7/+13
| | | | | | This patch adds some error management in wayland cursors Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
* build: Move cursor Makefile.am into toplevel Makefile.amKristian Høgsberg2014-03-061-21/+0
|
* xcursor: don't proceed if XcursorImageCreate failedU. Artie Eoff2014-01-151-0/+2
| | | | Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
* cursor: check for memory allocation errorsU. Artie Eoff2014-01-151-1/+13
| | | | Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
* cursor: free theme->name tooU. Artie Eoff2014-01-151-0/+1
| | | | Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
* cursor: handle running out of buffer spacePekka Paalanen2013-12-021-16/+51
| | | | | | | | | | | | | | | | | | | | | If posix_fallocate is available, use it to detect when we are running out of buffer space. Propagate the failure properly through the various functions, stopping loading cursors but keeping the cursors that were already successfully loaded. This may result in an animated cursor not having all of its images, or a cursor theme not having all of its cursors. When that happens, the failure is NOT communicated to the application. Instead, the application will get NULL from wl_cursor_theme_get_cursor() for a cursor that was not loaded successfully. If an animated cursor is missing only some images, the animation is truncated but the cursor is still available. This patch relies on the commit "os: use posix_fallocate in creating sharable buffers" for defining HAVE_POSIX_FALLOCATE. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
* os: use posix_fallocate in creating sharable buffersPekka Paalanen2013-12-021-1/+18
| | | | | | | | | | | | | | | | If posix_fallocate is available, use it instead of ftruncate. Unlike ftruncate, when posix_fallocate succeeds, it guarantees that you cannot run out of disk space, when later writing to the mmap()'ed file. With posix_fallocate, if os_create_anonymous_file() succeeds, the program cannot get a SIGBUS later from accessing this file via mmap. If there is insufficient disk space, the function fails and errno is set to ENOSPC. This is useful on systems, that limit the available buffer space by having XDG_RUNTIME_DIR on a small tmpfs. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
* wayland: Be consistent about #include-guard namesKristian Høgsberg2013-10-211-2/+2
| | | | | | | We had a mix of inconsistent names, some of which were non-conformant. Standardize on all-uppercase-and-underscore naming convention. https://bugs.freedesktop.org/show_bug.cgi?id=70679
* pkgconfig: Use configure provided directoriesQuentin Glidic2012-11-271-4/+4
| | | | https://bugs.freedesktop.org/show_bug.cgi?id=57630
* Move ARRAY_LENGTH out of public headersKristian Høgsberg2012-10-191-0/+2
| | | | | | | | Exporting unprefixed symbols is a pretty bad idea so don't do that. Instea of redefining it WL_ARRAY_LENGTH, we just move the define to our private header. The scanner generates code that uses ARRAY_LENGTH, but we can just make it count the number elements and emit an integer constant instead.
* Ensure cursor_data.c is included in distribution tarballsMatt Roper2012-10-094-2/+3
| | | | Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
* xcursor: Fix allocation based on string lengthRob Bradford2012-10-091-1/+1
| | | | | | | | strlen() doesn't include the terminating NUL. Therefore when allocating a block of memory to hold something equivalent to the length of the string we must increment to take the NUL byte into consideration. Signed-off-by: Rob Bradford <rob@linux.intel.com>
* cursor: add cursor.pcf and extraction programPhilipp Brüschweiler2012-09-102-0/+531
|
* cursor: Add a default cursor themePhilipp Brüschweiler2012-09-102-1/+618
| | | | | | | This theme is loaded when the specified cursor theme can not be found. These cursors are extracted from the xorg sources and transformed into raw ARGB data by a small helper program (commited separately).
* Add support for X cursor themes.Christopher Michael2012-08-131-1/+1
| | | | | | | | | This patch adds a few more directories to search for xcursor themes. Along with the weston patch, this adds the ability to configure weston to use an X11 cursor theme. Previously, wayland cursor would just look in the icons and pixmaps directories for cursor images to load. This adds the ability to also search in the x cursors directory.
* Don't skip the first directory entry when reading cursors.Dima Ryazanov2012-07-261-1/+0
| | | | I end up missing the "bottom_right_corner" cursor.
* cursor: fix fd leak and a segfaultPekka Paalanen2012-07-101-0/+6
| | | | | | | | | - don't leak fd in shm_pool_destroy() - return NULL from wl_cursor_theme_load() if pool fails Tha last one fixes a segfault, when shm_pool_create() has failed. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
* cursor: use os_create_anonymous_file()Pekka Paalanen2012-07-104-6/+164
| | | | | | | Copy the implementation of os_create_anonymous_file() here from weston, so we can use it instead of hardcoding a path to /tmp. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
* wayland-cursor: Add error handling for shm_pool_create()Martin Olsson2012-07-091-9/+11
|
* wayland-cursor: Plug leak of filename on load_all_cursors_from_dir()Ander Conselvan de Oliveira2012-06-191-1/+4
|
* Xcursor: Don't ignore unknown file typesDaniel Stone2012-06-181-1/+2
| | | | | | | | | XFS doesn't return the file type with opendir(), and instead only returns it when you stat() the file itself. c66f2602 introduced a check to ensure that only files and symlinks were loaded, while not checking for DT_UNKNOWN. Properly handle DT_UNKNOWN by just proceeding anyway. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* cursor: Add function for calculating current frame in cursor animationAnder Conselvan de Oliveira2012-06-152-7/+45
| | | | | | Given a pointer to struct wl_cursor and an elapsed time in ms., wl_cursor_frame() will return the index of the cursor image the should be displayed.
* wayland-cursor: add an option that changes the cursor theme directoryAnder Conselvan de Oliveira2012-06-081-1/+5
| | | | | | Some distros (e.g. gentoo) install cursor themes in non-standard directories. Add option --with-icondir to configure.sh that sets the directory in which to look for cursors.
* cursor: Fix warning with objdir != srcdir buildDaniel Stone2012-05-311-1/+1
| | | | | | | | Make sure we find the right include paths. krh: Edited to use $(top_builddir) Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* build: add uninstalled pkg-config filesPekka Paalanen2012-05-291-0/+8
| | | | | | | Required for building apps against wayland libraries that have not been installed. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
* cursor: Link libwayland-cursor to libwayland-clientRob Bradford2012-05-291-1/+1
| | | | | | LDADD is only used when linking programs not libraries. Spotted-by: Pekka Paalanen <ppaalanen@gmail.com>
* wayland-cursor: load all cursors from a theme on wl_cursor_theme_loadAnder Conselvan de Oliveira2012-05-253-53/+145
|
* wayland-cursor: remove enum wl_cursor_typeAnder Conselvan de Oliveira2012-05-252-39/+3
| | | | | | | Defining a list of all cursors a theme, client or toolkit should have is not the purpose of libwayland-cursor. The cursor type enum existed for making lookups faster, but this kind of optmization belongs in the toolkits.
* Wayland: Add missing extern "C"Yan Wang2012-05-231-0/+8
| | | | Add extern "C" macro definition for C++.
* cursor: Fix unsigned/signed comparisonsKristian Høgsberg2012-05-221-3/+3
|
* Introduce libwayland-cursor, a cursor helper libraryAnder Conselvan de Oliveira2012-05-226-0/+1372
The purpose of this library is to be the equivalent of libXcursor in the X world. This library is compatible with X cursor themes and loads them directly into an shm pool making it easy for the clients to get buffer for each cursor image. The code for handling the X cursor theme was taken from libXcursor. The files cursor/xcursor.[ch] are a stripped down version of that library containing only the interfaces necessary for implementing the wayland counterpart.